diff --git a/.circleci/config.yml b/.circleci/config.yml
index ea708e8e64..795c6415f1 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -68,6 +68,6 @@ workflows:
   # Inside the workflow, you provide the jobs you want to run, e.g this workflow runs the build-and-test job above.
   # CircleCI will run this workflow on every commit.
   # For more details on extending your workflow, see the configuration docs: https://circleci.com/docs/2.0/configuration-reference/#workflows
-  sample:
+  dotests:
     jobs:
       - build-and-test
\ No newline at end of file
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/.gitignore b/.gitignore
index 3b6372d2df..4b311a1123 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,8 +11,6 @@ build/
 .idea/*
 !.idea/codeStyles/
 full/
-debug/
-release/
 app/com.crashlytics.settings.json
 app/session_analytics.tap
 .project
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index ff53f4004f..66acf8e27e 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -1,11 +1,13 @@
 <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" />
       <option name="NAME_COUNT_TO_USE_STAR_IMPORT_FOR_MEMBERS" value="6" />
       <option name="BLANK_LINES_AROUND_BLOCK_WHEN_BRANCHES" value="1" />
+      <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
     </JetCodeStyleSettings>
     <codeStyleSettings language="JAVA">
       <option name="METHOD_ANNOTATION_WRAP" value="0" />
@@ -124,14 +126,22 @@
       </arrangement>
     </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/.idea/dictionaries/project_dictionary.xml b/.idea/dictionaries/project_dictionary.xml
index 3639be9c59..49af19275e 100644
--- a/.idea/dictionaries/project_dictionary.xml
+++ b/.idea/dictionaries/project_dictionary.xml
@@ -2,6 +2,7 @@
   <dictionary name="project-dictionary">
     <words>
       <w>aaps</w>
+      <w>abcdef</w>
       <w>acked</w>
       <w>actionstring</w>
       <w>allowednumbers</w>
@@ -14,8 +15,10 @@
       <w>basals</w>
       <w>bgcheck</w>
       <w>bgsource</w>
+      <w>boluscalc</w>
       <w>bolusing</w>
       <w>carb</w>
+      <w>carbratio</w>
       <w>carbs</w>
       <w>carbsreq</w>
       <w>careportal</w>
@@ -46,6 +49,7 @@
       <w>medtronic</w>
       <w>mgdl</w>
       <w>mmol</w>
+      <w>motol</w>
       <w>multiwave</w>
       <w>netinsulin</w>
       <w>netratio</w>
@@ -55,9 +59,14 @@
       <w>okcancel</w>
       <w>omnipod</w>
       <w>openaps</w>
+      <w>openhumans</w>
       <w>oref</w>
+      <w>otpauth</w>
       <w>passcode</w>
+      <w>pdus</w>
+      <w>philoul</w>
       <w>poctech</w>
+      <w>pred</w>
       <w>profileswitch</w>
       <w>pumpbtcomm</w>
       <w>quickwizard</w>
@@ -66,14 +75,18 @@
       <w>refresheventsfromnightscout</w>
       <w>rileylink</w>
       <w>roboelectric</w>
+      <w>sgvs</w>
       <w>sitechange</w>
       <w>smscommunicator</w>
+      <w>sntp</w>
       <w>sooil</w>
       <w>soundid</w>
       <w>splitted</w>
+      <w>ssid</w>
       <w>superbolus</w>
       <w>targethigh</w>
       <w>targetlow</w>
+      <w>tbrs</w>
       <w>tdds</w>
       <w>tempbasal</w>
       <w>tempbasals</w>
@@ -82,9 +95,11 @@
       <w>tidepool</w>
       <w>timeshift</w>
       <w>tirs</w>
+      <w>totp</w>
       <w>uart</w>
       <w>wizzardpage</w>
       <w>xdrip</w>
+      <w>xstream</w>
       <w>ypso</w>
       <w>ypsomed</w>
       <w>ypsopump</w>
diff --git a/app/build.gradle b/app/build.gradle
index 63b7948b91..562568bd14 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,26 +1,24 @@
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-kapt'
+apply plugin: 'kotlin-allopen'
 apply plugin: 'com.google.gms.google-services'
 apply plugin: 'com.hiya.jacoco-android'
 apply plugin: 'com.google.firebase.crashlytics'
 
 apply from: "${project.rootDir}/gradle/android_dependencies.gradle"
-
-jacoco {
-    toolVersion = "0.8.6"
-}
-
-tasks.withType(Test) {
-    jacoco.includeNoLocationClasses = true
-    jacoco.excludes = ['jdk.internal.*']
-}
+apply from: "${project.rootDir}/gradle/jacoco_global.gradle"
 
 repositories {
     mavenCentral()
     google()
 }
 
+allOpen {
+    // allows mocking for classes w/o directly opening them for release builds
+    annotation 'info.nightscout.androidaps.annotations.OpenForTesting'
+}
+
 def generateGitBuild = { ->
     StringBuilder stringBuilder = new StringBuilder()
     try {
@@ -111,7 +109,7 @@ android {
     defaultConfig {
         multiDexEnabled true
         versionCode 1500
-        version "2.8.2.1-dev-e4"
+        version "2.8.2.4-dev"
         buildConfigField "String", "VERSION", '"' + version + '"'
         buildConfigField "String", "BUILDVERSION", '"' + generateGitBuild() + '-' + generateDate() + '"'
         buildConfigField "String", "REMOTE", '"' + generateGitRemote() + '"'
@@ -186,19 +184,20 @@ dependencies {
     implementation project(':danars')
     implementation project(':danar')
     implementation project(':insight')
+    implementation project(':pump-common')
     implementation project(':rileylink')
     implementation project(':medtronic')
     implementation project(':omnipod-common')
     implementation project(':omnipod-eros')
     implementation project(':omnipod-dash')
+    implementation project(':diaconn')
+    implementation project(':openhumans')
 
     implementation fileTree(include: ['*.jar'], dir: 'libs')
 
     /* Dagger2 - We are going to use dagger.android which includes
      * support for Activity and fragment injection so we need to include
      * the following dependencies */
-
-
     annotationProcessor "com.google.dagger:dagger-compiler:$dagger_version"
     annotationProcessor "com.google.dagger:dagger-android-processor:$dagger_version"
     kapt "com.google.dagger:dagger-android-processor:$dagger_version"
diff --git a/app/src/androidTest/java/info/nightscout/androidaps/SetupWizardActivityTest.kt b/app/src/androidTest/java/info/nightscout/androidaps/SetupWizardActivityTest.kt
index e873bf5edf..f20eed392a 100644
--- a/app/src/androidTest/java/info/nightscout/androidaps/SetupWizardActivityTest.kt
+++ b/app/src/androidTest/java/info/nightscout/androidaps/SetupWizardActivityTest.kt
@@ -1,42 +1,7 @@
 package info.nightscout.androidaps
 
-import android.os.SystemClock
-import android.view.View
-import android.view.ViewGroup
-import androidx.test.espresso.Espresso.onData
-import androidx.test.espresso.Espresso.onView
-import androidx.test.espresso.action.ViewActions
-import androidx.test.espresso.action.ViewActions.click
-import androidx.test.espresso.action.ViewActions.scrollTo
-import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
-import androidx.test.espresso.matcher.ViewMatchers.withClassName
-import androidx.test.espresso.matcher.ViewMatchers.withId
-import androidx.test.espresso.matcher.ViewMatchers.withTagValue
-import androidx.test.espresso.matcher.ViewMatchers.withText
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.filters.LargeTest
-import androidx.test.rule.ActivityTestRule
-import androidx.test.rule.GrantPermissionRule
-import info.nightscout.androidaps.interfaces.PluginType
-import info.nightscout.androidaps.plugins.aps.loop.LoopPlugin
-import info.nightscout.androidaps.plugins.aps.openAPSSMB.OpenAPSSMBPlugin
-import info.nightscout.androidaps.plugins.constraints.objectives.ObjectivesPlugin
-import info.nightscout.androidaps.plugins.profile.local.LocalProfilePlugin
-import info.nightscout.androidaps.plugins.pump.virtual.VirtualPumpPlugin
-import info.nightscout.androidaps.plugins.sensitivity.SensitivityOref1Plugin
-import info.nightscout.androidaps.plugins.source.RandomBgPlugin
-import info.nightscout.androidaps.setupwizard.SetupWizardActivity
-import info.nightscout.androidaps.utils.HardLimits
-import info.nightscout.androidaps.utils.extensions.isRunningTest
-import org.hamcrest.CoreMatchers.allOf
-import org.hamcrest.Description
-import org.hamcrest.Matcher
-import org.hamcrest.Matchers
-import org.hamcrest.TypeSafeMatcher
-import org.junit.Assert
-import org.junit.Before
-import org.junit.Rule
-import org.junit.Test
 import org.junit.runner.RunWith
 
 @LargeTest
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index e837d2ce87..f5aa72364e 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -52,7 +52,8 @@
             android:name="com.google.android.gms.car.application"
             android:resource="@xml/automotive_app_desc" />
 
-        <activity android:name=".MainActivity">
+        <activity android:name=".MainActivity"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
                 <action android:name="android.intent.action.MAIN" />
@@ -60,7 +61,8 @@
             </intent-filter>
         </activity>
         <activity android:name=".activities.PreferencesActivity" />
-        <activity android:name=".plugins.general.overview.activities.QuickWizardListActivity">
+        <activity android:name=".plugins.general.overview.activities.QuickWizardListActivity"
+            android:exported="false">
             <intent-filter>
                 <action android:name="info.nightscout.androidaps.plugins.general.overview.activities.QuickWizardListActivity" />
 
@@ -68,7 +70,7 @@
             </intent-filter>
         </activity>
         <activity android:name=".plugins.general.maintenance.activities.PrefImportListActivity" />
-        <activity android:name=".historyBrowser.HistoryBrowseActivity" />
+        <activity android:name=".activities.HistoryBrowseActivity" />
         <activity android:name=".activities.TreatmentsActivity" />
         <activity android:name=".activities.SurveyActivity" />
         <activity android:name=".activities.ProfileHelperActivity"
@@ -115,11 +117,11 @@
             </intent-filter>
         </receiver>
 
-        <!-- Receiver keepalive, scheduled every 30 min -->
+        <!-- Receiver keep alive, scheduled every 30 min -->
         <receiver android:name=".receivers.KeepAliveReceiver" />
 
         <!-- Receive ignore 5m, 15m, 30m requests for carb notifications -->
-        <receiver android:name=".plugins.aps.loop.CarbSuggestionReceiver"></receiver>
+        <receiver android:name=".plugins.aps.loop.CarbSuggestionReceiver" />
 
         <!-- Auto start -->
         <receiver
@@ -241,20 +243,6 @@
             </intent-filter>
         </activity>
 
-        <activity android:name=".plugins.general.openhumans.OpenHumansLoginActivity"
-            android:launchMode="singleTop">
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-
-                <data
-                    android:host="setup-openhumans"
-                    android:scheme="androidaps" />
-            </intent-filter>
-        </activity>
-
         <uses-library android:name="org.apache.http.legacy" android:required="false"/>
 
     </application>
diff --git a/app/src/main/assets/logback.xml b/app/src/main/assets/logback.xml
index 5329eb18d0..b901b4b738 100644
--- a/app/src/main/assets/logback.xml
+++ b/app/src/main/assets/logback.xml
@@ -1,7 +1,7 @@
 <configuration>
     <!-- Create a file appender for a log in the application's data directory -->
     <property name="EXT_FILES_DIR" scope="context"
-        value="${EXT_DIR:-/sdcard}/Android/data/${PACKAGE_NAME}/files" />
+        value="${EXT_DIR:-/sdcard}/AAPS/logs/${PACKAGE_NAME}" />
     <appender name="file" class="ch.qos.logback.core.rolling.RollingFileAppender">
         <file>${EXT_FILES_DIR}/AndroidAPS.log</file>
         <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
diff --git a/app/src/main/java/info/nightscout/androidaps/MainActivity.kt b/app/src/main/java/info/nightscout/androidaps/MainActivity.kt
index cde7563581..764a5727eb 100644
--- a/app/src/main/java/info/nightscout/androidaps/MainActivity.kt
+++ b/app/src/main/java/info/nightscout/androidaps/MainActivity.kt
@@ -34,7 +34,7 @@ import info.nightscout.androidaps.databinding.ActivityMainBinding
 import info.nightscout.androidaps.events.EventAppExit
 import info.nightscout.androidaps.events.EventPreferenceChange
 import info.nightscout.androidaps.events.EventRebuildTabs
-import info.nightscout.androidaps.historyBrowser.HistoryBrowseActivity
+import info.nightscout.androidaps.activities.HistoryBrowseActivity
 import info.nightscout.androidaps.interfaces.ActivePlugin
 import info.nightscout.androidaps.interfaces.Config
 import info.nightscout.androidaps.interfaces.IconsProvider
@@ -95,7 +95,6 @@ class MainActivity : NoSplashAppCompatActivity() {
 
     private lateinit var binding: ActivityMainBinding
 
-    @kotlin.ExperimentalStdlibApi
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         Iconify.with(FontAwesomeModule())
@@ -166,7 +165,7 @@ class MainActivity : NoSplashAppCompatActivity() {
         actionBarDrawerToggle.syncState()
     }
 
-    public override fun onDestroy() {
+    override fun onDestroy() {
         super.onDestroy()
         disposable.clear()
     }
@@ -361,7 +360,6 @@ class MainActivity : NoSplashAppCompatActivity() {
     // Correct place for calling setUserStats() would be probably MainApp
     // but we need to have it called at least once a day. Thus this location
 
-    @kotlin.ExperimentalStdlibApi
     private fun setUserStats() {
         if (!fabricPrivacy.fabricEnabled()) return
         val closedLoopEnabled = if (constraintChecker.isClosedLoopAllowed().value()) "CLOSED_LOOP_ENABLED" else "CLOSED_LOOP_DISABLED"
diff --git a/app/src/main/java/info/nightscout/androidaps/MainApp.kt b/app/src/main/java/info/nightscout/androidaps/MainApp.kt
index 9731bf37d6..f3a0f03ec4 100644
--- a/app/src/main/java/info/nightscout/androidaps/MainApp.kt
+++ b/app/src/main/java/info/nightscout/androidaps/MainApp.kt
@@ -6,7 +6,6 @@ import android.content.IntentFilter
 import android.net.ConnectivityManager
 import android.net.wifi.WifiManager
 import android.os.Build
-import com.j256.ormlite.android.apptools.OpenHelperManager
 import dagger.android.AndroidInjector
 import dagger.android.DaggerApplication
 import info.nightscout.androidaps.database.AppRepository
@@ -15,11 +14,10 @@ import info.nightscout.androidaps.database.entities.UserEntry
 import info.nightscout.androidaps.database.transactions.InsertIfNewByTimestampTherapyEventTransaction
 import info.nightscout.androidaps.database.transactions.VersionChangeTransaction
 import info.nightscout.androidaps.db.CompatDBHelper
-import info.nightscout.androidaps.db.DatabaseHelper
-import info.nightscout.androidaps.db.StaticInjector
+import info.nightscout.androidaps.di.StaticInjector
 import info.nightscout.androidaps.dependencyInjection.DaggerAppComponent
-import info.nightscout.androidaps.interfaces.ConfigBuilder
 import info.nightscout.androidaps.interfaces.Config
+import info.nightscout.androidaps.interfaces.ConfigBuilder
 import info.nightscout.androidaps.interfaces.PluginBase
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
@@ -34,6 +32,7 @@ import info.nightscout.androidaps.receivers.TimeDateOrTZChangeReceiver
 import info.nightscout.androidaps.utils.ActivityMonitor
 import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.utils.locale.LocaleHelper.update
+import info.nightscout.androidaps.utils.protection.PasswordCheck
 import info.nightscout.androidaps.utils.sharedPreferences.SP
 import io.reactivex.disposables.CompositeDisposable
 import io.reactivex.rxkotlin.plusAssign
@@ -58,12 +57,12 @@ class MainApp : DaggerApplication() {
     @Inject lateinit var dateUtil: DateUtil
     @Inject lateinit var staticInjector: StaticInjector// TODO avoid , here fake only to initialize
     @Inject lateinit var uel: UserEntryLogger
+    @Inject lateinit var passwordCheck: PasswordCheck
 
     override fun onCreate() {
         super.onCreate()
         aapsLogger.debug("onCreate")
         update(this)
-        dbHelper = OpenHelperManager.getHelper(this, DatabaseHelper::class.java)
 
         var gitRemote: String? = BuildConfig.REMOTE
         var commitHash: String? = BuildConfig.HEAD
@@ -90,6 +89,7 @@ class MainApp : DaggerApplication() {
         keepAliveManager.setAlarm(this)
         doMigrations()
         uel.log(UserEntry.Action.START_AAPS, UserEntry.Sources.Aaps)
+        passwordCheck.passwordResetCheck(this)
     }
 
     private fun doMigrations() {
@@ -134,9 +134,4 @@ class MainApp : DaggerApplication() {
         keepAliveManager.cancelAlarm(this)
         super.onTerminate()
     }
-
-    companion object {
-
-        lateinit var dbHelper: DatabaseHelper
-    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/activities/HistoryBrowseActivity.kt b/app/src/main/java/info/nightscout/androidaps/activities/HistoryBrowseActivity.kt
new file mode 100644
index 0000000000..c043614228
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/activities/HistoryBrowseActivity.kt
@@ -0,0 +1,406 @@
+package info.nightscout.androidaps.activities
+
+import android.annotation.SuppressLint
+import android.app.DatePickerDialog
+import android.graphics.Color
+import android.os.Bundle
+import android.util.DisplayMetrics
+import android.view.ViewGroup
+import android.widget.LinearLayout
+import android.widget.RelativeLayout
+import android.widget.TextView
+import com.jjoe64.graphview.GraphView
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.database.AppRepository
+import info.nightscout.androidaps.databinding.ActivityHistorybrowseBinding
+import info.nightscout.androidaps.events.EventAutosensCalculationFinished
+import info.nightscout.androidaps.events.EventCustomCalculationFinished
+import info.nightscout.androidaps.events.EventRefreshOverview
+import info.nightscout.androidaps.extensions.toVisibility
+import info.nightscout.androidaps.interfaces.ActivePlugin
+import info.nightscout.androidaps.interfaces.Config
+import info.nightscout.androidaps.interfaces.ProfileFunction
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.aps.loop.LoopPlugin
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.general.nsclient.data.NSDeviceStatus
+import info.nightscout.androidaps.plugins.general.overview.OverviewData
+import info.nightscout.androidaps.plugins.general.overview.OverviewMenus
+import info.nightscout.androidaps.plugins.general.overview.graphData.GraphData
+import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobCalculatorPlugin
+import info.nightscout.androidaps.plugins.iob.iobCobCalculator.events.EventBucketedDataCreated
+import info.nightscout.androidaps.plugins.iob.iobCobCalculator.events.EventIobCalculationProgress
+import info.nightscout.androidaps.plugins.sensitivity.SensitivityAAPSPlugin
+import info.nightscout.androidaps.plugins.sensitivity.SensitivityOref1Plugin
+import info.nightscout.androidaps.plugins.sensitivity.SensitivityWeightedAveragePlugin
+import info.nightscout.androidaps.utils.*
+import info.nightscout.androidaps.utils.buildHelper.BuildHelper
+import info.nightscout.androidaps.utils.rx.AapsSchedulers
+import info.nightscout.androidaps.utils.sharedPreferences.SP
+import io.reactivex.disposables.CompositeDisposable
+import io.reactivex.rxkotlin.plusAssign
+import java.util.*
+import javax.inject.Inject
+import kotlin.math.min
+
+class HistoryBrowseActivity : NoSplashAppCompatActivity() {
+
+    @Inject lateinit var injector: HasAndroidInjector
+    @Inject lateinit var aapsLogger: AAPSLogger
+    @Inject lateinit var aapsSchedulers: AapsSchedulers
+    @Inject lateinit var rxBus: RxBusWrapper
+    @Inject lateinit var sp: SP
+    @Inject lateinit var profileFunction: ProfileFunction
+    @Inject lateinit var defaultValueHelper: DefaultValueHelper
+    @Inject lateinit var activePlugin: ActivePlugin
+    @Inject lateinit var buildHelper: BuildHelper
+    @Inject lateinit var sensitivityOref1Plugin: SensitivityOref1Plugin
+    @Inject lateinit var sensitivityAAPSPlugin: SensitivityAAPSPlugin
+    @Inject lateinit var sensitivityWeightedAveragePlugin: SensitivityWeightedAveragePlugin
+    @Inject lateinit var repository: AppRepository
+    @Inject lateinit var fabricPrivacy: FabricPrivacy
+    @Inject lateinit var overviewMenus: OverviewMenus
+    @Inject lateinit var dateUtil: DateUtil
+    @Inject lateinit var config: Config
+    @Inject lateinit var loopPlugin: LoopPlugin
+    @Inject lateinit var nsDeviceStatus: NSDeviceStatus
+    @Inject lateinit var translator: Translator
+
+    private val disposable = CompositeDisposable()
+
+    private val secondaryGraphs = ArrayList<GraphView>()
+    private val secondaryGraphsLabel = ArrayList<TextView>()
+
+    private var axisWidth: Int = 0
+    private var rangeToDisplay = 24 // for graph
+//    private var start: Long = 0
+
+    private lateinit var iobCobCalculator: IobCobCalculatorPlugin
+    private lateinit var overviewData: OverviewData
+
+    private lateinit var binding: ActivityHistorybrowseBinding
+    private var destroyed = false
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        binding = ActivityHistorybrowseBinding.inflate(layoutInflater)
+        setContentView(binding.root)
+
+        // We don't want to use injected singletons but own instance working on top of different data
+        iobCobCalculator = IobCobCalculatorPlugin(injector, aapsLogger, aapsSchedulers, rxBus, sp, resourceHelper, profileFunction, activePlugin, sensitivityOref1Plugin, sensitivityAAPSPlugin, sensitivityWeightedAveragePlugin, fabricPrivacy, dateUtil, repository)
+        overviewData = OverviewData(injector, aapsLogger, resourceHelper, dateUtil, sp, activePlugin, defaultValueHelper, profileFunction, config, loopPlugin, nsDeviceStatus, repository, overviewMenus, iobCobCalculator, translator)
+
+        binding.left.setOnClickListener {
+            adjustTimeRange(overviewData.fromTime - T.hours(rangeToDisplay.toLong()).msecs())
+            loadAll("onClickLeft")
+        }
+        binding.right.setOnClickListener {
+            adjustTimeRange(overviewData.fromTime + T.hours(rangeToDisplay.toLong()).msecs())
+            loadAll("onClickRight")
+        }
+        binding.end.setOnClickListener {
+            setTime(dateUtil.now())
+            loadAll("onClickEnd")
+        }
+        binding.zoom.setOnClickListener {
+            rangeToDisplay += 6
+            rangeToDisplay = if (rangeToDisplay > 24) 6 else rangeToDisplay
+            setTime(overviewData.fromTime)
+            loadAll("rangeChange")
+        }
+        binding.zoom.setOnLongClickListener {
+            Calendar.getInstance().also { calendar ->
+                calendar.timeInMillis = overviewData.fromTime
+                calendar[Calendar.MILLISECOND] = 0
+                calendar[Calendar.SECOND] = 0
+                calendar[Calendar.MINUTE] = 0
+                calendar[Calendar.HOUR_OF_DAY] = 0
+                setTime(calendar.timeInMillis)
+            }
+            loadAll("onLongClickZoom")
+            true
+        }
+
+        // create an OnDateSetListener
+        val dateSetListener = DatePickerDialog.OnDateSetListener { _, year, monthOfYear, dayOfMonth ->
+            Calendar.getInstance().also { calendar ->
+                calendar.timeInMillis = overviewData.fromTime
+                calendar[Calendar.YEAR] = year
+                calendar[Calendar.MONTH] = monthOfYear
+                calendar[Calendar.DAY_OF_MONTH] = dayOfMonth
+                calendar[Calendar.MILLISECOND] = 0
+                calendar[Calendar.SECOND] = 0
+                calendar[Calendar.MINUTE] = 0
+                calendar[Calendar.HOUR_OF_DAY] = 0
+                setTime(calendar.timeInMillis)
+                binding.date.text = dateUtil.dateAndTimeString(overviewData.fromTime)
+            }
+            loadAll("onClickDate")
+        }
+
+        binding.date.setOnClickListener {
+            val cal = Calendar.getInstance()
+            cal.timeInMillis = overviewData.fromTime
+            DatePickerDialog(this, dateSetListener,
+                    cal.get(Calendar.YEAR),
+                    cal.get(Calendar.MONTH),
+                    cal.get(Calendar.DAY_OF_MONTH)
+            ).show()
+        }
+
+        val dm = DisplayMetrics()
+        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.R)
+            display?.getRealMetrics(dm)
+        else
+            @Suppress("DEPRECATION") windowManager.defaultDisplay.getMetrics(dm)
+
+
+        axisWidth = if (dm.densityDpi <= 120) 3 else if (dm.densityDpi <= 160) 10 else if (dm.densityDpi <= 320) 35 else if (dm.densityDpi <= 420) 50 else if (dm.densityDpi <= 560) 70 else 80
+        binding.bgGraph.gridLabelRenderer?.gridColor = resourceHelper.gc(R.color.graphgrid)
+        binding.bgGraph.gridLabelRenderer?.reloadStyles()
+        binding.bgGraph.gridLabelRenderer?.labelVerticalWidth = axisWidth
+
+        overviewMenus.setupChartMenu(binding.chartMenuButton)
+        prepareGraphsIfNeeded(overviewMenus.setting.size)
+        savedInstanceState?.let { bundle ->
+            rangeToDisplay = bundle.getInt("rangeToDisplay", 0)
+            overviewData.fromTime = bundle.getLong("start", 0)
+            overviewData.toTime = bundle.getLong("end", 0)
+        }
+    }
+
+    override fun onPause() {
+        super.onPause()
+        disposable.clear()
+        iobCobCalculator.stopCalculation("onPause")
+    }
+
+    @Synchronized
+    override fun onDestroy() {
+        destroyed = true
+        super.onDestroy()
+    }
+
+    override fun onResume() {
+        super.onResume()
+        disposable.add(rxBus
+                .toObservable(EventAutosensCalculationFinished::class.java)
+                .observeOn(aapsSchedulers.io)
+                .subscribe({
+                    // catch only events from iobCobCalculator
+                    if (it.cause is EventCustomCalculationFinished)
+                        refreshLoop("EventAutosensCalculationFinished")
+                }, fabricPrivacy::logException)
+        )
+        disposable.add(rxBus
+                .toObservable(EventIobCalculationProgress::class.java)
+                .observeOn(aapsSchedulers.main)
+                .subscribe({
+                    if (it.cause is EventCustomCalculationFinished)
+                        binding.overviewIobcalculationprogess.text = it.progress
+                }, fabricPrivacy::logException)
+        )
+        disposable.add(rxBus
+                .toObservable(EventRefreshOverview::class.java)
+                .observeOn(aapsSchedulers.main)
+                .subscribe({ updateGUI("EventRefreshOverview") }, fabricPrivacy::logException)
+        )
+        disposable += rxBus
+                .toObservable(EventBucketedDataCreated::class.java)
+                .observeOn(aapsSchedulers.io)
+                .subscribe({
+                    overviewData.prepareBucketedData("EventBucketedDataCreated")
+                    overviewData.prepareBgData("EventBucketedDataCreated")
+                    rxBus.send(EventRefreshOverview("EventBucketedDataCreated"))
+                }, fabricPrivacy::logException)
+
+        if (overviewData.fromTime == 0L) {
+            // set start of current day
+            setTime(dateUtil.now())
+            loadAll("onResume")
+        } else {
+            updateGUI("onResume")
+        }
+    }
+
+    override fun onSaveInstanceState(outState: Bundle) {
+        super.onSaveInstanceState(outState)
+        outState.putInt("rangeToDisplay", rangeToDisplay)
+        outState.putLong("start", overviewData.fromTime)
+        outState.putLong("end", overviewData.toTime)
+    }
+
+    private fun prepareGraphsIfNeeded(numOfGraphs: Int) {
+        if (numOfGraphs != secondaryGraphs.size - 1) {
+            //aapsLogger.debug("New secondary graph count ${numOfGraphs-1}")
+            // rebuild needed
+            secondaryGraphs.clear()
+            secondaryGraphsLabel.clear()
+            binding.iobGraph.removeAllViews()
+            for (i in 1 until numOfGraphs) {
+                val relativeLayout = RelativeLayout(this)
+                relativeLayout.layoutParams = RelativeLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT)
+
+                val graph = GraphView(this)
+                graph.layoutParams = LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, resourceHelper.dpToPx(100)).also { it.setMargins(0, resourceHelper.dpToPx(15), 0, resourceHelper.dpToPx(10)) }
+                graph.gridLabelRenderer?.gridColor = resourceHelper.gc(R.color.graphgrid)
+                graph.gridLabelRenderer?.reloadStyles()
+                graph.gridLabelRenderer?.isHorizontalLabelsVisible = false
+                graph.gridLabelRenderer?.labelVerticalWidth = axisWidth
+                graph.gridLabelRenderer?.numVerticalLabels = 3
+                graph.viewport.backgroundColor = Color.argb(20, 255, 255, 255) // 8% of gray
+                relativeLayout.addView(graph)
+
+                val label = TextView(this)
+                val layoutParams = RelativeLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT).also { it.setMargins(resourceHelper.dpToPx(30), resourceHelper.dpToPx(25), 0, 0) }
+                layoutParams.addRule(RelativeLayout.ALIGN_PARENT_TOP)
+                layoutParams.addRule(RelativeLayout.ALIGN_PARENT_LEFT)
+                label.layoutParams = layoutParams
+                relativeLayout.addView(label)
+                secondaryGraphsLabel.add(label)
+
+                binding.iobGraph.addView(relativeLayout)
+                secondaryGraphs.add(graph)
+            }
+        }
+    }
+
+    @Suppress("SameParameterValue")
+    private fun loadAll(from: String) {
+        updateDate()
+        Thread {
+            overviewData.prepareBgData("$from")
+            overviewData.prepareTreatmentsData(from)
+            rxBus.send(EventRefreshOverview("loadAll_$from"))
+            overviewData.prepareTemporaryTargetData(from)
+            rxBus.send(EventRefreshOverview("loadAll_$from"))
+            overviewData.prepareBasalData(from)
+            rxBus.send(EventRefreshOverview(from))
+            aapsLogger.debug(LTag.UI, "loadAll $from finished")
+            runCalculation(from)
+        }.start()
+    }
+
+    private fun setTime(start: Long) {
+        GregorianCalendar().also { calendar ->
+            calendar.timeInMillis = start
+            calendar[Calendar.MILLISECOND] = 0
+            calendar[Calendar.SECOND] = 0
+            calendar[Calendar.MINUTE] = 0
+            calendar[Calendar.HOUR_OF_DAY] -= (calendar[Calendar.HOUR_OF_DAY] % rangeToDisplay)
+            adjustTimeRange(calendar.timeInMillis)
+        }
+    }
+
+    private fun adjustTimeRange(start: Long) {
+        overviewData.fromTime = start
+        overviewData.toTime = overviewData.fromTime + T.hours(rangeToDisplay.toLong()).msecs()
+        overviewData.endTime = overviewData.toTime
+    }
+
+    private fun runCalculation(from: String) {
+        Thread {
+            iobCobCalculator.stopCalculation(from)
+            iobCobCalculator.stopCalculationTrigger = false
+            iobCobCalculator.runCalculation(from, overviewData.toTime, bgDataReload = true, limitDataToOldestAvailable = false, cause = EventCustomCalculationFinished())
+        }.start()
+    }
+
+    @Volatile
+    var runningRefresh = false
+    private fun refreshLoop(from: String) {
+        if (runningRefresh) return
+        runningRefresh = true
+        overviewData.prepareIobAutosensData(from)
+        rxBus.send(EventRefreshOverview(from))
+        aapsLogger.debug(LTag.UI, "refreshLoop finished")
+        runningRefresh = false
+    }
+
+    fun updateDate() {
+        binding.date.text = dateUtil.dateAndTimeString(overviewData.fromTime)
+        binding.zoom.text = rangeToDisplay.toString()
+    }
+
+    @Suppress("UNUSED_PARAMETER")
+    @SuppressLint("SetTextI18n")
+    fun updateGUI(from: String) {
+        aapsLogger.debug(LTag.UI, "updateGui $from")
+
+        updateDate()
+
+        val pump = activePlugin.activePump
+        val graphData = GraphData(injector, binding.bgGraph, overviewData)
+        val menuChartSettings = overviewMenus.setting
+        graphData.addInRangeArea(overviewData.fromTime, overviewData.endTime, defaultValueHelper.determineLowLine(), defaultValueHelper.determineHighLine())
+        graphData.addBgReadings(menuChartSettings[0][OverviewMenus.CharType.PRE.ordinal])
+        if (buildHelper.isDev()) graphData.addBucketedData()
+        graphData.addTreatments()
+        if (menuChartSettings[0][OverviewMenus.CharType.ACT.ordinal])
+            graphData.addActivity(0.8)
+        if (pump.pumpDescription.isTempBasalCapable && menuChartSettings[0][OverviewMenus.CharType.BAS.ordinal])
+            graphData.addBasals()
+        graphData.addTargetLine()
+        graphData.addNowLine(dateUtil.now())
+
+        // set manual x bounds to have nice steps
+        graphData.setNumVerticalLabels()
+        graphData.formatAxis(overviewData.fromTime, overviewData.endTime)
+
+        graphData.performUpdate()
+
+        // 2nd graphs
+        prepareGraphsIfNeeded(menuChartSettings.size)
+        val secondaryGraphsData: ArrayList<GraphData> = ArrayList()
+
+        val now = System.currentTimeMillis()
+        for (g in 0 until min(secondaryGraphs.size, menuChartSettings.size + 1)) {
+            val secondGraphData = GraphData(injector, secondaryGraphs[g], overviewData)
+            var useABSForScale = false
+            var useIobForScale = false
+            var useCobForScale = false
+            var useDevForScale = false
+            var useRatioForScale = false
+            var useDSForScale = false
+            var useBGIForScale = false
+            when {
+                menuChartSettings[g + 1][OverviewMenus.CharType.ABS.ordinal] -> useABSForScale = true
+                menuChartSettings[g + 1][OverviewMenus.CharType.IOB.ordinal] -> useIobForScale = true
+                menuChartSettings[g + 1][OverviewMenus.CharType.COB.ordinal] -> useCobForScale = true
+                menuChartSettings[g + 1][OverviewMenus.CharType.DEV.ordinal] -> useDevForScale = true
+                menuChartSettings[g + 1][OverviewMenus.CharType.BGI.ordinal] -> useBGIForScale = true
+                menuChartSettings[g + 1][OverviewMenus.CharType.SEN.ordinal] -> useRatioForScale = true
+                menuChartSettings[g + 1][OverviewMenus.CharType.DEVSLOPE.ordinal] -> useDSForScale = true
+            }
+            val alignDevBgiScale = menuChartSettings[g + 1][OverviewMenus.CharType.DEV.ordinal] && menuChartSettings[g + 1][OverviewMenus.CharType.BGI.ordinal]
+
+            if (menuChartSettings[g + 1][OverviewMenus.CharType.ABS.ordinal]) secondGraphData.addAbsIob(useABSForScale, 1.0)
+            if (menuChartSettings[g + 1][OverviewMenus.CharType.IOB.ordinal]) secondGraphData.addIob(useIobForScale, 1.0)
+            if (menuChartSettings[g + 1][OverviewMenus.CharType.COB.ordinal]) secondGraphData.addCob(useCobForScale, if (useCobForScale) 1.0 else 0.5)
+            if (menuChartSettings[g + 1][OverviewMenus.CharType.DEV.ordinal]) secondGraphData.addDeviations(useDevForScale, 1.0)
+            if (menuChartSettings[g + 1][OverviewMenus.CharType.BGI.ordinal]) secondGraphData.addMinusBGI(useBGIForScale, if (alignDevBgiScale) 1.0 else 0.8)
+            if (menuChartSettings[g + 1][OverviewMenus.CharType.SEN.ordinal]) secondGraphData.addRatio(useRatioForScale, if (useRatioForScale) 1.0 else 0.8)
+            if (menuChartSettings[g + 1][OverviewMenus.CharType.DEVSLOPE.ordinal] && buildHelper.isDev()) secondGraphData.addDeviationSlope(useDSForScale, 1.0)
+
+            // set manual x bounds to have nice steps
+            secondGraphData.formatAxis(overviewData.fromTime, overviewData.endTime)
+            secondGraphData.addNowLine(now)
+            secondaryGraphsData.add(secondGraphData)
+        }
+        for (g in 0 until min(secondaryGraphs.size, menuChartSettings.size + 1)) {
+            secondaryGraphsLabel[g].text = overviewMenus.enabledTypes(g + 1)
+            secondaryGraphs[g].visibility = (
+                    menuChartSettings[g + 1][OverviewMenus.CharType.ABS.ordinal] ||
+                            menuChartSettings[g + 1][OverviewMenus.CharType.IOB.ordinal] ||
+                            menuChartSettings[g + 1][OverviewMenus.CharType.COB.ordinal] ||
+                            menuChartSettings[g + 1][OverviewMenus.CharType.DEV.ordinal] ||
+                            menuChartSettings[g + 1][OverviewMenus.CharType.BGI.ordinal] ||
+                            menuChartSettings[g + 1][OverviewMenus.CharType.SEN.ordinal] ||
+                            menuChartSettings[g + 1][OverviewMenus.CharType.DEVSLOPE.ordinal]
+                    ).toVisibility()
+            secondaryGraphsData[g].performUpdate()
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/activities/MyPreferenceFragment.kt b/app/src/main/java/info/nightscout/androidaps/activities/MyPreferenceFragment.kt
index 048b9c0d73..eb74f7b8cf 100644
--- a/app/src/main/java/info/nightscout/androidaps/activities/MyPreferenceFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/activities/MyPreferenceFragment.kt
@@ -14,11 +14,13 @@ import info.nightscout.androidaps.danaRKorean.DanaRKoreanPlugin
 import info.nightscout.androidaps.danaRv2.DanaRv2Plugin
 import info.nightscout.androidaps.danar.DanaRPlugin
 import info.nightscout.androidaps.danars.DanaRSPlugin
+import info.nightscout.androidaps.diaconn.DiaconnG8Plugin
 import info.nightscout.androidaps.interfaces.Profile
 import info.nightscout.androidaps.events.EventPreferenceChange
 import info.nightscout.androidaps.events.EventRebuildTabs
 import info.nightscout.androidaps.interfaces.PluginBase
 import info.nightscout.androidaps.interfaces.ProfileFunction
+import info.nightscout.androidaps.plugin.general.openhumans.OpenHumansUploader
 import info.nightscout.androidaps.plugins.aps.loop.LoopPlugin
 import info.nightscout.androidaps.plugins.aps.openAPSAMA.OpenAPSAMAPlugin
 import info.nightscout.androidaps.plugins.aps.openAPSSMB.OpenAPSSMBPlugin
@@ -29,7 +31,6 @@ import info.nightscout.androidaps.plugins.general.automation.AutomationPlugin
 import info.nightscout.androidaps.plugins.general.maintenance.MaintenancePlugin
 import info.nightscout.androidaps.plugins.general.nsclient.NSClientPlugin
 import info.nightscout.androidaps.plugins.general.nsclient.data.NSSettingsStatus
-import info.nightscout.androidaps.plugins.general.openhumans.OpenHumansUploader
 import info.nightscout.androidaps.plugins.general.smsCommunicator.SmsCommunicatorPlugin
 import info.nightscout.androidaps.plugins.general.tidepool.TidepoolPlugin
 import info.nightscout.androidaps.plugins.general.wear.WearPlugin
@@ -99,6 +100,7 @@ class MyPreferenceFragment : PreferenceFragmentCompat(), OnSharedPreferenceChang
     @Inject lateinit var passwordCheck: PasswordCheck
     @Inject lateinit var nsSettingStatus: NSSettingsStatus
     @Inject lateinit var openHumansUploader: OpenHumansUploader
+    @Inject lateinit var diaconnG8Plugin: DiaconnG8Plugin
 
     override fun onAttach(context: Context) {
         AndroidSupportInjection.inject(this)
@@ -173,6 +175,7 @@ class MyPreferenceFragment : PreferenceFragmentCompat(), OnSharedPreferenceChang
             addPreferencesFromResourceIfEnabled(localInsightPlugin, rootKey, config.PUMPDRIVERS)
             addPreferencesFromResourceIfEnabled(comboPlugin, rootKey, config.PUMPDRIVERS)
             addPreferencesFromResourceIfEnabled(medtronicPumpPlugin, rootKey, config.PUMPDRIVERS)
+            addPreferencesFromResourceIfEnabled(diaconnG8Plugin, rootKey, config.PUMPDRIVERS)
             addPreferencesFromResource(R.xml.pref_pump, rootKey, config.PUMPDRIVERS)
             addPreferencesFromResourceIfEnabled(virtualPumpPlugin, rootKey)
             addPreferencesFromResourceIfEnabled(insulinOrefFreePeakPlugin, rootKey)
@@ -182,7 +185,7 @@ class MyPreferenceFragment : PreferenceFragmentCompat(), OnSharedPreferenceChang
             addPreferencesFromResourceIfEnabled(automationPlugin, rootKey)
             addPreferencesFromResourceIfEnabled(wearPlugin, rootKey)
             addPreferencesFromResourceIfEnabled(statusLinePlugin, rootKey)
-            addPreferencesFromResource(R.xml.pref_alerts, rootKey) // TODO not organized well
+            addPreferencesFromResource(R.xml.pref_alerts, rootKey)
             addPreferencesFromResource(R.xml.pref_datachoices, rootKey)
             addPreferencesFromResourceIfEnabled(maintenancePlugin, rootKey)
             addPreferencesFromResourceIfEnabled(openHumansUploader, rootKey)
diff --git a/app/src/main/java/info/nightscout/androidaps/activities/RequestDexcomPermissionActivity.kt b/app/src/main/java/info/nightscout/androidaps/activities/RequestDexcomPermissionActivity.kt
index c5b03dc0f5..fd01500652 100644
--- a/app/src/main/java/info/nightscout/androidaps/activities/RequestDexcomPermissionActivity.kt
+++ b/app/src/main/java/info/nightscout/androidaps/activities/RequestDexcomPermissionActivity.kt
@@ -7,10 +7,8 @@ import javax.inject.Inject
 class RequestDexcomPermissionActivity : DialogAppCompatActivity() {
     @Inject lateinit var dexcomPlugin: DexcomPlugin
 
-    @kotlin.ExperimentalStdlibApi
     private val requestCode = "AndroidAPS <3".map { it.code }.sum()
 
-    @kotlin.ExperimentalStdlibApi
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         requestPermissions(arrayOf(DexcomPlugin.PERMISSION), requestCode)
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/activities/StatsActivity.kt b/app/src/main/java/info/nightscout/androidaps/activities/StatsActivity.kt
index 8edeccfebd..82912e3da3 100644
--- a/app/src/main/java/info/nightscout/androidaps/activities/StatsActivity.kt
+++ b/app/src/main/java/info/nightscout/androidaps/activities/StatsActivity.kt
@@ -1,5 +1,6 @@
 package info.nightscout.androidaps.activities
 
+import android.annotation.SuppressLint
 import android.os.Bundle
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.database.entities.UserEntry.Action
@@ -21,14 +22,28 @@ class StatsActivity : NoSplashAppCompatActivity() {
 
     private lateinit var binding: ActivityStatsBinding
 
+    @SuppressLint("SetTextI18n")
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         binding = ActivityStatsBinding.inflate(layoutInflater)
         setContentView(binding.root)
 
-        binding.tdds.text = tddCalculator.stats()
-        binding.tir.text = tirCalculator.stats()
-        binding.activity.text = activityMonitor.stats()
+        binding.tdds.text = getString(R.string.tdd) + ": " + getString(R.string.calculation_in_progress)
+        binding.tir.text = getString(R.string.tir) + ": " + getString(R.string.calculation_in_progress)
+        binding.activity.text = getString(R.string.activitymonitor) + ": " + getString(R.string.calculation_in_progress)
+
+        Thread {
+            val tdds = tddCalculator.stats()
+            runOnUiThread { binding.tdds.text = tdds }
+        }.start()
+        Thread {
+            val tir = tirCalculator.stats()
+            runOnUiThread { binding.tir.text = tir }
+        }.start()
+        Thread {
+            val activity = activityMonitor.stats()
+            runOnUiThread { binding.activity.text = activity }
+        }.start()
 
         binding.ok.setOnClickListener { finish() }
         binding.reset.setOnClickListener {
diff --git a/app/src/main/java/info/nightscout/androidaps/activities/fragments/TreatmentsBolusCarbsFragment.kt b/app/src/main/java/info/nightscout/androidaps/activities/fragments/TreatmentsBolusCarbsFragment.kt
index 4b5dc48e2a..051c6ba212 100644
--- a/app/src/main/java/info/nightscout/androidaps/activities/fragments/TreatmentsBolusCarbsFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/activities/fragments/TreatmentsBolusCarbsFragment.kt
@@ -31,7 +31,7 @@ import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.logging.UserEntryLogger
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.general.nsclient.events.EventNSClientRestart
-import info.nightscout.androidaps.plugins.treatments.events.EventTreatmentUpdateGui
+import info.nightscout.androidaps.events.EventTreatmentUpdateGui
 import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.utils.FabricPrivacy
 import info.nightscout.androidaps.utils.T
diff --git a/app/src/main/java/info/nightscout/androidaps/activities/fragments/TreatmentsCareportalFragment.kt b/app/src/main/java/info/nightscout/androidaps/activities/fragments/TreatmentsCareportalFragment.kt
index f3eb9e551f..e7c9fc480c 100644
--- a/app/src/main/java/info/nightscout/androidaps/activities/fragments/TreatmentsCareportalFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/activities/fragments/TreatmentsCareportalFragment.kt
@@ -24,7 +24,7 @@ import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.logging.UserEntryLogger
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.general.nsclient.events.EventNSClientRestart
-import info.nightscout.androidaps.plugins.treatments.events.EventTreatmentUpdateGui
+import info.nightscout.androidaps.events.EventTreatmentUpdateGui
 import info.nightscout.androidaps.activities.fragments.TreatmentsCareportalFragment.RecyclerViewAdapter.TherapyEventsViewHolder
 import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.utils.FabricPrivacy
diff --git a/app/src/main/java/info/nightscout/androidaps/activities/fragments/TreatmentsProfileSwitchFragment.kt b/app/src/main/java/info/nightscout/androidaps/activities/fragments/TreatmentsProfileSwitchFragment.kt
index 151b37234f..846fa50ec6 100644
--- a/app/src/main/java/info/nightscout/androidaps/activities/fragments/TreatmentsProfileSwitchFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/activities/fragments/TreatmentsProfileSwitchFragment.kt
@@ -29,7 +29,7 @@ import info.nightscout.androidaps.plugins.general.nsclient.events.EventNSClientR
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.events.EventNewHistoryData
 import info.nightscout.androidaps.plugins.profile.local.LocalProfilePlugin
 import info.nightscout.androidaps.plugins.profile.local.events.EventLocalProfileChanged
-import info.nightscout.androidaps.plugins.treatments.events.EventTreatmentUpdateGui
+import info.nightscout.androidaps.events.EventTreatmentUpdateGui
 import info.nightscout.androidaps.activities.fragments.TreatmentsProfileSwitchFragment.RecyclerProfileViewAdapter.ProfileSwitchViewHolder
 import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.utils.FabricPrivacy
diff --git a/app/src/main/java/info/nightscout/androidaps/activities/fragments/TreatmentsTempTargetFragment.kt b/app/src/main/java/info/nightscout/androidaps/activities/fragments/TreatmentsTempTargetFragment.kt
index 16e8a5ae32..ea87274914 100644
--- a/app/src/main/java/info/nightscout/androidaps/activities/fragments/TreatmentsTempTargetFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/activities/fragments/TreatmentsTempTargetFragment.kt
@@ -28,7 +28,7 @@ import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.logging.UserEntryLogger
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.general.nsclient.events.EventNSClientRestart
-import info.nightscout.androidaps.plugins.treatments.events.EventTreatmentUpdateGui
+import info.nightscout.androidaps.events.EventTreatmentUpdateGui
 import info.nightscout.androidaps.activities.fragments.TreatmentsTempTargetFragment.RecyclerViewAdapter.TempTargetsViewHolder
 import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.utils.FabricPrivacy
diff --git a/app/src/main/java/info/nightscout/androidaps/activities/fragments/TreatmentsTemporaryBasalsFragment.kt b/app/src/main/java/info/nightscout/androidaps/activities/fragments/TreatmentsTemporaryBasalsFragment.kt
index 590fef204f..c856386cb6 100644
--- a/app/src/main/java/info/nightscout/androidaps/activities/fragments/TreatmentsTemporaryBasalsFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/activities/fragments/TreatmentsTemporaryBasalsFragment.kt
@@ -190,7 +190,6 @@ class TreatmentsTemporaryBasalsFragment : DaggerFragment() {
 
         override fun getItemCount(): Int = tempBasalList.size
 
-        @Deprecated("remove remove functionality after finish")
         inner class TempBasalsViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
 
             val binding = TreatmentsTempbasalsItemBinding.bind(itemView)
diff --git a/app/src/main/java/info/nightscout/androidaps/activities/fragments/TreatmentsUserEntryFragment.kt b/app/src/main/java/info/nightscout/androidaps/activities/fragments/TreatmentsUserEntryFragment.kt
index b0936580ae..a0b5d1b169 100644
--- a/app/src/main/java/info/nightscout/androidaps/activities/fragments/TreatmentsUserEntryFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/activities/fragments/TreatmentsUserEntryFragment.kt
@@ -19,7 +19,7 @@ import info.nightscout.androidaps.interfaces.ImportExportPrefs
 import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.logging.UserEntryLogger
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
-import info.nightscout.androidaps.plugins.treatments.events.EventTreatmentUpdateGui
+import info.nightscout.androidaps.events.EventTreatmentUpdateGui
 import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.utils.FabricPrivacy
 import info.nightscout.androidaps.utils.T
diff --git a/app/src/main/java/info/nightscout/androidaps/data/defaultProfile/DefaultProfile.kt b/app/src/main/java/info/nightscout/androidaps/data/defaultProfile/DefaultProfile.kt
index fa8b2774be..88066767bd 100644
--- a/app/src/main/java/info/nightscout/androidaps/data/defaultProfile/DefaultProfile.kt
+++ b/app/src/main/java/info/nightscout/androidaps/data/defaultProfile/DefaultProfile.kt
@@ -11,6 +11,7 @@ import org.json.JSONObject
 import java.util.*
 import javax.inject.Inject
 import javax.inject.Singleton
+import kotlin.math.abs
 
 @Singleton
 class DefaultProfile @Inject constructor(val dateUtil: DateUtil) {
@@ -120,12 +121,12 @@ class DefaultProfile @Inject constructor(val dateUtil: DateUtil) {
         val high = map.ceilingEntry(key)
         var res: Array<Double>? = null
         if (low != null && high != null) {
-            res = if (Math.abs(key - low.key) < Math.abs(key - high.key))
+            res = if (abs(key - low.key) < abs(key - high.key))
                 low.value
             else
                 high.value
         } else if (low != null || high != null) {
-            res = if (low != null) low.value else high.value
+            res = if (low != null) low.value else high!!.value
         }
         return res
     }
diff --git a/app/src/main/java/info/nightscout/androidaps/db/CompatDBHelper.kt b/app/src/main/java/info/nightscout/androidaps/db/CompatDBHelper.kt
index 2bb83ef910..1f238d014a 100644
--- a/app/src/main/java/info/nightscout/androidaps/db/CompatDBHelper.kt
+++ b/app/src/main/java/info/nightscout/androidaps/db/CompatDBHelper.kt
@@ -82,5 +82,9 @@ class CompatDBHelper @Inject constructor(
                 aapsLogger.debug(LTag.DATABASE, "Firing EventProfileSwitchChanged")
                 rxBus.send(EventProfileSwitchChanged())
             }
+            it.filterIsInstance<OfflineEvent>().firstOrNull()?.let {
+                aapsLogger.debug(LTag.DATABASE, "Firing EventOfflineChange")
+                rxBus.send(EventOfflineChange())
+            }
         }
 }
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/db/DatabaseHelper.java b/app/src/main/java/info/nightscout/androidaps/db/DatabaseHelper.java
deleted file mode 100644
index c323a475be..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/db/DatabaseHelper.java
+++ /dev/null
@@ -1,296 +0,0 @@
-package info.nightscout.androidaps.db;
-
-import android.content.Context;
-import android.database.DatabaseUtils;
-import android.database.sqlite.SQLiteDatabase;
-
-import com.j256.ormlite.android.apptools.OrmLiteSqliteOpenHelper;
-import com.j256.ormlite.dao.CloseableIterator;
-import com.j256.ormlite.dao.Dao;
-import com.j256.ormlite.stmt.DeleteBuilder;
-import com.j256.ormlite.stmt.PreparedQuery;
-import com.j256.ormlite.stmt.QueryBuilder;
-import com.j256.ormlite.stmt.Where;
-import com.j256.ormlite.support.ConnectionSource;
-import com.j256.ormlite.table.TableUtils;
-
-import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import javax.inject.Inject;
-
-import info.nightscout.androidaps.events.EventRefreshOverview;
-import info.nightscout.androidaps.interfaces.ActivePlugin;
-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.openhumans.OpenHumansUploader;
-import info.nightscout.androidaps.plugins.pump.virtual.VirtualPumpPlugin;
-import info.nightscout.androidaps.utils.DateUtil;
-
-/**
- * This Helper contains all resource to provide a central DB management functionality. Only methods handling
- * data-structure (and not the DB content) should be contained in here (meaning DDL and not SQL).
- * <p>
- * This class can safely be called from Services, but should not call Services to avoid circular dependencies.
- * One major issue with this (right now) are the scheduled events, which are put into the service. Therefor all
- * direct calls to the corresponding methods (eg. resetDatabases) should be done by a central service.
- */
-public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
-    @Inject AAPSLogger aapsLogger;
-    @Inject RxBusWrapper rxBus;
-    @Inject VirtualPumpPlugin virtualPumpPlugin;
-    @Inject OpenHumansUploader openHumansUploader;
-    @Inject ActivePlugin activePlugin;
-    @Inject DateUtil dateUtil;
-
-    public static final String DATABASE_NAME = "AndroidAPSDb";
-
-    private static final int DATABASE_VERSION = 13;
-
-    public static Long earliestDataChange = null;
-
-    private int oldVersion = 0;
-    private int newVersion = 0;
-
-    public DatabaseHelper(Context context) {
-        super(context, DATABASE_NAME, null, DATABASE_VERSION);
-        StaticInjector.Companion.getInstance().androidInjector().inject(this);
-        onCreate(getWritableDatabase(), getConnectionSource());
-        //onUpgrade(getWritableDatabase(), getConnectionSource(), 1,1);
-    }
-
-    @Override
-    public void onCreate(SQLiteDatabase database, ConnectionSource connectionSource) {
-        try {
-            aapsLogger.info(LTag.DATABASE, "onCreate");
-            TableUtils.createTableIfNotExists(connectionSource, OmnipodHistoryRecord.class);
-            TableUtils.createTableIfNotExists(connectionSource, OHQueueItem.class);
-        } catch (SQLException e) {
-            aapsLogger.error("Can't create database", e);
-            throw new RuntimeException(e);
-        }
-    }
-
-    @Override
-    public void onUpgrade(SQLiteDatabase database, ConnectionSource connectionSource, int oldVersion, int newVersion) {
-        try {
-            this.oldVersion = oldVersion;
-            this.newVersion = newVersion;
-
-            if (oldVersion < 7) {
-                aapsLogger.info(LTag.DATABASE, "onUpgrade");
-                onCreate(database, connectionSource);
-            }
-            TableUtils.createTableIfNotExists(connectionSource, OHQueueItem.class);
-        } catch (SQLException e) {
-            aapsLogger.error("Can't drop databases", e);
-            throw new RuntimeException(e);
-        }
-    }
-
-    @Override
-    public void onDowngrade(SQLiteDatabase db, int oldVersion, int newVersion) {
-        aapsLogger.info(LTag.DATABASE, "Do nothing for downgrading...");
-        aapsLogger.info(LTag.DATABASE, "oldVersion: {}, newVersion: {}", oldVersion, newVersion);
-    }
-
-    public int getOldVersion() {
-        return oldVersion;
-    }
-
-    public int getNewVersion() {
-        return newVersion;
-    }
-
-    public long size(String database) {
-        return DatabaseUtils.queryNumEntries(getReadableDatabase(), database);
-    }
-
-    // --------------------- DB resets ---------------------
-
-    public void resetDatabases() {
-        try {
-            TableUtils.dropTable(connectionSource, OmnipodHistoryRecord.class, true);
-            TableUtils.createTableIfNotExists(connectionSource, OmnipodHistoryRecord.class);
-            updateEarliestDataChange(0);
-        } catch (SQLException e) {
-            aapsLogger.error("Unhandled exception", e);
-        }
-        virtualPumpPlugin.setFakingStatus(true);
-        new java.util.Timer().schedule(
-                new java.util.TimerTask() {
-                    @Override
-                    public void run() {
-                        rxBus.send(new EventRefreshOverview("resetDatabases", false));
-                    }
-                },
-                3000
-        );
-    }
-
-    // ------------------ getDao -------------------------------------------
-
-    private Dao<OmnipodHistoryRecord, Long> getDaoPodHistory() throws SQLException {
-        return getDao(OmnipodHistoryRecord.class);
-    }
-
-    private Dao<OHQueueItem, Long> getDaoOpenHumansQueue() throws SQLException {
-        return getDao(OHQueueItem.class);
-    }
-
-    public static void updateEarliestDataChange(long newDate) {
-        if (earliestDataChange == null) {
-            earliestDataChange = newDate;
-            return;
-        }
-        if (newDate < earliestDataChange) {
-            earliestDataChange = newDate;
-        }
-    }
-
-    // ---------------- Food handling ---------------
-
-    // ---------------- PodHistory handling ---------------
-
-    public void createOrUpdate(OmnipodHistoryRecord omnipodHistoryRecord) {
-        try {
-            getDaoPodHistory().createOrUpdate(omnipodHistoryRecord);
-        } catch (SQLException e) {
-            aapsLogger.error("Unhandled exception", e);
-        }
-    }
-
-    public List<OmnipodHistoryRecord> getAllOmnipodHistoryRecordsFromTimeStamp(long from, boolean ascending) {
-        try {
-            Dao<OmnipodHistoryRecord, Long> daoPodHistory = getDaoPodHistory();
-            List<OmnipodHistoryRecord> podHistories;
-            QueryBuilder<OmnipodHistoryRecord, Long> queryBuilder = daoPodHistory.queryBuilder();
-            queryBuilder.orderBy("date", ascending);
-            //queryBuilder.limit(100L);
-            Where where = queryBuilder.where();
-            where.ge("date", from);
-            PreparedQuery<OmnipodHistoryRecord> preparedQuery = queryBuilder.prepare();
-            podHistories = daoPodHistory.query(preparedQuery);
-            return podHistories;
-        } catch (SQLException e) {
-            aapsLogger.error("Unhandled exception", e);
-        }
-        return new ArrayList<>();
-    }
-
-    public OmnipodHistoryRecord findOmnipodHistoryRecordByPumpId(long pumpId) {
-        try {
-            Dao<OmnipodHistoryRecord, Long> daoPodHistory = getDaoPodHistory();
-            QueryBuilder<OmnipodHistoryRecord, Long> queryBuilder = daoPodHistory.queryBuilder();
-            queryBuilder.orderBy("date", false);
-            Where<OmnipodHistoryRecord, Long> where = queryBuilder.where();
-            where.eq("pumpId", pumpId);
-            PreparedQuery<OmnipodHistoryRecord> preparedQuery = queryBuilder.prepare();
-            return daoPodHistory.queryForFirst(preparedQuery);
-        } catch (SQLException e) {
-            aapsLogger.error("Unhandled exception", e);
-        }
-        return null;
-    }
-
-/*
-    TODO implement again for database branch    // Copied from xDrip+
-    String calculateDirection(BgReading bgReading) {
-        // Rework to get bgreaings from internal DB and calculate on that base
-
-        List<BgReading> bgReadingsList = MainApp.getDbHelper().getAllBgreadingsDataFromTime(bgReading.date - T.mins(10).msecs(), false);
-        if (bgReadingsList == null || bgReadingsList.size() < 2)
-            return "NONE";
-        BgReading current = bgReadingsList.get(1);
-        BgReading previous = bgReadingsList.get(0);
-
-        if (bgReadingsList.get(1).date < bgReadingsList.get(0).date) {
-            current = bgReadingsList.get(0);
-            previous = bgReadingsList.get(1);
-        }
-
-        double slope;
-
-        // Avoid division by 0
-        if (current.date == previous.date)
-            slope = 0;
-        else
-            slope = (previous.value - current.value) / (previous.date - current.date);
-
-//        aapsLogger.error(LTag.GLUCOSE, "Slope is :" + slope + " delta " + (previous.value - current.value) + " date difference " + (current.date - previous.date));
-
-        double slope_by_minute = slope * 60000;
-        String arrow = "NONE";
-
-        if (slope_by_minute <= (-3.5)) {
-            arrow = "DoubleDown";
-        } else if (slope_by_minute <= (-2)) {
-            arrow = "SingleDown";
-        } else if (slope_by_minute <= (-1)) {
-            arrow = "FortyFiveDown";
-        } else if (slope_by_minute <= (1)) {
-            arrow = "Flat";
-        } else if (slope_by_minute <= (2)) {
-            arrow = "FortyFiveUp";
-        } else if (slope_by_minute <= (3.5)) {
-            arrow = "SingleUp";
-        } else if (slope_by_minute <= (40)) {
-            arrow = "DoubleUp";
-        }
-//        aapsLogger.error(LTag.GLUCOSE, "Direction set to: " + arrow);
-        return arrow;
-    }
-*/
-    // ---------------- Open Humans Queue handling ---------------
-
-    public void clearOpenHumansQueue() {
-        try {
-            TableUtils.clearTable(connectionSource, OHQueueItem.class);
-        } catch (SQLException e) {
-            aapsLogger.error("Unhandled exception", e);
-        }
-    }
-
-    public void createOrUpdate(OHQueueItem item) {
-        try {
-            getDaoOpenHumansQueue().createOrUpdate(item);
-        } catch (SQLException e) {
-            aapsLogger.error("Unhandled exception", e);
-        }
-    }
-
-    public void removeAllOHQueueItemsWithIdSmallerThan(long id) {
-        try {
-            DeleteBuilder<OHQueueItem, Long> deleteBuilder = getDaoOpenHumansQueue().deleteBuilder();
-            deleteBuilder.where().le("id", id);
-            deleteBuilder.delete();
-        } catch (SQLException e) {
-            aapsLogger.error("Unhandled exception", e);
-        }
-    }
-
-    public List<OHQueueItem> getAllOHQueueItems(Long maxEntries) {
-        try {
-            return getDaoOpenHumansQueue()
-                    .queryBuilder()
-                    .orderBy("id", true)
-                    .limit(maxEntries)
-                    .query();
-        } catch (SQLException e) {
-            aapsLogger.error("Unhandled exception", e);
-        }
-        return Collections.emptyList();
-    }
-
-    public long getOHQueueSize() {
-        try {
-            return getDaoOpenHumansQueue().countOf();
-        } catch (SQLException e) {
-            aapsLogger.error("Unhandled exception", e);
-        }
-        return 0L;
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/db/DatabaseHelperProvider.java b/app/src/main/java/info/nightscout/androidaps/db/DatabaseHelperProvider.java
deleted file mode 100644
index da0b2479cf..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/db/DatabaseHelperProvider.java
+++ /dev/null
@@ -1,84 +0,0 @@
-package info.nightscout.androidaps.db;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-
-import com.j256.ormlite.dao.CloseableIterator;
-
-import java.sql.SQLException;
-import java.util.List;
-
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.interfaces.DatabaseHelperInterface;
-
-@Deprecated
-@Singleton
-public class DatabaseHelperProvider implements DatabaseHelperInterface {
-
-    @Inject DatabaseHelperProvider() {
-    }
-
-    @Override public void createOrUpdate(@NonNull OmnipodHistoryRecord record) {
-        MainApp.Companion.getDbHelper().createOrUpdate(record);
-    }
-
-    @Override public boolean createOrUpdate(@NonNull TemporaryBasal tempBasal) {
-//        return MainApp.Companion.getDbHelper().createOrUpdate(tempBasal);
-        return false;
-    }
-
-    @Nullable @Override public TemporaryBasal findTempBasalByPumpId(long id) {
-//        return MainApp.Companion.getDbHelper().findTempBasalByPumpId(id);
-        return null;
-    }
-
-    @Deprecated
-    @NonNull @Override public List<TemporaryBasal> getTemporaryBasalsDataFromTime(long mills, boolean ascending) {
-//        return MainApp.Companion.getDbHelper().getTemporaryBasalsDataFromTime(mills, ascending);
-        return null;
-    }
-
-    @NonNull @Override public List<OmnipodHistoryRecord> getAllOmnipodHistoryRecordsFromTimestamp(long timestamp, boolean ascending) {
-        return MainApp.Companion.getDbHelper().getAllOmnipodHistoryRecordsFromTimeStamp(timestamp, ascending);
-    }
-
-    @Nullable @Override public OmnipodHistoryRecord findOmnipodHistoryRecordByPumpId(long pumpId) {
-        return MainApp.Companion.getDbHelper().findOmnipodHistoryRecordByPumpId(pumpId);
-    }
-
-    @Override public void delete(@NonNull ExtendedBolus extendedBolus) {
-//        MainApp.Companion.getDbHelper().delete(extendedBolus);
-    }
-
-    @Nullable @Override public ExtendedBolus getExtendedBolusByPumpId(long pumpId) {
-//        return MainApp.Companion.getDbHelper().getExtendedBolusByPumpId(pumpId);
-        return null;
-    }
-
-    @Override public void resetDatabases() {
-        MainApp.Companion.getDbHelper().resetDatabases();
-    }
-
-    @Override public void createOrUpdate(@NonNull OHQueueItem record) {
-        MainApp.Companion.getDbHelper().createOrUpdate(record);
-    }
-
-    @NonNull @Override public List<OHQueueItem> getAllOHQueueItems(long maxEntries) {
-        return MainApp.Companion.getDbHelper().getAllOHQueueItems(maxEntries);
-    }
-
-    @Override public long getOHQueueSize() {
-        return MainApp.Companion.getDbHelper().getOHQueueSize();
-    }
-
-    @Override public void clearOpenHumansQueue() {
-        MainApp.Companion.getDbHelper().clearOpenHumansQueue();
-    }
-
-    @Override public void removeAllOHQueueItemsWithIdSmallerThan(long id) {
-        MainApp.Companion.getDbHelper().removeAllOHQueueItemsWithIdSmallerThan(id);
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/db/OHQueueItem.kt b/app/src/main/java/info/nightscout/androidaps/db/OHQueueItem.kt
deleted file mode 100644
index 600a9f0823..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/db/OHQueueItem.kt
+++ /dev/null
@@ -1,2 +0,0 @@
-package info.nightscout.androidaps.db
-
diff --git a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/ActivitiesModule.kt b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/ActivitiesModule.kt
index fa8bfa0598..eff546fb62 100644
--- a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/ActivitiesModule.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/ActivitiesModule.kt
@@ -4,9 +4,8 @@ import dagger.Module
 import dagger.android.ContributesAndroidInjector
 import info.nightscout.androidaps.MainActivity
 import info.nightscout.androidaps.activities.*
-import info.nightscout.androidaps.historyBrowser.HistoryBrowseActivity
+import info.nightscout.androidaps.activities.HistoryBrowseActivity
 import info.nightscout.androidaps.plugins.general.maintenance.activities.LogSettingActivity
-import info.nightscout.androidaps.plugins.general.openhumans.OpenHumansLoginActivity
 import info.nightscout.androidaps.plugins.general.overview.activities.QuickWizardListActivity
 import info.nightscout.androidaps.plugins.general.smsCommunicator.activities.SmsCommunicatorOtpActivity
 import info.nightscout.androidaps.setupwizard.SetupWizardActivity
@@ -28,6 +27,5 @@ abstract class ActivitiesModule {
     @ContributesAndroidInjector abstract fun contributesStatsActivity(): StatsActivity
     @ContributesAndroidInjector abstract fun contributesSurveyActivity(): SurveyActivity
     @ContributesAndroidInjector abstract fun contributesDefaultProfileActivity(): ProfileHelperActivity
-    @ContributesAndroidInjector abstract fun contributesOpenHumansLoginActivity(): OpenHumansLoginActivity
 
 }
\ 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 1421d586ed..ab29e1f838 100644
--- a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/AppComponent.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/AppComponent.kt
@@ -8,15 +8,19 @@ import info.nightscout.androidaps.MainApp
 import info.nightscout.androidaps.automation.di.AutomationModule
 import info.nightscout.androidaps.combo.di.ComboModule
 import info.nightscout.androidaps.dana.di.DanaHistoryModule
-import info.nightscout.androidaps.di.CoreModule
 import info.nightscout.androidaps.dana.di.DanaModule
 import info.nightscout.androidaps.danar.di.DanaRModule
 import info.nightscout.androidaps.danars.di.DanaRSModule
 import info.nightscout.androidaps.database.DatabaseModule
+import info.nightscout.androidaps.di.CoreModule
+import info.nightscout.androidaps.diaconn.di.DiaconnG8Module
 import info.nightscout.androidaps.insight.di.InsightDatabaseModule
 import info.nightscout.androidaps.insight.di.InsightModule
+import info.nightscout.androidaps.plugin.general.openhumans.dagger.OpenHumansModule
+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
 
@@ -36,8 +40,10 @@ import javax.inject.Singleton
         CommandQueueModule::class,
         ObjectivesModule::class,
         WizardModule::class,
+        PumpCommonModule::class,
         RileyLinkModule::class,
         MedtronicModule::class,
+        OmnipodDashModule::class,
         OmnipodErosModule::class,
         APSModule::class,
         PreferencesModule::class,
@@ -54,7 +60,8 @@ import javax.inject.Singleton
         InsightModule::class,
         InsightDatabaseModule::class,
         WorkersModule::class,
-        OHUploaderModule::class
+        DiaconnG8Module::class,
+        OpenHumansModule::class
     ]
 )
 interface AppComponent : AndroidInjector<MainApp> {
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 30037c3948..d31c51f8e4 100644
--- a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/AppModule.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/AppModule.kt
@@ -8,22 +8,25 @@ import dagger.Provides
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.MainApp
 import info.nightscout.androidaps.database.AppRepository
-import info.nightscout.androidaps.db.DatabaseHelperProvider
 import info.nightscout.androidaps.interfaces.*
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.plugins.aps.loop.LoopPlugin
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 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
 import info.nightscout.androidaps.plugins.pump.PumpSyncImplementation
-import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin
 import info.nightscout.androidaps.queue.CommandQueue
 import info.nightscout.androidaps.utils.DateUtil
+import info.nightscout.androidaps.utils.HardLimits
 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,9 +59,11 @@ open class AppModule {
 
     @Provides
     @Singleton
-    fun provideStorage(): Storage {
-        return FileStorage()
-    }
+    fun provideStorage(): Storage = FileStorage()
+
+    @Provides
+    @Singleton
+    fun provideBuildHelper(config: Config, fileListProvider: PrefFileListProvider): BuildHelper = BuildHelperImpl(config, fileListProvider)
 
     @Provides
     @Singleton
@@ -66,29 +71,35 @@ open class AppModule {
 
     @Provides
     @Singleton
-    fun provideProfileFunction(aapsLogger: AAPSLogger, sp: SP, resourceHelper: ResourceHelper, activePlugin: ActivePlugin, repository: AppRepository, dateUtil: DateUtil): ProfileFunction {
-        return ProfileFunctionImplementation(aapsLogger, sp, resourceHelper, activePlugin, repository, dateUtil)
-    }
+    fun provideProfileFunction(
+        aapsLogger: AAPSLogger, sp: SP, rxBus: RxBusWrapper, resourceHelper:
+        ResourceHelper, activePlugin:
+        ActivePlugin, repository: AppRepository, dateUtil: DateUtil, config: Config, hardLimits: HardLimits
+    ): ProfileFunction =
+        ProfileFunctionImplementation(
+            aapsLogger, sp, rxBus, resourceHelper, activePlugin, repository, dateUtil,
+            config, hardLimits
+        )
 
     @Module
     interface AppBindings {
+
         @Binds fun bindContext(mainApp: MainApp): Context
         @Binds fun bindInjector(mainApp: MainApp): HasAndroidInjector
         @Binds fun bindActivePluginProvider(pluginStore: PluginStore): ActivePlugin
         @Binds fun bindCommandQueueProvider(commandQueue: CommandQueue): CommandQueueProvider
         @Binds fun bindConfigInterface(config: ConfigImpl): Config
+
         @Binds fun bindConfigBuilderInterface(configBuilderPlugin: ConfigBuilderPlugin): ConfigBuilder
-        @Binds fun bindTreatmentsInterface(treatmentsPlugin: TreatmentsPlugin): TreatmentsInterface
-        @Binds fun bindDatabaseHelperInterface(databaseHelperProvider: DatabaseHelperProvider): DatabaseHelperInterface
         @Binds fun bindNotificationHolderInterface(notificationHolder: NotificationHolderImpl): NotificationHolder
         @Binds fun bindImportExportPrefsInterface(importExportPrefs: ImportExportPrefsImpl): ImportExportPrefs
         @Binds fun bindIconsProviderInterface(iconsProvider: IconsProviderImplementation): IconsProvider
-        @Binds fun bindLoopInterface(loopPlugin: LoopPlugin): LoopInterface
+        @Binds fun bindLoopInterface(loopPlugin: LoopPlugin): Loop
         @Binds fun bindIobCobCalculatorInterface(iobCobCalculatorPlugin: IobCobCalculatorPlugin): IobCobCalculator
         @Binds fun bindSmsCommunicatorInterface(smsCommunicatorPlugin: SmsCommunicatorPlugin): SmsCommunicator
         @Binds fun bindDataSyncSelector(dataSyncSelectorImplementation: DataSyncSelectorImplementation): DataSyncSelector
-        @Binds fun bindPumpSync(pumpSyncImplementation: PumpSyncImplementation): PumpSync
 
+        @Binds fun bindPumpSync(pumpSyncImplementation: PumpSyncImplementation): PumpSync
     }
 }
 
diff --git a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/DataClassesModule.kt b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/DataClassesModule.kt
index c222f2de55..b9ce13a5de 100644
--- a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/DataClassesModule.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/DataClassesModule.kt
@@ -2,9 +2,7 @@ package info.nightscout.androidaps.dependencyInjection
 
 import dagger.Module
 import dagger.android.ContributesAndroidInjector
-import info.nightscout.androidaps.db.DatabaseHelper
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatus
-import info.nightscout.androidaps.plugins.treatments.TreatmentService
 import info.nightscout.androidaps.utils.wizard.BolusWizard
 import info.nightscout.androidaps.utils.wizard.QuickWizardEntry
 
@@ -14,9 +12,6 @@ abstract class DataClassesModule {
 
     @ContributesAndroidInjector abstract fun glucoseStatusInjector(): GlucoseStatus
 
-    @ContributesAndroidInjector abstract fun databaseHelperInjector(): DatabaseHelper
-    @ContributesAndroidInjector abstract fun treatmentServiceInjector(): TreatmentService
-
     @ContributesAndroidInjector abstract fun bolusWizardInjector(): BolusWizard
     @ContributesAndroidInjector abstract fun quickWizardEntryInjector(): QuickWizardEntry
 }
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/FragmentsModule.kt b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/FragmentsModule.kt
index 84e4ef80fb..f758398d62 100644
--- a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/FragmentsModule.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/FragmentsModule.kt
@@ -20,8 +20,6 @@ import info.nightscout.androidaps.plugins.general.automation.dialogs.EditTrigger
 import info.nightscout.androidaps.plugins.general.food.FoodFragment
 import info.nightscout.androidaps.plugins.general.maintenance.MaintenanceFragment
 import info.nightscout.androidaps.plugins.general.nsclient.NSClientFragment
-import info.nightscout.androidaps.plugins.general.openhumans.OpenHumansFragment
-import info.nightscout.androidaps.plugins.general.openhumans.OpenHumansLoginActivity
 import info.nightscout.androidaps.plugins.general.overview.OverviewFragment
 import info.nightscout.androidaps.plugins.general.overview.dialogs.EditQuickWizardDialog
 import info.nightscout.androidaps.plugins.general.smsCommunicator.SmsCommunicatorFragment
@@ -70,8 +68,6 @@ abstract class FragmentsModule {
 
     @ContributesAndroidInjector abstract fun contributesVirtualPumpFragment(): VirtualPumpFragment
 
-    @ContributesAndroidInjector abstract fun contributesOpenHumansFragment(): OpenHumansFragment
-
     @ContributesAndroidInjector abstract fun contributesCalibrationDialog(): CalibrationDialog
     @ContributesAndroidInjector abstract fun contributesCarbsDialog(): CarbsDialog
     @ContributesAndroidInjector abstract fun contributesCareDialog(): CareDialog
@@ -95,7 +91,5 @@ abstract class FragmentsModule {
     @ContributesAndroidInjector abstract fun contributesWizardDialog(): WizardDialog
     @ContributesAndroidInjector abstract fun contributesWizardInfoDialog(): WizardInfoDialog
 
-    @ContributesAndroidInjector abstract fun contributesExchangeAuthTokenDialog(): OpenHumansLoginActivity.ExchangeAuthTokenDialog
-
     @ContributesAndroidInjector abstract fun contributesPasswordCheck(): PasswordCheck
 }
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/OHUploaderModule.kt b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/OHUploaderModule.kt
deleted file mode 100644
index bbf0765f96..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/OHUploaderModule.kt
+++ /dev/null
@@ -1,12 +0,0 @@
-package info.nightscout.androidaps.dependencyInjection
-
-import dagger.Module
-import dagger.android.ContributesAndroidInjector
-import info.nightscout.androidaps.plugins.general.openhumans.OHUploadWorker
-
-@Module
-@Suppress("unused")
-abstract class OHUploaderModule {
-
-    @ContributesAndroidInjector abstract fun contributesOHUploadWorkerInjector(): OHUploadWorker
-}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/ObjectivesModule.kt b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/ObjectivesModule.kt
index d9524092dc..e64ef47302 100644
--- a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/ObjectivesModule.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/ObjectivesModule.kt
@@ -17,7 +17,6 @@ abstract class ObjectivesModule {
     @ContributesAndroidInjector abstract fun objective5Injector(): Objective5
     @ContributesAndroidInjector abstract fun objective6Injector(): Objective6
     @ContributesAndroidInjector abstract fun objective7Injector(): Objective7
-    @ContributesAndroidInjector abstract fun objective8Injector(): Objective8
     @ContributesAndroidInjector abstract fun objective9Injector(): Objective9
     @ContributesAndroidInjector abstract fun objective10Injector(): Objective10
 
diff --git a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/PluginsModule.kt b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/PluginsModule.kt
index 184e0cdbc1..cd8e179160 100644
--- a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/PluginsModule.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/PluginsModule.kt
@@ -8,7 +8,9 @@ import info.nightscout.androidaps.danaRKorean.DanaRKoreanPlugin
 import info.nightscout.androidaps.danaRv2.DanaRv2Plugin
 import info.nightscout.androidaps.danar.DanaRPlugin
 import info.nightscout.androidaps.danars.DanaRSPlugin
+import info.nightscout.androidaps.diaconn.DiaconnG8Plugin
 import info.nightscout.androidaps.interfaces.PluginBase
+import info.nightscout.androidaps.plugin.general.openhumans.OpenHumansUploader
 import info.nightscout.androidaps.plugins.aps.loop.LoopPlugin
 import info.nightscout.androidaps.plugins.aps.openAPSAMA.OpenAPSAMAPlugin
 import info.nightscout.androidaps.plugins.aps.openAPSSMB.OpenAPSSMBPlugin
@@ -25,7 +27,6 @@ import info.nightscout.androidaps.plugins.general.dataBroadcaster.DataBroadcastP
 import info.nightscout.androidaps.plugins.general.food.FoodPlugin
 import info.nightscout.androidaps.plugins.general.maintenance.MaintenancePlugin
 import info.nightscout.androidaps.plugins.general.nsclient.NSClientPlugin
-import info.nightscout.androidaps.plugins.general.openhumans.OpenHumansUploader
 import info.nightscout.androidaps.plugins.general.overview.OverviewPlugin
 import info.nightscout.androidaps.plugins.general.persistentNotification.PersistentNotificationPlugin
 import info.nightscout.androidaps.plugins.general.smsCommunicator.SmsCommunicatorPlugin
@@ -41,13 +42,11 @@ import info.nightscout.androidaps.plugins.pump.combo.ComboPlugin
 import info.nightscout.androidaps.plugins.pump.insight.LocalInsightPlugin
 import info.nightscout.androidaps.plugins.pump.mdi.MDIPlugin
 import info.nightscout.androidaps.plugins.pump.medtronic.MedtronicPumpPlugin
-import info.nightscout.androidaps.plugins.pump.omnipod.eros.OmnipodErosPumpPlugin
 import info.nightscout.androidaps.plugins.pump.virtual.VirtualPumpPlugin
 import info.nightscout.androidaps.plugins.sensitivity.SensitivityAAPSPlugin
 import info.nightscout.androidaps.plugins.sensitivity.SensitivityOref1Plugin
 import info.nightscout.androidaps.plugins.sensitivity.SensitivityWeightedAveragePlugin
 import info.nightscout.androidaps.plugins.source.*
-import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin
 import javax.inject.Qualifier
 
 @Module
@@ -149,11 +148,11 @@ abstract class PluginsModule {
     @IntKey(140)
     abstract fun bindComboPlugin(plugin: ComboPlugin): PluginBase
 
-    // @Binds
-    // @PumpDriver
-    // @IntoMap
-    // @IntKey(150)
-    // abstract fun bindMedtronicPumpPlugin(plugin: MedtronicPumpPlugin): PluginBase
+    @Binds
+    @PumpDriver
+    @IntoMap
+    @IntKey(150)
+    abstract fun bindMedtronicPumpPlugin(plugin: MedtronicPumpPlugin): PluginBase
 
     // @Binds
     // @PumpDriver
@@ -161,6 +160,12 @@ abstract class PluginsModule {
     // @IntKey(155)
     // abstract fun bindOmnipodPumpPlugin(plugin: OmnipodErosPumpPlugin): PluginBase
 
+    @Binds
+    @PumpDriver
+    @IntoMap
+    @IntKey(155)
+    abstract fun bindDiaconnG8Plugin(plugin: DiaconnG8Plugin): PluginBase
+
     @Binds
     @NotNSClient
     @IntoMap
@@ -203,12 +208,6 @@ abstract class PluginsModule {
     @IntKey(250)
     abstract fun bindAutomationPlugin(plugin: AutomationPlugin): PluginBase
 
-    @Binds
-    @AllConfigs
-    @IntoMap
-    @IntKey(260)
-    abstract fun bindTreatmentsPlugin(plugin: TreatmentsPlugin): PluginBase
-
     @Binds
     @AllConfigs
     @IntoMap
@@ -347,6 +346,12 @@ abstract class PluginsModule {
     // @IntKey(480)
     // abstract fun bindOpenHumansPlugin(plugin: OpenHumansUploader): PluginBase
 
+    @Binds
+    @NotNSClient
+    @IntoMap
+    @IntKey(480)
+    abstract fun bindsOpenHumansPlugin(plugin: OpenHumansUploader): PluginBase
+
     @Binds
     @AllConfigs
     @IntoMap
diff --git a/app/src/main/java/info/nightscout/androidaps/dialogs/CarbsDialog.kt b/app/src/main/java/info/nightscout/androidaps/dialogs/CarbsDialog.kt
index 9d4e34a89b..3bfa076da9 100644
--- a/app/src/main/java/info/nightscout/androidaps/dialogs/CarbsDialog.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dialogs/CarbsDialog.kt
@@ -17,7 +17,7 @@ import info.nightscout.androidaps.database.entities.TemporaryTarget
 import info.nightscout.androidaps.database.entities.UserEntry.Action
 import info.nightscout.androidaps.database.entities.UserEntry.Sources
 import info.nightscout.androidaps.database.entities.ValueWithUnit
-import info.nightscout.androidaps.database.transactions.InsertTemporaryTargetAndCancelCurrentTransaction
+import info.nightscout.androidaps.database.transactions.InsertAndCancelCurrentTemporaryTargetTransaction
 import info.nightscout.androidaps.databinding.DialogCarbsBinding
 import info.nightscout.androidaps.extensions.formatColor
 import info.nightscout.androidaps.interfaces.Constraint
@@ -27,7 +27,6 @@ import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.logging.UserEntryLogger
 import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
-import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin
 import info.nightscout.androidaps.queue.Callback
 import info.nightscout.androidaps.queue.CommandQueue
 import info.nightscout.androidaps.utils.*
@@ -47,7 +46,6 @@ class CarbsDialog : DialogFragmentWithDate() {
     @Inject lateinit var resourceHelper: ResourceHelper
     @Inject lateinit var constraintChecker: ConstraintChecker
     @Inject lateinit var defaultValueHelper: DefaultValueHelper
-    @Inject lateinit var treatmentsPlugin: TreatmentsPlugin
     @Inject lateinit var profileFunction: ProfileFunction
     @Inject lateinit var iobCobCalculator: IobCobCalculator
     @Inject lateinit var uel: UserEntryLogger
@@ -228,7 +226,7 @@ class CarbsDialog : DialogFragmentWithDate() {
                                 ValueWithUnit.TherapyEventTTReason(TemporaryTarget.Reason.ACTIVITY),
                                 ValueWithUnit.fromGlucoseUnit(activityTT, units.asText),
                                 ValueWithUnit.Minute(activityTTDuration))
-                            disposable += repository.runTransactionForResult(InsertTemporaryTargetAndCancelCurrentTransaction(
+                            disposable += repository.runTransactionForResult(InsertAndCancelCurrentTemporaryTargetTransaction(
                                 timestamp = System.currentTimeMillis(),
                                 duration = TimeUnit.MINUTES.toMillis(activityTTDuration.toLong()),
                                 reason = TemporaryTarget.Reason.ACTIVITY,
@@ -247,7 +245,7 @@ class CarbsDialog : DialogFragmentWithDate() {
                                 ValueWithUnit.TherapyEventTTReason(TemporaryTarget.Reason.EATING_SOON),
                                 ValueWithUnit.fromGlucoseUnit(eatingSoonTT, units.asText),
                                 ValueWithUnit.Minute(eatingSoonTTDuration))
-                            disposable += repository.runTransactionForResult(InsertTemporaryTargetAndCancelCurrentTransaction(
+                            disposable += repository.runTransactionForResult(InsertAndCancelCurrentTemporaryTargetTransaction(
                                 timestamp = System.currentTimeMillis(),
                                 duration = TimeUnit.MINUTES.toMillis(eatingSoonTTDuration.toLong()),
                                 reason = TemporaryTarget.Reason.EATING_SOON,
@@ -266,7 +264,7 @@ class CarbsDialog : DialogFragmentWithDate() {
                                 ValueWithUnit.TherapyEventTTReason(TemporaryTarget.Reason.HYPOGLYCEMIA),
                                 ValueWithUnit.fromGlucoseUnit(hypoTT, units.asText),
                                 ValueWithUnit.Minute(hypoTTDuration))
-                            disposable += repository.runTransactionForResult(InsertTemporaryTargetAndCancelCurrentTransaction(
+                            disposable += repository.runTransactionForResult(InsertAndCancelCurrentTemporaryTargetTransaction(
                                 timestamp = System.currentTimeMillis(),
                                 duration = TimeUnit.MINUTES.toMillis(hypoTTDuration.toLong()),
                                 reason = TemporaryTarget.Reason.HYPOGLYCEMIA,
diff --git a/app/src/main/java/info/nightscout/androidaps/dialogs/FillDialog.kt b/app/src/main/java/info/nightscout/androidaps/dialogs/FillDialog.kt
index f9cf203e5e..398eca586f 100644
--- a/app/src/main/java/info/nightscout/androidaps/dialogs/FillDialog.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dialogs/FillDialog.kt
@@ -191,7 +191,7 @@ class FillDialog : DialogFragmentWithDate() {
         commandQueue.bolus(detailedBolusInfo, object : Callback() {
             override fun run() {
                 if (!result.success) {
-                    ErrorHelperActivity.runAlarm(ctx, result.comment, resourceHelper.gs(R.string.treatmentdeliveryerror), info.nightscout.androidaps.dana.R.raw.boluserror)
+                    ErrorHelperActivity.runAlarm(ctx, result.comment, resourceHelper.gs(R.string.treatmentdeliveryerror), R.raw.boluserror)
                 }
             }
         })
diff --git a/app/src/main/java/info/nightscout/androidaps/dialogs/InsulinDialog.kt b/app/src/main/java/info/nightscout/androidaps/dialogs/InsulinDialog.kt
index 1d624d09d4..12d14ef265 100644
--- a/app/src/main/java/info/nightscout/androidaps/dialogs/InsulinDialog.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dialogs/InsulinDialog.kt
@@ -16,7 +16,7 @@ import info.nightscout.androidaps.database.entities.ValueWithUnit
 import info.nightscout.androidaps.database.entities.TemporaryTarget
 import info.nightscout.androidaps.database.entities.UserEntry.Action
 import info.nightscout.androidaps.database.entities.UserEntry.Sources
-import info.nightscout.androidaps.database.transactions.InsertTemporaryTargetAndCancelCurrentTransaction
+import info.nightscout.androidaps.database.transactions.InsertAndCancelCurrentTemporaryTargetTransaction
 import info.nightscout.androidaps.databinding.DialogInsulinBinding
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.logging.UserEntryLogger
@@ -186,7 +186,7 @@ class InsulinDialog : DialogFragmentWithDate() {
                             ValueWithUnit.TherapyEventTTReason(TemporaryTarget.Reason.EATING_SOON),
                             ValueWithUnit.fromGlucoseUnit(eatingSoonTT, units.asText),
                             ValueWithUnit.Minute(eatingSoonTTDuration))
-                        disposable += repository.runTransactionForResult(InsertTemporaryTargetAndCancelCurrentTransaction(
+                        disposable += repository.runTransactionForResult(InsertAndCancelCurrentTemporaryTargetTransaction(
                             timestamp = System.currentTimeMillis(),
                             duration = TimeUnit.MINUTES.toMillis(eatingSoonTTDuration.toLong()),
                             reason = TemporaryTarget.Reason.EATING_SOON,
@@ -224,7 +224,7 @@ class InsulinDialog : DialogFragmentWithDate() {
                             commandQueue.bolus(detailedBolusInfo, object : Callback() {
                                 override fun run() {
                                     if (!result.success) {
-                                        ErrorHelperActivity.runAlarm(ctx, result.comment, resourceHelper.gs(R.string.treatmentdeliveryerror), info.nightscout.androidaps.dana.R.raw.boluserror)
+                                        ErrorHelperActivity.runAlarm(ctx, result.comment, resourceHelper.gs(R.string.treatmentdeliveryerror), R.raw.boluserror)
                                     }
                                 }
                             })
diff --git a/app/src/main/java/info/nightscout/androidaps/dialogs/LoopDialog.kt b/app/src/main/java/info/nightscout/androidaps/dialogs/LoopDialog.kt
index efadf17ca7..7833a836cd 100644
--- a/app/src/main/java/info/nightscout/androidaps/dialogs/LoopDialog.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dialogs/LoopDialog.kt
@@ -3,6 +3,7 @@ package info.nightscout.androidaps.dialogs
 import android.content.Context
 import android.os.Bundle
 import android.os.Handler
+import android.os.Looper
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -12,9 +13,13 @@ import androidx.fragment.app.FragmentManager
 import dagger.android.support.DaggerDialogFragment
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.activities.ErrorHelperActivity
+import info.nightscout.androidaps.database.AppRepository
+import info.nightscout.androidaps.database.entities.OfflineEvent
 import info.nightscout.androidaps.database.entities.ValueWithUnit
 import info.nightscout.androidaps.database.entities.UserEntry.Action
 import info.nightscout.androidaps.database.entities.UserEntry.Sources
+import info.nightscout.androidaps.database.transactions.CancelCurrentOfflineEventIfAnyTransaction
+import info.nightscout.androidaps.database.transactions.InsertAndCancelCurrentOfflineEventTransaction
 import info.nightscout.androidaps.databinding.DialogLoopBinding
 import info.nightscout.androidaps.events.EventPreferenceChange
 import info.nightscout.androidaps.events.EventRefreshOverview
@@ -29,8 +34,14 @@ import info.nightscout.androidaps.utils.FabricPrivacy
 import info.nightscout.androidaps.utils.ToastUtils
 import info.nightscout.androidaps.utils.alertDialogs.OKDialog
 import info.nightscout.androidaps.extensions.toVisibility
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.constraints.objectives.ObjectivesPlugin
+import info.nightscout.androidaps.utils.DateUtil
+import info.nightscout.androidaps.utils.T
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import info.nightscout.androidaps.utils.sharedPreferences.SP
+import io.reactivex.disposables.CompositeDisposable
+import io.reactivex.rxkotlin.plusAssign
 import javax.inject.Inject
 
 class LoopDialog : DaggerDialogFragment() {
@@ -48,19 +59,27 @@ class LoopDialog : DaggerDialogFragment() {
     @Inject lateinit var commandQueue: CommandQueueProvider
     @Inject lateinit var configBuilder: ConfigBuilder
     @Inject lateinit var uel: UserEntryLogger
+    @Inject lateinit var dateUtil: DateUtil
+    @Inject lateinit var repository: AppRepository
+    @Inject lateinit var objectivePlugin: ObjectivesPlugin
 
     private var showOkCancel: Boolean = true
     private var _binding: DialogLoopBinding? = null
-    private var loopHandler = Handler()
-    private var refreshDialog: Runnable? = null
+    private var loopHandler = Handler(Looper.getMainLooper())
+    private lateinit var refreshDialog: Runnable
 
     // This property is only valid between onCreateView and
     // onDestroyView.
     private val binding get() = _binding!!
 
+    val disposable = CompositeDisposable()
+
     override fun onStart() {
         super.onStart()
-        dialog?.window?.setLayout(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT)
+        dialog?.window?.setLayout(
+            ViewGroup.LayoutParams.MATCH_PARENT,
+            ViewGroup.LayoutParams.WRAP_CONTENT
+        )
     }
 
     override fun onSaveInstanceState(savedInstanceState: Bundle) {
@@ -118,6 +137,7 @@ class LoopDialog : DaggerDialogFragment() {
         super.onDestroyView()
         _binding = null
         loopHandler.removeCallbacksAndMessages(null)
+        disposable.clear()
     }
 
     var task: Runnable? = null
@@ -141,21 +161,74 @@ class LoopDialog : DaggerDialogFragment() {
         aapsLogger.debug("UpdateGUI from $from")
         val pumpDescription: PumpDescription = activePlugin.activePump.pumpDescription
         val closedLoopAllowed = constraintChecker.isClosedLoopAllowed(Constraint(true))
+        val closedLoopAllowed2 = objectivePlugin.objectives[ObjectivesPlugin.MAXIOB_OBJECTIVE].isCompleted
         val lgsEnabled = constraintChecker.isLgsAllowed(Constraint(true))
         val apsMode = sp.getString(R.string.key_aps_mode, "open")
-        if (profileFunction.isProfileValid("LoopDialogUpdateGUI")) {
-            if (loopPlugin.isEnabled(PluginType.LOOP)) {
+        val pump = activePlugin.activePump
+
+        binding.overviewDisconnect15m.visibility = pumpDescription.tempDurationStep15mAllowed.toVisibility()
+        binding.overviewDisconnect30m.visibility = pumpDescription.tempDurationStep30mAllowed.toVisibility()
+        when {
+            pump.isSuspended()                                     -> {
+                binding.overviewLoop.visibility = View.GONE
+                binding.overviewSuspend.visibility = View.GONE
+                binding.overviewPump.visibility = View.GONE
+            }
+
+            !profileFunction.isProfileValid("LoopDialogUpdateGUI") -> {
+                binding.overviewLoop.visibility = View.GONE
+                binding.overviewSuspend.visibility = View.GONE
+                binding.overviewPump.visibility = View.GONE
+            }
+
+            loopPlugin.isDisconnected                              -> {
+                binding.overviewLoop.visibility = View.GONE
+                binding.overviewSuspend.visibility = View.GONE
+                binding.overviewPump.visibility = View.VISIBLE
+                binding.overviewPumpHeader.text = resourceHelper.gs(R.string.reconnect)
+                binding.overviewDisconnectButtons.visibility = View.VISIBLE
+                binding.overviewReconnect.visibility = View.VISIBLE
+            }
+
+            !loopPlugin.isEnabled(PluginType.LOOP)                  -> {
+                binding.overviewLoop.visibility = View.VISIBLE
+                binding.overviewEnable.visibility = View.VISIBLE
+                binding.overviewDisable.visibility = View.GONE
+                binding.overviewSuspend.visibility = View.GONE
+                binding.overviewPump.visibility = View.VISIBLE
+                binding.overviewReconnect.visibility = View.GONE
+            }
+
+            loopPlugin.isSuspended                                 -> {
+                binding.overviewLoop.visibility = View.GONE
+                binding.overviewSuspend.visibility = View.VISIBLE
+                binding.overviewSuspendHeader.text = resourceHelper.gs(R.string.resumeloop)
+                binding.overviewSuspendButtons.visibility = View.VISIBLE
+                binding.overviewResume.visibility = View.VISIBLE
+                binding.overviewPump.visibility = View.GONE
+                binding.overviewReconnect.visibility = View.GONE
+            }
+
+            else                                                   -> {
+                binding.overviewLoop.visibility = View.VISIBLE
+                binding.overviewEnable.visibility = View.GONE
                 when {
-                    closedLoopAllowed.value() -> {
-                        binding.overviewCloseloop.visibility = (apsMode != "closed").toVisibility()
-                        binding.overviewLgsloop.visibility = (apsMode != "lgs").toVisibility()
-                        binding.overviewOpenloop.visibility = (apsMode != "open").toVisibility()
+                    apsMode == "closed" -> {
+                        binding.overviewCloseloop.visibility = View.GONE
+                        binding.overviewLgsloop.visibility = View.VISIBLE
+                        binding.overviewOpenloop.visibility = View.VISIBLE
                     }
 
-                    lgsEnabled.value()        -> {
-                        binding.overviewCloseloop.visibility = View.GONE
-                        binding.overviewLgsloop.visibility = (apsMode != "lgs").toVisibility()
-                        binding.overviewOpenloop.visibility = (apsMode != "open").toVisibility()
+                    apsMode == "lgs" -> {
+                        binding.overviewCloseloop.visibility = closedLoopAllowed.value().toVisibility()   //show Close loop button only if Close loop allowed
+                        binding.overviewLgsloop.visibility = View.GONE
+                        binding.overviewOpenloop.visibility = View.VISIBLE
+                    }
+
+                    apsMode == "open"         -> {
+                        binding.overviewCloseloop.visibility = closedLoopAllowed2.toVisibility()          //show CloseLoop button only if Objective 6 is completed (closedLoopAllowed always false in open loop mode)
+                        binding.overviewLgsloop.visibility = lgsEnabled.value().toVisibility()
+                        binding.overviewOpenloop.visibility = View.GONE
                     }
 
                     else                      -> {
@@ -164,70 +237,39 @@ class LoopDialog : DaggerDialogFragment() {
                         binding.overviewOpenloop.visibility = View.GONE
                     }
                 }
-                binding.overviewEnable.visibility = View.GONE
-                binding.overviewDisable.visibility = View.VISIBLE
-                if (!loopPlugin.isSuspended) {
-                    binding.overviewSuspendHeader.text = resourceHelper.gs(R.string.suspendloop)
-                    binding.overviewResume.visibility = View.GONE
-                    binding.overviewSuspendButtons.visibility = View.VISIBLE
-                    binding.overviewSuspend.visibility = View.VISIBLE
-                } else {
-                    if (!loopPlugin.isDisconnected) {
-                        binding.overviewSuspendHeader.text = resourceHelper.gs(R.string.resumeloop)
-                        binding.overviewResume.visibility = View.VISIBLE
-                        binding.overviewSuspendButtons.visibility = View.GONE
-                        binding.overviewSuspend.visibility = View.VISIBLE
-                    } else
-                        binding.overviewSuspend.visibility = View.GONE
-                }
-            } else {
-                binding.overviewEnable.visibility = View.VISIBLE
-                binding.overviewDisable.visibility = View.GONE
-                binding.overviewSuspend.visibility = View.GONE
-            }
-            if (!loopPlugin.isDisconnected) {
+                binding.overviewSuspend.visibility = View.VISIBLE
+                binding.overviewSuspendHeader.text = resourceHelper.gs(R.string.suspendloop)
+                binding.overviewSuspendButtons.visibility = View.VISIBLE
+                binding.overviewResume.visibility = View.GONE
+
+                binding.overviewPump.visibility = View.VISIBLE
                 binding.overviewPumpHeader.text = resourceHelper.gs(R.string.disconnectpump)
-                binding.overviewDisconnect15m.visibility = pumpDescription.tempDurationStep15mAllowed.toVisibility()
-                binding.overviewDisconnect30m.visibility = pumpDescription.tempDurationStep30mAllowed.toVisibility()
                 binding.overviewDisconnectButtons.visibility = View.VISIBLE
                 binding.overviewReconnect.visibility = View.GONE
-            } else {
-                binding.overviewPumpHeader.text = resourceHelper.gs(R.string.reconnect)
-                binding.overviewDisconnectButtons.visibility = View.GONE
-                binding.overviewReconnect.visibility = View.VISIBLE
+
             }
-            binding.overviewLoop.visibility = (!loopPlugin.isSuspended && !loopPlugin.isDisconnected).toVisibility()
         }
-        val profile = profileFunction.getProfile()
-        val profileStore = activePlugin.activeProfileSource.profile
-
-        if (profile == null || profileStore == null) {
-            ToastUtils.showToastInUiThread(ctx, resourceHelper.gs(R.string.noprofile))
-            dismiss()
-            return
-        }
-
     }
 
     private fun onClickOkCancelEnabled(v: View): Boolean {
         var description = ""
         when (v.id) {
-            R.id.overview_closeloop -> description = resourceHelper.gs(R.string.closedloop)
-            R.id.overview_lgsloop -> description = resourceHelper.gs(R.string.lowglucosesuspend)
-            R.id.overview_openloop -> description = resourceHelper.gs(R.string.openloop)
-            R.id.overview_disable -> description = resourceHelper.gs(R.string.disableloop)
-            R.id.overview_enable -> description = resourceHelper.gs(R.string.enableloop)
-            R.id.overview_resume -> description = resourceHelper.gs(R.string.resume)
-            R.id.overview_reconnect -> description = resourceHelper.gs(R.string.reconnect)
-            R.id.overview_suspend_1h -> description = resourceHelper.gs(R.string.suspendloopfor1h)
-            R.id.overview_suspend_2h -> description = resourceHelper.gs(R.string.suspendloopfor2h)
-            R.id.overview_suspend_3h -> description = resourceHelper.gs(R.string.suspendloopfor3h)
-            R.id.overview_suspend_10h -> description = resourceHelper.gs(R.string.suspendloopfor10h)
+            R.id.overview_closeloop      -> description = resourceHelper.gs(R.string.closedloop)
+            R.id.overview_lgsloop        -> description = resourceHelper.gs(R.string.lowglucosesuspend)
+            R.id.overview_openloop       -> description = resourceHelper.gs(R.string.openloop)
+            R.id.overview_disable        -> description = resourceHelper.gs(R.string.disableloop)
+            R.id.overview_enable         -> description = resourceHelper.gs(R.string.enableloop)
+            R.id.overview_resume         -> description = resourceHelper.gs(R.string.resume)
+            R.id.overview_reconnect      -> description = resourceHelper.gs(R.string.reconnect)
+            R.id.overview_suspend_1h     -> description = resourceHelper.gs(R.string.suspendloopfor1h)
+            R.id.overview_suspend_2h     -> description = resourceHelper.gs(R.string.suspendloopfor2h)
+            R.id.overview_suspend_3h     -> description = resourceHelper.gs(R.string.suspendloopfor3h)
+            R.id.overview_suspend_10h    -> description = resourceHelper.gs(R.string.suspendloopfor10h)
             R.id.overview_disconnect_15m -> description = resourceHelper.gs(R.string.disconnectpumpfor15m)
             R.id.overview_disconnect_30m -> description = resourceHelper.gs(R.string.disconnectpumpfor30m)
-            R.id.overview_disconnect_1h -> description = resourceHelper.gs(R.string.disconnectpumpfor1h)
-            R.id.overview_disconnect_2h -> description = resourceHelper.gs(R.string.disconnectpumpfor2h)
-            R.id.overview_disconnect_3h -> description = resourceHelper.gs(R.string.disconnectpumpfor3h)
+            R.id.overview_disconnect_1h  -> description = resourceHelper.gs(R.string.disconnectpumpfor1h)
+            R.id.overview_disconnect_2h  -> description = resourceHelper.gs(R.string.disconnectpumpfor2h)
+            R.id.overview_disconnect_3h  -> description = resourceHelper.gs(R.string.disconnectpumpfor3h)
         }
         activity?.let { activity ->
             OKDialog.showConfirmation(activity, resourceHelper.gs(R.string.confirm), description, Runnable {
@@ -238,35 +280,34 @@ class LoopDialog : DaggerDialogFragment() {
     }
 
     fun onClick(v: View): Boolean {
-        val profile = profileFunction.getProfile() ?: return true
         when (v.id) {
-            R.id.overview_closeloop -> {
+            R.id.overview_closeloop                       -> {
                 uel.log(Action.CLOSED_LOOP_MODE, Sources.LoopDialog)
                 sp.putString(R.string.key_aps_mode, "closed")
                 rxBus.send(EventPreferenceChange(resourceHelper.gs(R.string.closedloop)))
                 return true
             }
 
-            R.id.overview_lgsloop -> {
+            R.id.overview_lgsloop                         -> {
                 uel.log(Action.LGS_LOOP_MODE, Sources.LoopDialog)
                 sp.putString(R.string.key_aps_mode, "lgs")
                 rxBus.send(EventPreferenceChange(resourceHelper.gs(R.string.lowglucosesuspend)))
                 return true
             }
 
-            R.id.overview_openloop -> {
+            R.id.overview_openloop                        -> {
                 uel.log(Action.OPEN_LOOP_MODE, Sources.LoopDialog)
                 sp.putString(R.string.key_aps_mode, "open")
                 rxBus.send(EventPreferenceChange(resourceHelper.gs(R.string.lowglucosesuspend)))
                 return true
             }
 
-            R.id.overview_disable -> {
+            R.id.overview_disable                         -> {
                 uel.log(Action.LOOP_DISABLED, Sources.LoopDialog)
                 loopPlugin.setPluginEnabled(PluginType.LOOP, false)
                 loopPlugin.setFragmentVisible(PluginType.LOOP, false)
                 configBuilder.storeSettings("DisablingLoop")
-                rxBus.send(EventRefreshOverview("suspendmenu"))
+                rxBus.send(EventRefreshOverview("suspend_menu"))
                 commandQueue.cancelTempBasal(true, object : Callback() {
                     override fun run() {
                         if (!result.success) {
@@ -274,97 +315,121 @@ class LoopDialog : DaggerDialogFragment() {
                         }
                     }
                 })
-                loopPlugin.createOfflineEvent(24 * 60) // upload 24h, we don't know real duration
+                disposable += repository.runTransactionForResult(InsertAndCancelCurrentOfflineEventTransaction(dateUtil.now(), T.days(365).msecs(), OfflineEvent.Reason.DISABLE_LOOP))
+                    .subscribe({ result ->
+                        result.updated.forEach { aapsLogger.debug(LTag.DATABASE, "Updated OfflineEvent $it") }
+                        result.inserted.forEach { aapsLogger.debug(LTag.DATABASE, "Inserted OfflineEvent $it") }
+                    }, {
+                        aapsLogger.error(LTag.DATABASE, "Error while saving OfflineEvent", it)
+                    })
                 return true
             }
 
-            R.id.overview_enable -> {
+            R.id.overview_enable                          -> {
                 uel.log(Action.LOOP_ENABLED, Sources.LoopDialog)
                 loopPlugin.setPluginEnabled(PluginType.LOOP, true)
                 loopPlugin.setFragmentVisible(PluginType.LOOP, true)
                 configBuilder.storeSettings("EnablingLoop")
-                rxBus.send(EventRefreshOverview("suspendmenu"))
-                loopPlugin.createOfflineEvent(0)
+                rxBus.send(EventRefreshOverview("suspend_menu"))
+                disposable += repository.runTransactionForResult(CancelCurrentOfflineEventIfAnyTransaction(dateUtil.now()))
+                    .subscribe({ result ->
+                        result.updated.forEach { aapsLogger.debug(LTag.DATABASE, "Updated OfflineEvent $it") }
+                    }, {
+                        aapsLogger.error(LTag.DATABASE, "Error while saving OfflineEvent", it)
+                    })
                 return true
             }
 
             R.id.overview_resume, R.id.overview_reconnect -> {
-                uel.log(if (v.id==R.id.overview_resume) Action.RESUME else Action.RECONNECT, Sources.LoopDialog)
-                loopPlugin.suspendTo(0L)
-                rxBus.send(EventRefreshOverview("suspendmenu"))
+                uel.log(if (v.id == R.id.overview_resume) Action.RESUME else Action.RECONNECT, Sources.LoopDialog)
+                disposable += repository.runTransactionForResult(CancelCurrentOfflineEventIfAnyTransaction(dateUtil.now()))
+                    .subscribe({ result ->
+                        result.updated.forEach { aapsLogger.debug(LTag.DATABASE, "Updated OfflineEvent $it") }
+                    }, {
+                        aapsLogger.error(LTag.DATABASE, "Error while saving OfflineEvent", it)
+                    })
+                rxBus.send(EventRefreshOverview("suspend_menu"))
                 commandQueue.cancelTempBasal(true, object : Callback() {
                     override fun run() {
                         if (!result.success) {
-                            ErrorHelperActivity.runAlarm(ctx, result.comment, resourceHelper.gs(R.string.tempbasaldeliveryerror), info.nightscout.androidaps.dana.R.raw.boluserror)
+                            ErrorHelperActivity.runAlarm(ctx, result.comment, resourceHelper.gs(R.string.tempbasaldeliveryerror), R.raw.boluserror)
                         }
                     }
                 })
                 sp.putBoolean(R.string.key_objectiveusereconnect, true)
-                loopPlugin.createOfflineEvent(0)
                 return true
             }
 
-            R.id.overview_suspend_1h -> {
+            R.id.overview_suspend_1h                      -> {
                 uel.log(Action.SUSPEND, Sources.LoopDialog, ValueWithUnit.Hour(1))
-                loopPlugin.suspendLoop(60)
-                rxBus.send(EventRefreshOverview("suspendmenu"))
+                loopPlugin.suspendLoop(T.hours(1).mins().toInt())
+                rxBus.send(EventRefreshOverview("suspend_menu"))
                 return true
             }
 
-            R.id.overview_suspend_2h -> {
+            R.id.overview_suspend_2h                      -> {
                 uel.log(Action.SUSPEND, Sources.LoopDialog, ValueWithUnit.Hour(2))
-                loopPlugin.suspendLoop(120)
-                rxBus.send(EventRefreshOverview("suspendmenu"))
+                loopPlugin.suspendLoop(T.hours(2).mins().toInt())
+                rxBus.send(EventRefreshOverview("suspend_menu"))
                 return true
             }
 
-            R.id.overview_suspend_3h -> {
+            R.id.overview_suspend_3h                      -> {
                 uel.log(Action.SUSPEND, Sources.LoopDialog, ValueWithUnit.Hour(3))
-                loopPlugin.suspendLoop(180)
-                rxBus.send(EventRefreshOverview("suspendmenu"))
+                loopPlugin.suspendLoop(T.hours(3).mins().toInt())
+                rxBus.send(EventRefreshOverview("suspend_menu"))
                 return true
             }
 
-            R.id.overview_suspend_10h -> {
+            R.id.overview_suspend_10h                     -> {
                 uel.log(Action.SUSPEND, Sources.LoopDialog, ValueWithUnit.Hour(10))
-                loopPlugin.suspendLoop(600)
-                rxBus.send(EventRefreshOverview("suspendmenu"))
+                loopPlugin.suspendLoop(T.hours(10).mins().toInt())
+                rxBus.send(EventRefreshOverview("suspend_menu"))
                 return true
             }
 
-            R.id.overview_disconnect_15m -> {
-                uel.log(Action.DISCONNECT, Sources.LoopDialog, ValueWithUnit.Minute(15))
-                loopPlugin.disconnectPump(15, profile)
-                rxBus.send(EventRefreshOverview("suspendmenu"))
+            R.id.overview_disconnect_15m                  -> {
+                profileFunction.getProfile()?.let { profile ->
+                    uel.log(Action.DISCONNECT, Sources.LoopDialog, ValueWithUnit.Minute(15))
+                    loopPlugin.goToZeroTemp(T.mins(15).mins().toInt(), profile, OfflineEvent.Reason.DISCONNECT_PUMP)
+                    rxBus.send(EventRefreshOverview("suspend_menu"))
+                }
                 return true
             }
 
-            R.id.overview_disconnect_30m -> {
-                uel.log(Action.DISCONNECT, Sources.LoopDialog, ValueWithUnit.Minute(30))
-                loopPlugin.disconnectPump(30, profile)
-                rxBus.send(EventRefreshOverview("suspendmenu"))
+            R.id.overview_disconnect_30m                  -> {
+                profileFunction.getProfile()?.let { profile ->
+                    uel.log(Action.DISCONNECT, Sources.LoopDialog, ValueWithUnit.Minute(30))
+                    loopPlugin.goToZeroTemp(T.mins(30).mins().toInt(), profile, OfflineEvent.Reason.DISCONNECT_PUMP)
+                    rxBus.send(EventRefreshOverview("suspend_menu"))
+                }
                 return true
             }
 
-            R.id.overview_disconnect_1h -> {
-                uel.log(Action.DISCONNECT, Sources.LoopDialog, ValueWithUnit.Hour(1))
-                loopPlugin.disconnectPump(60, profile)
-                sp.putBoolean(R.string.key_objectiveusedisconnect, true)
-                rxBus.send(EventRefreshOverview("suspendmenu"))
+            R.id.overview_disconnect_1h                   -> {
+                profileFunction.getProfile()?.let { profile ->
+                    uel.log(Action.DISCONNECT, Sources.LoopDialog, ValueWithUnit.Hour(1))
+                    loopPlugin.goToZeroTemp(T.hours(1).mins().toInt(), profile, OfflineEvent.Reason.DISCONNECT_PUMP)
+                    rxBus.send(EventRefreshOverview("suspend_menu"))
+                }
                 return true
             }
 
-            R.id.overview_disconnect_2h -> {
-                uel.log(Action.DISCONNECT, Sources.LoopDialog, ValueWithUnit.Hour(2))
-                loopPlugin.disconnectPump(120, profile)
-                rxBus.send(EventRefreshOverview("suspendmenu"))
+            R.id.overview_disconnect_2h                   -> {
+                profileFunction.getProfile()?.let { profile ->
+                    uel.log(Action.DISCONNECT, Sources.LoopDialog, ValueWithUnit.Hour(2))
+                    loopPlugin.goToZeroTemp(T.hours(2).mins().toInt(), profile, OfflineEvent.Reason.DISCONNECT_PUMP)
+                    rxBus.send(EventRefreshOverview("suspend_menu"))
+                }
                 return true
             }
 
-            R.id.overview_disconnect_3h -> {
-                uel.log(Action.DISCONNECT, Sources.LoopDialog, ValueWithUnit.Hour(3))
-                loopPlugin.disconnectPump(180, profile)
-                rxBus.send(EventRefreshOverview("suspendmenu"))
+            R.id.overview_disconnect_3h                   -> {
+                profileFunction.getProfile()?.let { profile ->
+                    uel.log(Action.DISCONNECT, Sources.LoopDialog, ValueWithUnit.Hour(3))
+                    loopPlugin.goToZeroTemp(T.hours(3).mins().toInt(), profile, OfflineEvent.Reason.DISCONNECT_PUMP)
+                    rxBus.send(EventRefreshOverview("suspend_menu"))
+                }
                 return true
             }
         }
@@ -378,7 +443,7 @@ class LoopDialog : DaggerDialogFragment() {
                 it.commitAllowingStateLoss()
             }
         } catch (e: IllegalStateException) {
-            aapsLogger.debug(e.localizedMessage)
+            aapsLogger.debug(e.localizedMessage ?: e.toString())
         }
     }
 }
diff --git a/app/src/main/java/info/nightscout/androidaps/dialogs/ProfileSwitchDialog.kt b/app/src/main/java/info/nightscout/androidaps/dialogs/ProfileSwitchDialog.kt
index d47573ef2f..65bd45444c 100644
--- a/app/src/main/java/info/nightscout/androidaps/dialogs/ProfileSwitchDialog.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dialogs/ProfileSwitchDialog.kt
@@ -1,6 +1,8 @@
 package info.nightscout.androidaps.dialogs
 
 import android.os.Bundle
+import android.text.Editable
+import android.text.TextWatcher
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -8,20 +10,32 @@ import android.widget.ArrayAdapter
 import com.google.common.base.Joiner
 import info.nightscout.androidaps.Constants
 import info.nightscout.androidaps.R
+import info.nightscout.androidaps.data.ProfileSealed
 import info.nightscout.androidaps.database.AppRepository
+import info.nightscout.androidaps.database.entities.TemporaryTarget
 import info.nightscout.androidaps.database.entities.UserEntry.Action
 import info.nightscout.androidaps.database.entities.UserEntry.Sources
 import info.nightscout.androidaps.database.entities.ValueWithUnit
+import info.nightscout.androidaps.database.transactions.InsertAndCancelCurrentTemporaryTargetTransaction
 import info.nightscout.androidaps.databinding.DialogProfileswitchBinding
+import info.nightscout.androidaps.extensions.toVisibility
 import info.nightscout.androidaps.interfaces.ActivePlugin
+import info.nightscout.androidaps.interfaces.Config
+import info.nightscout.androidaps.interfaces.Profile
 import info.nightscout.androidaps.interfaces.ProfileFunction
+import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.logging.UserEntryLogger
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.utils.DefaultValueHelper
+import info.nightscout.androidaps.utils.HardLimits
 import info.nightscout.androidaps.utils.HtmlHelper
 import info.nightscout.androidaps.utils.alertDialogs.OKDialog
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import io.reactivex.disposables.CompositeDisposable
+import io.reactivex.rxkotlin.plusAssign
 import java.text.DecimalFormat
 import java.util.*
+import java.util.concurrent.TimeUnit
 import javax.inject.Inject
 
 class ProfileSwitchDialog : DialogFragmentWithDate() {
@@ -31,6 +45,10 @@ class ProfileSwitchDialog : DialogFragmentWithDate() {
     @Inject lateinit var activePlugin: ActivePlugin
     @Inject lateinit var repository: AppRepository
     @Inject lateinit var uel: UserEntryLogger
+    @Inject lateinit var config: Config
+    @Inject lateinit var hardLimits: HardLimits
+    @Inject lateinit var rxBus: RxBusWrapper
+    @Inject lateinit var defaultValueHelper: DefaultValueHelper
 
     private var profileIndex: Int? = null
 
@@ -42,6 +60,17 @@ class ProfileSwitchDialog : DialogFragmentWithDate() {
     // onDestroyView.
     private val binding get() = _binding!!
 
+    private val textWatcher: TextWatcher = object : TextWatcher {
+        override fun afterTextChanged(s: Editable) {
+            val isDuration = binding.duration.value > 0
+            val isLowerPercentage = binding.percentage.value < 100
+            binding.ttLayout.visibility = (isDuration && isLowerPercentage).toVisibility()
+        }
+
+        override fun beforeTextChanged(s: CharSequence, start: Int, count: Int, after: Int) {}
+        override fun onTextChanged(s: CharSequence, start: Int, before: Int, count: Int) {}
+    }
+
     override fun onSaveInstanceState(savedInstanceState: Bundle) {
         super.onSaveInstanceState(savedInstanceState)
         savedInstanceState.putDouble("duration", binding.duration.value)
@@ -63,9 +92,11 @@ class ProfileSwitchDialog : DialogFragmentWithDate() {
         super.onViewCreated(view, savedInstanceState)
 
         binding.duration.setParams(savedInstanceState?.getDouble("duration")
-            ?: 0.0, 0.0, Constants.MAX_PROFILE_SWITCH_DURATION, 10.0, DecimalFormat("0"), false, binding.okcancel.ok)
+            ?: 0.0, 0.0, Constants.MAX_PROFILE_SWITCH_DURATION, 10.0, DecimalFormat("0"), false, binding.okcancel.ok,
+                                   textWatcher)
         binding.percentage.setParams(savedInstanceState?.getDouble("percentage")
-            ?: 100.0, Constants.CPP_MIN_PERCENTAGE.toDouble(), Constants.CPP_MAX_PERCENTAGE.toDouble(), 5.0, DecimalFormat("0"), false, binding.okcancel.ok)
+            ?: 100.0, Constants.CPP_MIN_PERCENTAGE.toDouble(), Constants.CPP_MAX_PERCENTAGE.toDouble(), 5.0,
+                                     DecimalFormat("0"), false, binding.okcancel.ok, textWatcher)
         binding.timeshift.setParams(savedInstanceState?.getDouble("timeshift")
             ?: 0.0, Constants.CPP_MIN_TIMESHIFT.toDouble(), Constants.CPP_MAX_TIMESHIFT.toDouble(), 1.0, DecimalFormat("0"), false, binding.okcancel.ok)
 
@@ -97,6 +128,7 @@ class ProfileSwitchDialog : DialogFragmentWithDate() {
                 binding.reuselayout.visibility = View.GONE
             }
         }
+        binding.ttLayout.visibility = View.GONE
     }
 
     override fun onDestroyView() {
@@ -128,23 +160,58 @@ class ProfileSwitchDialog : DialogFragmentWithDate() {
         if (eventTimeChanged)
             actions.add(resourceHelper.gs(R.string.time) + ": " + dateUtil.dateAndTimeString(eventTime))
 
+        val isTT = binding.duration.value > 0 && binding.percentage.value < 100 && binding.tt.isChecked
+        val target = defaultValueHelper.determineActivityTT()
+        val units = profileFunction.getUnits()
+        if (isTT)
+            actions.add(resourceHelper.gs(R.string.careportal_temporarytarget) + ": " + resourceHelper.gs(R.string.activity))
+
         activity?.let { activity ->
-            OKDialog.showConfirmation(activity, resourceHelper.gs(R.string.careportal_profileswitch), HtmlHelper.fromHtml(Joiner.on("<br/>").join(actions)), {
-                profileFunction.createProfileSwitch(profileStore,
-                    profileName = profileName,
-                    durationInMinutes = duration,
-                    percentage = percent,
-                    timeShiftInHours = timeShift,
-                    timestamp = eventTime)
-                uel.log(Action.PROFILE_SWITCH,
-                    Sources.ProfileSwitchDialog,
-                    notes,
-                    ValueWithUnit.Timestamp(eventTime).takeIf { eventTimeChanged },
-                    ValueWithUnit.SimpleString(profileName),
-                    ValueWithUnit.Percent(percent),
-                    ValueWithUnit.Hour(timeShift).takeIf { timeShift != 0 },
-                    ValueWithUnit.Minute(duration).takeIf { duration != 0 })
-            })
+            val ps = profileFunction.buildProfileSwitch(profileStore, profileName, duration, percent, timeShift, eventTime)
+            val validity = ProfileSealed.PS(ps).isValid(resourceHelper.gs(R.string.careportal_profileswitch), activePlugin.activePump, config, resourceHelper, rxBus, hardLimits)
+            if (validity.isValid)
+                OKDialog.showConfirmation(activity, resourceHelper.gs(R.string.careportal_profileswitch), HtmlHelper.fromHtml(Joiner.on("<br/>").join(actions)), {
+                    profileFunction.createProfileSwitch(profileStore,
+                        profileName = profileName,
+                        durationInMinutes = duration,
+                        percentage = percent,
+                        timeShiftInHours = timeShift,
+                        timestamp = eventTime)
+                    uel.log(Action.PROFILE_SWITCH,
+                        Sources.ProfileSwitchDialog,
+                        notes,
+                        ValueWithUnit.Timestamp(eventTime).takeIf { eventTimeChanged },
+                        ValueWithUnit.SimpleString(profileName),
+                        ValueWithUnit.Percent(percent),
+                        ValueWithUnit.Hour(timeShift).takeIf { timeShift != 0 },
+                        ValueWithUnit.Minute(duration).takeIf { duration != 0 })
+                    if (isTT) {
+                        disposable += repository.runTransactionForResult(
+                            InsertAndCancelCurrentTemporaryTargetTransaction(
+                                timestamp = eventTime,
+                                duration = TimeUnit.MINUTES.toMillis(duration.toLong()),
+                                reason =  TemporaryTarget.Reason.ACTIVITY,
+                                lowTarget = Profile.toMgdl(target, profileFunction.getUnits()),
+                                highTarget = Profile.toMgdl(target, profileFunction.getUnits())
+                        )
+                        ).subscribe({ result ->
+                                         result.inserted.forEach { aapsLogger.debug(LTag.DATABASE, "Inserted temp target $it") }
+                                         result.updated.forEach { aapsLogger.debug(LTag.DATABASE, "Updated temp target $it") }
+                                     }, {
+                                         aapsLogger.error(LTag.DATABASE, "Error while saving temporary target", it)
+                                     })
+                        uel.log(Action.TT, Sources.TTDialog, ValueWithUnit.Timestamp(eventTime).takeIf { eventTimeChanged }, ValueWithUnit.TherapyEventTTReason(
+                            TemporaryTarget.Reason.ACTIVITY), ValueWithUnit.fromGlucoseUnit(target, units.asText), ValueWithUnit.Minute(duration))
+                    }
+                })
+            else {
+                OKDialog.show(
+                    activity,
+                    resourceHelper.gs(R.string.careportal_profileswitch),
+                    HtmlHelper.fromHtml(Joiner.on("<br/>").join(validity.reasons))
+                )
+                return false
+            }
         }
         return true
     }
diff --git a/app/src/main/java/info/nightscout/androidaps/dialogs/TempBasalDialog.kt b/app/src/main/java/info/nightscout/androidaps/dialogs/TempBasalDialog.kt
index 10df72c584..f5c02a69d4 100644
--- a/app/src/main/java/info/nightscout/androidaps/dialogs/TempBasalDialog.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dialogs/TempBasalDialog.kt
@@ -119,7 +119,7 @@ class TempBasalDialog : DialogFragmentWithDate() {
                 val callback: Callback = object : Callback() {
                     override fun run() {
                         if (!result.success) {
-                            ErrorHelperActivity.runAlarm(ctx, result.comment, resourceHelper.gs(R.string.tempbasaldeliveryerror), info.nightscout.androidaps.dana.R.raw.boluserror)
+                            ErrorHelperActivity.runAlarm(ctx, result.comment, resourceHelper.gs(R.string.tempbasaldeliveryerror), R.raw.boluserror)
                         }
                     }
                 }
diff --git a/app/src/main/java/info/nightscout/androidaps/dialogs/TempTargetDialog.kt b/app/src/main/java/info/nightscout/androidaps/dialogs/TempTargetDialog.kt
index 699d3c43c1..36c157df72 100644
--- a/app/src/main/java/info/nightscout/androidaps/dialogs/TempTargetDialog.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dialogs/TempTargetDialog.kt
@@ -17,7 +17,7 @@ import info.nightscout.androidaps.database.entities.TemporaryTarget
 import info.nightscout.androidaps.database.entities.UserEntry.Action
 import info.nightscout.androidaps.database.entities.UserEntry.Sources
 import info.nightscout.androidaps.database.transactions.CancelCurrentTemporaryTargetIfAnyTransaction
-import info.nightscout.androidaps.database.transactions.InsertTemporaryTargetAndCancelCurrentTransaction
+import info.nightscout.androidaps.database.transactions.InsertAndCancelCurrentTemporaryTargetTransaction
 import info.nightscout.androidaps.databinding.DialogTemptargetBinding
 import info.nightscout.androidaps.interfaces.GlucoseUnit
 import info.nightscout.androidaps.interfaces.ProfileFunction
@@ -196,7 +196,7 @@ class TempTargetDialog : DialogFragmentWithDate() {
                             aapsLogger.error(LTag.DATABASE, "Error while saving temporary target", it)
                         })
                 } else {
-                    disposable += repository.runTransactionForResult(InsertTemporaryTargetAndCancelCurrentTransaction(
+                    disposable += repository.runTransactionForResult(InsertAndCancelCurrentTemporaryTargetTransaction(
                         timestamp = eventTime,
                         duration = TimeUnit.MINUTES.toMillis(duration.toLong()),
                         reason = when (reason) {
diff --git a/app/src/main/java/info/nightscout/androidaps/dialogs/TreatmentDialog.kt b/app/src/main/java/info/nightscout/androidaps/dialogs/TreatmentDialog.kt
index a76863bce2..060eaff132 100644
--- a/app/src/main/java/info/nightscout/androidaps/dialogs/TreatmentDialog.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dialogs/TreatmentDialog.kt
@@ -174,7 +174,7 @@ class TreatmentDialog : DialogFragmentWithDate() {
                             commandQueue.bolus(detailedBolusInfo, object : Callback() {
                                 override fun run() {
                                     if (!result.success) {
-                                        ErrorHelperActivity.runAlarm(ctx, result.comment, resourceHelper.gs(R.string.treatmentdeliveryerror), info.nightscout.androidaps.dana.R.raw.boluserror)
+                                        ErrorHelperActivity.runAlarm(ctx, result.comment, resourceHelper.gs(R.string.treatmentdeliveryerror), R.raw.boluserror)
                                     }
                                 }
                             })
diff --git a/app/src/main/java/info/nightscout/androidaps/dialogs/WizardDialog.kt b/app/src/main/java/info/nightscout/androidaps/dialogs/WizardDialog.kt
index 9d65cc01e1..1483359162 100644
--- a/app/src/main/java/info/nightscout/androidaps/dialogs/WizardDialog.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dialogs/WizardDialog.kt
@@ -384,7 +384,7 @@ class WizardDialog : DaggerDialogFragment() {
                 it.commitAllowingStateLoss()
             }
         } catch (e: IllegalStateException) {
-            aapsLogger.debug(e.localizedMessage)
+            aapsLogger.debug(e.localizedMessage ?: "")
         }
     }
 }
diff --git a/app/src/main/java/info/nightscout/androidaps/events/EventTreatmentUpdateGui.kt b/app/src/main/java/info/nightscout/androidaps/events/EventTreatmentUpdateGui.kt
new file mode 100644
index 0000000000..4a32b3c659
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/events/EventTreatmentUpdateGui.kt
@@ -0,0 +1,3 @@
+package info.nightscout.androidaps.events
+
+class EventTreatmentUpdateGui : EventUpdateGui()
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/historyBrowser/HistoryBrowseActivity.kt b/app/src/main/java/info/nightscout/androidaps/historyBrowser/HistoryBrowseActivity.kt
deleted file mode 100644
index 1abda3295f..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/historyBrowser/HistoryBrowseActivity.kt
+++ /dev/null
@@ -1,379 +0,0 @@
-package info.nightscout.androidaps.historyBrowser
-
-import android.app.DatePickerDialog
-import android.graphics.Color
-import android.os.Bundle
-import android.util.DisplayMetrics
-import android.view.ViewGroup
-import android.widget.LinearLayout
-import android.widget.RelativeLayout
-import android.widget.TextView
-import androidx.lifecycle.lifecycleScope
-import com.jjoe64.graphview.GraphView
-import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.R
-import info.nightscout.androidaps.activities.NoSplashAppCompatActivity
-import info.nightscout.androidaps.databinding.ActivityHistorybrowseBinding
-import info.nightscout.androidaps.events.EventAutosensCalculationFinished
-import info.nightscout.androidaps.events.EventCustomCalculationFinished
-import info.nightscout.androidaps.events.EventRefreshOverview
-import info.nightscout.androidaps.extensions.toVisibility
-import info.nightscout.androidaps.interfaces.ActivePlugin
-import info.nightscout.androidaps.interfaces.ProfileFunction
-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.OverviewMenus
-import info.nightscout.androidaps.plugins.general.overview.graphData.GraphData
-import info.nightscout.androidaps.plugins.iob.iobCobCalculator.events.EventIobCalculationProgress
-import info.nightscout.androidaps.utils.DateUtil
-import info.nightscout.androidaps.utils.DefaultValueHelper
-import info.nightscout.androidaps.utils.FabricPrivacy
-import info.nightscout.androidaps.utils.T
-import info.nightscout.androidaps.utils.buildHelper.BuildHelper
-import info.nightscout.androidaps.utils.rx.AapsSchedulers
-import info.nightscout.androidaps.utils.sharedPreferences.SP
-import io.reactivex.disposables.CompositeDisposable
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
-import java.util.*
-import javax.inject.Inject
-
-class HistoryBrowseActivity : NoSplashAppCompatActivity() {
-
-    @Inject lateinit var injector: HasAndroidInjector
-    @Inject lateinit var aapsLogger: AAPSLogger
-    @Inject lateinit var aapsSchedulers: AapsSchedulers
-    @Inject lateinit var rxBus: RxBusWrapper
-    @Inject lateinit var sp: SP
-    @Inject lateinit var profileFunction: ProfileFunction
-    @Inject lateinit var defaultValueHelper: DefaultValueHelper
-    @Inject lateinit var iobCobCalculatorPluginHistory: IobCobCalculatorPluginHistory
-    @Inject lateinit var activePlugin: ActivePlugin
-    @Inject lateinit var buildHelper: BuildHelper
-    @Inject lateinit var fabricPrivacy: FabricPrivacy
-    @Inject lateinit var overviewMenus: OverviewMenus
-    @Inject lateinit var dateUtil: DateUtil
-
-    private val disposable = CompositeDisposable()
-
-    private val secondaryGraphs = ArrayList<GraphView>()
-    private val secondaryGraphsLabel = ArrayList<TextView>()
-
-    private var axisWidth: Int = 0
-    private var rangeToDisplay = 24 // for graph
-    private var start: Long = 0
-
-    private val graphLock = Object()
-
-    private var eventCustomCalculationFinished = EventCustomCalculationFinished()
-
-    private lateinit var binding: ActivityHistorybrowseBinding
-    private var destroyed = false
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        binding = ActivityHistorybrowseBinding.inflate(layoutInflater)
-        setContentView(binding.root)
-
-        binding.left.setOnClickListener {
-            start -= T.hours(rangeToDisplay.toLong()).msecs()
-            runCalculation("onClickLeft")
-        }
-        binding.right.setOnClickListener {
-            start += T.hours(rangeToDisplay.toLong()).msecs()
-            runCalculation("onClickRight")
-        }
-        binding.end.setOnClickListener {
-            val calendar = Calendar.getInstance()
-            calendar.timeInMillis = System.currentTimeMillis()
-            calendar[Calendar.MILLISECOND] = 0
-            calendar[Calendar.SECOND] = 0
-            calendar[Calendar.MINUTE] = 0
-            calendar[Calendar.HOUR_OF_DAY] = 0
-            start = calendar.timeInMillis
-            runCalculation("onClickEnd")
-        }
-        binding.zoom.setOnClickListener {
-            rangeToDisplay += 6
-            rangeToDisplay = if (rangeToDisplay > 24) 6 else rangeToDisplay
-            updateGUI("rangeChange", false)
-        }
-        binding.zoom.setOnLongClickListener {
-            val calendar = Calendar.getInstance()
-            calendar.timeInMillis = start
-            calendar[Calendar.MILLISECOND] = 0
-            calendar[Calendar.SECOND] = 0
-            calendar[Calendar.MINUTE] = 0
-            calendar[Calendar.HOUR_OF_DAY] = 0
-            start = calendar.timeInMillis
-            runCalculation("onLongClickZoom")
-            true
-        }
-
-        // create an OnDateSetListener
-        val dateSetListener = DatePickerDialog.OnDateSetListener { _, year, monthOfYear, dayOfMonth ->
-            val cal = Calendar.getInstance()
-            cal.timeInMillis = start
-            cal[Calendar.YEAR] = year
-            cal[Calendar.MONTH] = monthOfYear
-            cal[Calendar.DAY_OF_MONTH] = dayOfMonth
-            cal[Calendar.MILLISECOND] = 0
-            cal[Calendar.SECOND] = 0
-            cal[Calendar.MINUTE] = 0
-            cal[Calendar.HOUR_OF_DAY] = 0
-            start = cal.timeInMillis
-            binding.date.text = dateUtil.dateAndTimeString(start)
-            runCalculation("onClickDate")
-        }
-
-        binding.date.setOnClickListener {
-            val cal = Calendar.getInstance()
-            cal.timeInMillis = start
-            DatePickerDialog(this, dateSetListener,
-                cal.get(Calendar.YEAR),
-                cal.get(Calendar.MONTH),
-                cal.get(Calendar.DAY_OF_MONTH)
-            ).show()
-        }
-
-        val dm = DisplayMetrics()
-        windowManager?.defaultDisplay?.getMetrics(dm)
-
-        axisWidth = if (dm.densityDpi <= 120) 3 else if (dm.densityDpi <= 160) 10 else if (dm.densityDpi <= 320) 35 else if (dm.densityDpi <= 420) 50 else if (dm.densityDpi <= 560) 70 else 80
-        binding.bggraph.gridLabelRenderer?.gridColor = resourceHelper.gc(R.color.graphgrid)
-        binding.bggraph.gridLabelRenderer?.reloadStyles()
-        binding.bggraph.gridLabelRenderer?.labelVerticalWidth = axisWidth
-
-        overviewMenus.setupChartMenu(binding.chartMenuButton)
-        prepareGraphsIfNeeded(overviewMenus.setting.size)
-        savedInstanceState?.let { bundle ->
-            rangeToDisplay = bundle.getInt("rangeToDisplay", 0)
-            start = bundle.getLong("start", 0)
-        }
-
-    }
-
-    public override fun onPause() {
-        super.onPause()
-        disposable.clear()
-        iobCobCalculatorPluginHistory.stopCalculation("onPause")
-    }
-
-    @Synchronized
-    override fun onDestroy() {
-        destroyed = true
-        super.onDestroy()
-    }
-
-    public override fun onResume() {
-        super.onResume()
-        disposable.add(rxBus
-            .toObservable(EventAutosensCalculationFinished::class.java)
-            .observeOn(aapsSchedulers.io)
-            .subscribe({
-                // catch only events from iobCobCalculatorPluginHistory
-                if (it.cause is EventCustomCalculationFinished) {
-                    updateGUI("EventAutosensCalculationFinished", bgOnly = false)
-                }
-            }, fabricPrivacy::logException)
-        )
-        disposable.add(rxBus
-            .toObservable(EventIobCalculationProgress::class.java)
-            .observeOn(aapsSchedulers.main)
-            .subscribe({ binding.overviewIobcalculationprogess.text = it.progress }, fabricPrivacy::logException)
-        )
-        disposable.add(rxBus
-            .toObservable(EventRefreshOverview::class.java)
-            .observeOn(aapsSchedulers.main)
-            .subscribe({
-                if (it.now) {
-                    updateGUI("EventRefreshOverview", bgOnly = false)
-                }
-            }, fabricPrivacy::logException)
-        )
-        if (start == 0L) {
-            // set start of current day
-            val calendar = Calendar.getInstance()
-            calendar.timeInMillis = System.currentTimeMillis()
-            calendar[Calendar.MILLISECOND] = 0
-            calendar[Calendar.SECOND] = 0
-            calendar[Calendar.MINUTE] = 0
-            calendar[Calendar.HOUR_OF_DAY] = 0
-            start = calendar.timeInMillis
-            runCalculation("onResume")
-        } else {
-            updateGUI("onResume", bgOnly = false)
-        }
-    }
-
-    override fun onSaveInstanceState(outState: Bundle) {
-        super.onSaveInstanceState(outState)
-        outState.putInt("rangeToDisplay", rangeToDisplay)
-        outState.putLong("start", start)
-
-    }
-
-    private fun prepareGraphsIfNeeded(numOfGraphs: Int) {
-        synchronized(graphLock) {
-            if (numOfGraphs != secondaryGraphs.size - 1) {
-                //aapsLogger.debug("New secondary graph count ${numOfGraphs-1}")
-                // rebuild needed
-                secondaryGraphs.clear()
-                secondaryGraphsLabel.clear()
-                binding.iobGraph.removeAllViews()
-                for (i in 1 until numOfGraphs) {
-                    val relativeLayout = RelativeLayout(this)
-                    relativeLayout.layoutParams = RelativeLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT)
-
-                    val graph = GraphView(this)
-                    graph.layoutParams = LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, resourceHelper.dpToPx(100)).also { it.setMargins(0, resourceHelper.dpToPx(15), 0, resourceHelper.dpToPx(10)) }
-                    graph.gridLabelRenderer?.gridColor = resourceHelper.gc(R.color.graphgrid)
-                    graph.gridLabelRenderer?.reloadStyles()
-                    graph.gridLabelRenderer?.isHorizontalLabelsVisible = false
-                    graph.gridLabelRenderer?.labelVerticalWidth = axisWidth
-                    graph.gridLabelRenderer?.numVerticalLabels = 3
-                    graph.viewport.backgroundColor = Color.argb(20, 255, 255, 255) // 8% of gray
-                    relativeLayout.addView(graph)
-
-                    val label = TextView(this)
-                    val layoutParams = RelativeLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT).also { it.setMargins(resourceHelper.dpToPx(30), resourceHelper.dpToPx(25), 0, 0) }
-                    layoutParams.addRule(RelativeLayout.ALIGN_PARENT_TOP)
-                    layoutParams.addRule(RelativeLayout.ALIGN_PARENT_LEFT)
-                    label.layoutParams = layoutParams
-                    relativeLayout.addView(label)
-                    secondaryGraphsLabel.add(label)
-
-                    binding.iobGraph.addView(relativeLayout)
-                    secondaryGraphs.add(graph)
-                }
-            }
-        }
-    }
-
-    private fun runCalculation(from: String) {
-        lifecycleScope.launch(Dispatchers.Default) {
-            val end = start + T.hours(rangeToDisplay.toLong()).msecs()
-            iobCobCalculatorPluginHistory.stopCalculation(from)
-            iobCobCalculatorPluginHistory.clearCache()
-            iobCobCalculatorPluginHistory.runCalculation(from, end, bgDataReload = true, limitDataToOldestAvailable = false, cause = eventCustomCalculationFinished)
-        }
-    }
-
-    @Synchronized
-    fun updateGUI(from: String, bgOnly: Boolean) {
-        val menuChartSettings = overviewMenus.setting
-        prepareGraphsIfNeeded(menuChartSettings.size)
-        aapsLogger.debug(LTag.UI, "updateGUI from: $from")
-        val pump = activePlugin.activePump
-        val profile = profileFunction.getProfile()
-
-        val lowLine = defaultValueHelper.determineLowLine()
-        val highLine = defaultValueHelper.determineHighLine()
-
-        lifecycleScope.launch(Dispatchers.Main) {
-            binding.noprofile.visibility = (profile == null).toVisibility()
-            profile ?: return@launch
-
-            if (destroyed) return@launch
-            binding.date.text = dateUtil.dateAndTimeString(start)
-            binding.zoom.text = rangeToDisplay.toString()
-            val graphData = GraphData(injector, binding.bggraph)
-            val secondaryGraphsData: ArrayList<GraphData> = ArrayList()
-
-            // do preparation in different thread
-            withContext(Dispatchers.Default) {
-                val fromTime: Long = start + T.secs(100).msecs()
-                val toTime: Long = start + T.hours(rangeToDisplay.toLong()).msecs() + T.secs(100).msecs()
-                aapsLogger.debug(LTag.UI, "Period: " + dateUtil.dateAndTimeString(fromTime) + " - " + dateUtil.dateAndTimeString(toTime))
-                val pointer = System.currentTimeMillis()
-
-                // **** In range Area ****
-                graphData.addInRangeArea(fromTime, toTime, lowLine, highLine)
-
-                // **** BG ****
-//                graphData.addBgReadings(fromTime, toTime, highLine, null)
-//                if (buildHelper.isDev()) graphData.addBucketedData(fromTime, toTime)
-
-                // add target line
-//                graphData.addTargetLine(fromTime, toTime, profile, null)
-
-                // **** NOW line ****
-                graphData.addNowLine(pointer)
-
-                if (!bgOnly) {
-                    // Treatments
-//                    graphData.addTreatments(fromTime, toTime)
-                    if (menuChartSettings[0][OverviewMenus.CharType.ACT.ordinal])
-//                        graphData.addActivity(fromTime, toTime, false, 0.8)
-
-                    // add basal data
-                    if (pump.pumpDescription.isTempBasalCapable && menuChartSettings[0][OverviewMenus.CharType.BAS.ordinal]) {
-//                        graphData.addBasals(fromTime, toTime, lowLine / graphData.maxY / 1.2)
-                    }
-                    // ------------------ 2nd graph
-                    synchronized(graphLock) {
-                        for (g in 0 until secondaryGraphs.size) {
-                            val secondGraphData = GraphData(injector, secondaryGraphs[g])
-                            var useIobForScale = false
-                            var useCobForScale = false
-                            var useDevForScale = false
-                            var useRatioForScale = false
-                            var useDSForScale = false
-                            var useBGIForScale = false
-                            var useABSForScale = false
-                            when {
-                                menuChartSettings[g + 1][OverviewMenus.CharType.IOB.ordinal]      -> useIobForScale = true
-                                menuChartSettings[g + 1][OverviewMenus.CharType.COB.ordinal]      -> useCobForScale = true
-                                menuChartSettings[g + 1][OverviewMenus.CharType.DEV.ordinal]      -> useDevForScale = true
-                                menuChartSettings[g + 1][OverviewMenus.CharType.SEN.ordinal]      -> useRatioForScale = true
-                                menuChartSettings[g + 1][OverviewMenus.CharType.BGI.ordinal]      -> useBGIForScale = true
-                                menuChartSettings[g + 1][OverviewMenus.CharType.ABS.ordinal]      -> useABSForScale = true
-                                menuChartSettings[g + 1][OverviewMenus.CharType.DEVSLOPE.ordinal] -> useDSForScale = true
-                            }
-
-                            val alignIobScale = menuChartSettings[g + 1][OverviewMenus.CharType.ABS.ordinal] && menuChartSettings[g + 1][OverviewMenus.CharType.IOB.ordinal]
-                            val alignDevBgiScale = menuChartSettings[g + 1][OverviewMenus.CharType.DEV.ordinal] && menuChartSettings[g + 1][OverviewMenus.CharType.BGI.ordinal]
-
-//                            if (menuChartSettings[g + 1][OverviewMenus.CharType.ABS.ordinal]) secondGraphData.addAbsIob(fromTime, toTime, useABSForScale, 1.0)
-//                            if (menuChartSettings[g + 1][OverviewMenus.CharType.IOB.ordinal]) secondGraphData.addIob(fromTime, toTime, useIobForScale, 1.0, menuChartSettings[g + 1][OverviewMenus.CharType.PRE.ordinal], alignIobScale)
-//                            if (menuChartSettings[g + 1][OverviewMenus.CharType.COB.ordinal]) secondGraphData.addCob(fromTime, toTime, useCobForScale, if (useCobForScale) 1.0 else 0.5)
-//                            if (menuChartSettings[g + 1][OverviewMenus.CharType.DEV.ordinal]) secondGraphData.addDeviations(fromTime, toTime, useDevForScale, 1.0, alignDevBgiScale)
-//                            if (menuChartSettings[g + 1][OverviewMenus.CharType.SEN.ordinal]) secondGraphData.addRatio(fromTime, toTime, useRatioForScale, 1.0)
-//                            if (menuChartSettings[g + 1][OverviewMenus.CharType.BGI.ordinal]) secondGraphData.addMinusBGI(fromTime, toTime, useBGIForScale, if (alignDevBgiScale) 1.0 else 0.8, alignDevBgiScale)
-//                            if (menuChartSettings[g + 1][OverviewMenus.CharType.DEVSLOPE.ordinal] && buildHelper.isDev()) secondGraphData.addDeviationSlope(fromTime, toTime, useDSForScale, 1.0)
-
-                            // set manual x bounds to have nice steps
-                            secondGraphData.formatAxis(fromTime, toTime)
-                            secondGraphData.addNowLine(pointer)
-                            secondaryGraphsData.add(secondGraphData)
-                        }
-                    }
-                }
-
-                // set manual x bounds to have nice steps
-                graphData.setNumVerticalLabels()
-                graphData.formatAxis(fromTime, toTime)
-            }
-            // finally enforce drawing of graphs in UI thread
-            graphData.performUpdate()
-            if (!bgOnly)
-                synchronized(graphLock) {
-                    for (g in 0 until secondaryGraphs.size) {
-                        secondaryGraphsLabel[g].text = overviewMenus.enabledTypes(g + 1)
-                        secondaryGraphs[g].visibility = (!bgOnly && (
-                            menuChartSettings[g + 1][OverviewMenus.CharType.IOB.ordinal] ||
-                                menuChartSettings[g + 1][OverviewMenus.CharType.COB.ordinal] ||
-                                menuChartSettings[g + 1][OverviewMenus.CharType.DEV.ordinal] ||
-                                menuChartSettings[g + 1][OverviewMenus.CharType.SEN.ordinal] ||
-                                menuChartSettings[g + 1][OverviewMenus.CharType.ACT.ordinal] ||
-                                menuChartSettings[g + 1][OverviewMenus.CharType.ABS.ordinal] ||
-                                menuChartSettings[g + 1][OverviewMenus.CharType.DEVSLOPE.ordinal]
-                            )).toVisibility()
-                        secondaryGraphsData[g].performUpdate()
-                    }
-                }
-        }
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/historyBrowser/IobCobCalculatorPluginHistory.kt b/app/src/main/java/info/nightscout/androidaps/historyBrowser/IobCobCalculatorPluginHistory.kt
deleted file mode 100644
index 1dfc35f70a..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/historyBrowser/IobCobCalculatorPluginHistory.kt
+++ /dev/null
@@ -1,42 +0,0 @@
-package info.nightscout.androidaps.historyBrowser
-
-import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.database.AppRepository
-import info.nightscout.androidaps.interfaces.ActivePlugin
-import info.nightscout.androidaps.interfaces.ProfileFunction
-import info.nightscout.androidaps.logging.AAPSLogger
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
-import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobCalculatorPlugin
-import info.nightscout.androidaps.plugins.sensitivity.SensitivityAAPSPlugin
-import info.nightscout.androidaps.plugins.sensitivity.SensitivityOref1Plugin
-import info.nightscout.androidaps.plugins.sensitivity.SensitivityWeightedAveragePlugin
-import info.nightscout.androidaps.utils.DateUtil
-import info.nightscout.androidaps.utils.FabricPrivacy
-import info.nightscout.androidaps.utils.resources.ResourceHelper
-import info.nightscout.androidaps.utils.rx.AapsSchedulers
-import info.nightscout.androidaps.utils.sharedPreferences.SP
-import javax.inject.Inject
-import javax.inject.Singleton
-
-@Singleton
-class IobCobCalculatorPluginHistory @Inject constructor(
-    injector: HasAndroidInjector,
-    aapsLogger: AAPSLogger,
-    aapsSchedulers: AapsSchedulers,
-    rxBus: RxBusWrapper,
-    sp: SP,
-    resourceHelper: ResourceHelper,
-    profileFunction: ProfileFunction,
-    activePlugin: ActivePlugin,
-    sensitivityOref1Plugin: SensitivityOref1Plugin,
-    sensitivityAAPSPlugin: SensitivityAAPSPlugin,
-    sensitivityWeightedAveragePlugin: SensitivityWeightedAveragePlugin,
-    fabricPrivacy: FabricPrivacy,
-    dateUtil: DateUtil,
-    repository: AppRepository
-) : IobCobCalculatorPlugin(injector, aapsLogger, aapsSchedulers, rxBus, sp, resourceHelper, profileFunction,
-    activePlugin, sensitivityOref1Plugin, sensitivityAAPSPlugin, sensitivityWeightedAveragePlugin, fabricPrivacy, dateUtil, repository) {
-
-    override fun onStart() { // do not attach to rxbus
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/aps/logger/LoggerCallback.kt b/app/src/main/java/info/nightscout/androidaps/plugins/aps/logger/LoggerCallback.kt
index c1b4f076d4..eb21e33535 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/aps/logger/LoggerCallback.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/aps/logger/LoggerCallback.kt
@@ -1,6 +1,6 @@
 package info.nightscout.androidaps.plugins.aps.logger
 
-import info.nightscout.androidaps.db.StaticInjector
+import info.nightscout.androidaps.di.StaticInjector
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import org.mozilla.javascript.ScriptableObject
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/LoopPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/LoopPlugin.kt
index 072a9fb1d5..5ee8e69839 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/LoopPlugin.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/LoopPlugin.kt
@@ -12,22 +12,24 @@ import androidx.core.app.NotificationCompat
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.*
 import info.nightscout.androidaps.activities.ErrorHelperActivity
+import info.nightscout.androidaps.annotations.OpenForTesting
 import info.nightscout.androidaps.data.DetailedBolusInfo
 import info.nightscout.androidaps.interfaces.Profile
 import info.nightscout.androidaps.data.PumpEnactResult
 import info.nightscout.androidaps.database.AppRepository
-import info.nightscout.androidaps.database.entities.TherapyEvent
+import info.nightscout.androidaps.database.ValueWrapper
+import info.nightscout.androidaps.database.entities.OfflineEvent
 import info.nightscout.androidaps.database.entities.UserEntry.Action
 import info.nightscout.androidaps.database.entities.UserEntry.Sources
 import info.nightscout.androidaps.database.entities.ValueWithUnit
-import info.nightscout.androidaps.database.transactions.InsertIfNewByTimestampTherapyEventTransaction
+import info.nightscout.androidaps.database.transactions.InsertAndCancelCurrentOfflineEventTransaction
 import info.nightscout.androidaps.database.transactions.InsertTherapyEventAnnouncementTransaction
 import info.nightscout.androidaps.events.EventAcceptOpenLoopChange
 import info.nightscout.androidaps.events.EventAutosensCalculationFinished
 import info.nightscout.androidaps.events.EventNewBG
 import info.nightscout.androidaps.events.EventTempTargetChange
 import info.nightscout.androidaps.interfaces.*
-import info.nightscout.androidaps.interfaces.LoopInterface.LastRun
+import info.nightscout.androidaps.interfaces.Loop.LastRun
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.logging.UserEntryLogger
@@ -44,7 +46,6 @@ import info.nightscout.androidaps.plugins.general.wear.events.EventWearConfirmAc
 import info.nightscout.androidaps.plugins.general.wear.events.EventWearInitiateAction
 import info.nightscout.androidaps.plugins.pump.virtual.VirtualPumpPlugin
 import info.nightscout.androidaps.queue.Callback
-import info.nightscout.androidaps.queue.commands.Command
 import info.nightscout.androidaps.receivers.ReceiverStatusStore
 import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.utils.FabricPrivacy
@@ -64,8 +65,9 @@ import javax.inject.Inject
 import javax.inject.Singleton
 import kotlin.math.abs
 
+@OpenForTesting
 @Singleton
-open class LoopPlugin @Inject constructor(
+class LoopPlugin @Inject constructor(
     injector: HasAndroidInjector,
     aapsLogger: AAPSLogger,
     private val aapsSchedulers: AapsSchedulers,
@@ -96,7 +98,7 @@ open class LoopPlugin @Inject constructor(
     .enableByDefault(config.APS)
     .description(R.string.description_loop),
     aapsLogger, resourceHelper, injector
-), LoopInterface {
+), Loop {
 
     private val disposable = CompositeDisposable()
     private var lastBgTriggeredRun: Long = 0
@@ -158,48 +160,21 @@ open class LoopPlugin @Inject constructor(
         }
     }
 
-    override fun suspendTo(endTime: Long) {
-        sp.putLong("loopSuspendedTill", endTime)
-        sp.putBoolean("isSuperBolus", false)
-        sp.putBoolean("isDisconnected", false)
+    override fun minutesToEndOfSuspend(): Int {
+        val offlineEventWrapped = repository.getOfflineEventActiveAt(dateUtil.now()).blockingGet()
+        return if (offlineEventWrapped is ValueWrapper.Existing) T.msecs(offlineEventWrapped.value.timestamp + offlineEventWrapped.value.duration - dateUtil.now()).mins().toInt()
+        else 0
     }
 
-    fun superBolusTo(endTime: Long) {
-        sp.putLong("loopSuspendedTill", endTime)
-        sp.putBoolean("isSuperBolus", true)
-        sp.putBoolean("isDisconnected", false)
-    }
-
-    private fun disconnectTo(endTime: Long) {
-        sp.putLong("loopSuspendedTill", endTime)
-        sp.putBoolean("isSuperBolus", false)
-        sp.putBoolean("isDisconnected", true)
-    }
-
-    fun minutesToEndOfSuspend(): Int {
-        val loopSuspendedTill = sp.getLong("loopSuspendedTill", 0L)
-        if (loopSuspendedTill == 0L) return 0
-        val now = System.currentTimeMillis()
-        val millisDiff = loopSuspendedTill - now
-        if (loopSuspendedTill <= now) { // time exceeded
-            suspendTo(0L)
-            return 0
-        }
-        return (millisDiff / 60.0 / 1000.0).toInt()
-    }
-
-    // time exceeded
     override val isSuspended: Boolean
-        get() {
-            val loopSuspendedTill = sp.getLong("loopSuspendedTill", 0L)
-            if (loopSuspendedTill == 0L) return false
-            val now = System.currentTimeMillis()
-            if (loopSuspendedTill <= now) { // time exceeded
-                suspendTo(0L)
-                return false
-            }
-            return true
+        get() = repository.getOfflineEventActiveAt(dateUtil.now()).blockingGet() is ValueWrapper.Existing
+
+    override var enabled: Boolean
+        get() = isEnabled()
+        set(value) {
+            setPluginEnabled(PluginType.LOOP, value)
         }
+
     val isLGS: Boolean
         get() {
             val closedLoopEnabled = constraintChecker.isClosedLoopAllowed()
@@ -211,30 +186,16 @@ open class LoopPlugin @Inject constructor(
             return isLGS
         }
 
-    // time exceeded
     val isSuperBolus: Boolean
         get() {
-            val loopSuspendedTill = sp.getLong("loopSuspendedTill", 0L)
-            if (loopSuspendedTill == 0L) return false
-            val now = System.currentTimeMillis()
-            if (loopSuspendedTill <= now) { // time exceeded
-                suspendTo(0L)
-                return false
-            }
-            return sp.getBoolean("isSuperBolus", false)
+            val offlineEventWrapped = repository.getOfflineEventActiveAt(dateUtil.now()).blockingGet()
+            return offlineEventWrapped is ValueWrapper.Existing && offlineEventWrapped.value.reason == OfflineEvent.Reason.SUPER_BOLUS
         }
 
-    // time exceeded
     val isDisconnected: Boolean
         get() {
-            val loopSuspendedTill = sp.getLong("loopSuspendedTill", 0L)
-            if (loopSuspendedTill == 0L) return false
-            val now = System.currentTimeMillis()
-            if (loopSuspendedTill <= now) { // time exceeded
-                suspendTo(0L)
-                return false
-            }
-            return sp.getBoolean("isDisconnected", false)
+            val offlineEventWrapped = repository.getOfflineEventActiveAt(dateUtil.now()).blockingGet()
+            return offlineEventWrapped is ValueWrapper.Existing && offlineEventWrapped.value.reason == OfflineEvent.Reason.DISCONNECT_PUMP
         }
 
     @Suppress("SameParameterValue")
@@ -251,6 +212,17 @@ open class LoopPlugin @Inject constructor(
         invoke(initiator, allowNotification, false)
     }
 
+    @Synchronized
+    fun isEmptyQueue(): Boolean {
+        val maxMinutes = 2L
+        val start = dateUtil.now()
+        while (start + T.mins(maxMinutes).msecs() > dateUtil.now()) {
+            if (commandQueue.size() == 0 && commandQueue.performing() == null) return true
+            SystemClock.sleep(100)
+        }
+        return false
+    }
+
     @Synchronized
     operator fun invoke(initiator: String, allowNotification: Boolean, tempBasalFallback: Boolean) {
         try {
@@ -289,6 +261,12 @@ open class LoopPlugin @Inject constructor(
                 return
             } else rxBus.send(EventLoopInvoked())
 
+            if (!isEmptyQueue()) {
+                aapsLogger.debug(LTag.APS, resourceHelper.gs(R.string.pumpbusy))
+                rxBus.send(EventLoopSetLastRunGui(resourceHelper.gs(R.string.pumpbusy)))
+                return
+            }
+
             // Prepare for pumps using % basals
             if (pump.pumpDescription.tempBasalStyle == PumpDescription.PERCENT && allowPercentage()) {
                 apsResult.usePercent = true
@@ -353,15 +331,15 @@ open class LoopPlugin @Inject constructor(
                             if (sp.getBoolean(R.string.key_enable_carbs_required_alert_local, true) && sp.getBoolean(R.string.key_raise_notifications_as_android_notifications, true)) {
                                 val intentAction5m = Intent(context, CarbSuggestionReceiver::class.java)
                                 intentAction5m.putExtra("ignoreDuration", 5)
-                                val pendingIntent5m = PendingIntent.getBroadcast(context, 1, intentAction5m, PendingIntent.FLAG_UPDATE_CURRENT)
+                                val pendingIntent5m = PendingIntent.getBroadcast(context, 1, intentAction5m, PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_UPDATE_CURRENT)
                                 val actionIgnore5m = NotificationCompat.Action(R.drawable.ic_notif_aaps, resourceHelper.gs(R.string.ignore5m, "Ignore 5m"), pendingIntent5m)
                                 val intentAction15m = Intent(context, CarbSuggestionReceiver::class.java)
                                 intentAction15m.putExtra("ignoreDuration", 15)
-                                val pendingIntent15m = PendingIntent.getBroadcast(context, 1, intentAction15m, PendingIntent.FLAG_UPDATE_CURRENT)
+                                val pendingIntent15m = PendingIntent.getBroadcast(context, 1, intentAction15m, PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_UPDATE_CURRENT)
                                 val actionIgnore15m = NotificationCompat.Action(R.drawable.ic_notif_aaps, resourceHelper.gs(R.string.ignore15m, "Ignore 15m"), pendingIntent15m)
                                 val intentAction30m = Intent(context, CarbSuggestionReceiver::class.java)
                                 intentAction30m.putExtra("ignoreDuration", 30)
-                                val pendingIntent30m = PendingIntent.getBroadcast(context, 1, intentAction30m, PendingIntent.FLAG_UPDATE_CURRENT)
+                                val pendingIntent30m = PendingIntent.getBroadcast(context, 1, intentAction30m, PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_UPDATE_CURRENT)
                                 val actionIgnore30m = NotificationCompat.Action(R.drawable.ic_notif_aaps, resourceHelper.gs(R.string.ignore30m, "Ignore 30m"), pendingIntent30m)
                                 val builder = NotificationCompat.Builder(context, CHANNEL_ID)
                                 builder.setSmallIcon(R.drawable.notif_icon)
@@ -399,8 +377,7 @@ open class LoopPlugin @Inject constructor(
                         }
                     }
                     if (resultAfterConstraints.isChangeRequested
-                        && !commandQueue.bolusInQueue()
-                        && !commandQueue.isRunning(Command.CommandType.BOLUS)) {
+                        && !commandQueue.bolusInQueue()) {
                         val waiting = PumpEnactResult(injector)
                         waiting.queued = true
                         if (resultAfterConstraints.tempBasalRequested) lastRun.tbrSetByPump = waiting
@@ -483,7 +460,7 @@ open class LoopPlugin @Inject constructor(
         stackBuilder.addParentStack(MainActivity::class.java)
         // Adds the Intent that starts the Activity to the top of the stack
         stackBuilder.addNextIntent(resultIntent)
-        val resultPendingIntent = stackBuilder.getPendingIntent(0, PendingIntent.FLAG_UPDATE_CURRENT)
+        val resultPendingIntent = stackBuilder.getPendingIntent(0, PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_UPDATE_CURRENT)
         builder.setContentIntent(resultPendingIntent)
         builder.setVibrate(longArrayOf(1000, 1000, 1000, 1000, 1000))
         val mNotificationManager = context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
@@ -642,22 +619,28 @@ open class LoopPlugin @Inject constructor(
         return virtualPumpPlugin.isEnabled(PluginType.PUMP)
     }
 
-    fun disconnectPump(durationInMinutes: Int, profile: Profile?) {
+    override fun goToZeroTemp(durationInMinutes: Int, profile: Profile, reason: OfflineEvent.Reason) {
         val pump = activePlugin.activePump
-        disconnectTo(System.currentTimeMillis() + durationInMinutes * 60 * 1000L)
+        disposable += repository.runTransactionForResult(InsertAndCancelCurrentOfflineEventTransaction(dateUtil.now(), T.mins(durationInMinutes.toLong()).msecs(), reason))
+            .subscribe({ result ->
+                result.updated.forEach { aapsLogger.debug(LTag.DATABASE, "Updated OfflineEvent $it") }
+                result.inserted.forEach { aapsLogger.debug(LTag.DATABASE, "Inserted OfflineEvent $it") }
+            }, {
+                aapsLogger.error(LTag.DATABASE, "Error while saving OfflineEvent", it)
+            })
         if (pump.pumpDescription.tempBasalStyle == PumpDescription.ABSOLUTE) {
-            commandQueue.tempBasalAbsolute(0.0, durationInMinutes, true, profile!!, PumpSync.TemporaryBasalType.EMULATED_PUMP_SUSPEND, object : Callback() {
+            commandQueue.tempBasalAbsolute(0.0, durationInMinutes, true, profile, PumpSync.TemporaryBasalType.EMULATED_PUMP_SUSPEND, object : Callback() {
                 override fun run() {
                     if (!result.success) {
-                        ErrorHelperActivity.runAlarm(context, result.comment, resourceHelper.gs(R.string.tempbasaldeliveryerror), info.nightscout.androidaps.dana.R.raw.boluserror)
+                        ErrorHelperActivity.runAlarm(context, result.comment, resourceHelper.gs(R.string.tempbasaldeliveryerror), R.raw.boluserror)
                     }
                 }
             })
         } else {
-            commandQueue.tempBasalPercent(0, durationInMinutes, true, profile!!, PumpSync.TemporaryBasalType.EMULATED_PUMP_SUSPEND, object : Callback() {
+            commandQueue.tempBasalPercent(0, durationInMinutes, true, profile, PumpSync.TemporaryBasalType.EMULATED_PUMP_SUSPEND, object : Callback() {
                 override fun run() {
                     if (!result.success) {
-                        ErrorHelperActivity.runAlarm(context, result.comment, resourceHelper.gs(R.string.tempbasaldeliveryerror), info.nightscout.androidaps.dana.R.raw.boluserror)
+                        ErrorHelperActivity.runAlarm(context, result.comment, resourceHelper.gs(R.string.tempbasaldeliveryerror), R.raw.boluserror)
                     }
                 }
             })
@@ -666,37 +649,28 @@ open class LoopPlugin @Inject constructor(
             commandQueue.cancelExtended(object : Callback() {
                 override fun run() {
                     if (!result.success) {
-                        ErrorHelperActivity.runAlarm(context, result.comment, resourceHelper.gs(R.string.extendedbolusdeliveryerror), info.nightscout.androidaps.dana.R.raw.boluserror)
+                        ErrorHelperActivity.runAlarm(context, result.comment, resourceHelper.gs(R.string.extendedbolusdeliveryerror), R.raw.boluserror)
                     }
                 }
             })
         }
-        createOfflineEvent(durationInMinutes)
     }
 
     override fun suspendLoop(durationInMinutes: Int) {
-        suspendTo(System.currentTimeMillis() + durationInMinutes * 60 * 1000)
+        disposable += repository.runTransactionForResult(InsertAndCancelCurrentOfflineEventTransaction(dateUtil.now(), T.mins(durationInMinutes.toLong()).msecs(), OfflineEvent.Reason.SUSPEND))
+            .subscribe({ result ->
+                result.updated.forEach { aapsLogger.debug(LTag.DATABASE, "Updated OfflineEvent $it") }
+                result.inserted.forEach { aapsLogger.debug(LTag.DATABASE, "Inserted OfflineEvent $it") }
+            }, {
+                aapsLogger.error(LTag.DATABASE, "Error while saving OfflineEvent", it)
+            })
         commandQueue.cancelTempBasal(true, object : Callback() {
             override fun run() {
                 if (!result.success) {
-                    ErrorHelperActivity.runAlarm(context, result.comment, resourceHelper.gs(R.string.tempbasaldeliveryerror), info.nightscout.androidaps.dana.R.raw.boluserror)
+                    ErrorHelperActivity.runAlarm(context, result.comment, resourceHelper.gs(R.string.tempbasaldeliveryerror), R.raw.boluserror)
                 }
             }
         })
-        createOfflineEvent(durationInMinutes)
-    }
-
-    override fun createOfflineEvent(durationInMinutes: Int) {
-        disposable += repository.runTransactionForResult(InsertIfNewByTimestampTherapyEventTransaction(
-            timestamp = dateUtil.now(),
-            type = TherapyEvent.Type.APS_OFFLINE,
-            duration = T.mins(durationInMinutes.toLong()).msecs(),
-            enteredBy = "openaps://" + "AndroidAPS",
-            glucoseUnit = TherapyEvent.GlucoseUnit.MGDL
-        )).subscribe(
-            { result -> result.inserted.forEach { aapsLogger.debug(LTag.DATABASE, "Inserted therapy event $it") } },
-            { aapsLogger.error(LTag.DATABASE, "Error while saving therapy event", it) }
-        )
     }
 
     companion object {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSAMA/DetermineBasalAdapterAMAJS.kt b/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSAMA/DetermineBasalAdapterAMAJS.kt
index adb15e8b29..5eb53e3e46 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSAMA/DetermineBasalAdapterAMAJS.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSAMA/DetermineBasalAdapterAMAJS.kt
@@ -17,7 +17,6 @@ import info.nightscout.androidaps.plugins.aps.logger.LoggerCallback
 import info.nightscout.androidaps.plugins.aps.loop.ScriptReader
 import info.nightscout.androidaps.plugins.aps.openAPSSMB.SMBDefaults
 import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
-import info.nightscout.androidaps.plugins.general.openhumans.OpenHumansUploader
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatus
 import info.nightscout.androidaps.utils.sharedPreferences.SP
 import org.json.JSONArray
@@ -40,7 +39,6 @@ class DetermineBasalAdapterAMAJS internal constructor(scriptReader: ScriptReader
     @Inject lateinit var sp: SP
     @Inject lateinit var profileFunction: ProfileFunction
     @Inject lateinit var iobCobCalculator: IobCobCalculator
-    @Inject lateinit var openHumansUploader: OpenHumansUploader
 
     private val mScriptReader: ScriptReader
     private var profile = JSONObject()
@@ -116,7 +114,6 @@ class DetermineBasalAdapterAMAJS internal constructor(scriptReader: ScriptReader
                 aapsLogger.debug(LTag.APS, "Result: $result")
                 try {
                     val resultJson = JSONObject(result)
-                    openHumansUploader.enqueueAMAData(profile, glucoseStatus, iobData, mealData, currentTemp, autosensData, resultJson)
                     determineBasalResultAMA = DetermineBasalResultAMA(injector, jsResult, resultJson)
                 } catch (e: JSONException) {
                     aapsLogger.error(LTag.APS, "Unhandled exception", e)
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSAMA/OpenAPSAMAFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSAMA/OpenAPSAMAFragment.kt
index 1c4de77907..acbbf1191b 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSAMA/OpenAPSAMAFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSAMA/OpenAPSAMAFragment.kt
@@ -58,7 +58,6 @@ class OpenAPSAMAFragment : DaggerFragment() {
     }
 
     @Synchronized
-    @kotlin.ExperimentalStdlibApi
     override fun onResume() {
         super.onResume()
 
@@ -91,7 +90,6 @@ class OpenAPSAMAFragment : DaggerFragment() {
     }
 
     @Synchronized
-    @kotlin.ExperimentalStdlibApi
     private fun updateGUI() {
         if (_binding == null) return
         openAPSAMAPlugin.lastAPSResult?.let { lastAPSResult ->
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSAMA/OpenAPSAMAPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSAMA/OpenAPSAMAPlugin.kt
index 2c34f41a06..479acd4da0 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSAMA/OpenAPSAMAPlugin.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSAMA/OpenAPSAMAPlugin.kt
@@ -3,6 +3,7 @@ package info.nightscout.androidaps.plugins.aps.openAPSAMA
 import android.content.Context
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.R
+import info.nightscout.androidaps.annotations.OpenForTesting
 import info.nightscout.androidaps.interfaces.Profile
 import info.nightscout.androidaps.database.AppRepository
 import info.nightscout.androidaps.database.ValueWrapper
@@ -27,8 +28,9 @@ import org.json.JSONException
 import javax.inject.Inject
 import javax.inject.Singleton
 
+@OpenForTesting
 @Singleton
-open class OpenAPSAMAPlugin @Inject constructor(
+class OpenAPSAMAPlugin @Inject constructor(
     injector: HasAndroidInjector,
     aapsLogger: AAPSLogger,
     private val rxBus: RxBusWrapper,
@@ -123,11 +125,11 @@ open class OpenAPSAMAPlugin @Inject constructor(
             maxBg = hardLimits.verifyHardLimits(tempTarget.value.highTarget, R.string.temp_target_high_target, HardLimits.VERY_HARD_LIMIT_TEMP_MAX_BG[0].toDouble(), HardLimits.VERY_HARD_LIMIT_TEMP_MAX_BG[1].toDouble())
             targetBg = hardLimits.verifyHardLimits(tempTarget.value.target(), R.string.temp_target_value, HardLimits.VERY_HARD_LIMIT_TEMP_TARGET_BG[0].toDouble(), HardLimits.VERY_HARD_LIMIT_TEMP_TARGET_BG[1].toDouble())
         }
-        if (!hardLimits.checkOnlyHardLimits(profile.dia, R.string.profile_dia, hardLimits.minDia(), hardLimits.maxDia())) return
-        if (!hardLimits.checkOnlyHardLimits(profile.getIcTimeFromMidnight(Profile.secondsFromMidnight()), R.string.profile_carbs_ratio_value, hardLimits.minIC(), hardLimits.maxIC())) return
-        if (!hardLimits.checkOnlyHardLimits(profile.getIsfMgdl(), R.string.profile_sensitivity_value, HardLimits.MIN_ISF, HardLimits.MAX_ISF)) return
-        if (!hardLimits.checkOnlyHardLimits(profile.getMaxDailyBasal(), R.string.profile_max_daily_basal_value, 0.02, hardLimits.maxBasal())) return
-        if (!hardLimits.checkOnlyHardLimits(pump.baseBasalRate, R.string.current_basal_value, 0.01, hardLimits.maxBasal())) return
+        if (!hardLimits.checkHardLimits(profile.dia, R.string.profile_dia, hardLimits.minDia(), hardLimits.maxDia())) return
+        if (!hardLimits.checkHardLimits(profile.getIcTimeFromMidnight(Profile.secondsFromMidnight()), R.string.profile_carbs_ratio_value, hardLimits.minIC(), hardLimits.maxIC())) return
+        if (!hardLimits.checkHardLimits(profile.getIsfMgdl(), R.string.profile_sensitivity_value, HardLimits.MIN_ISF, HardLimits.MAX_ISF)) return
+        if (!hardLimits.checkHardLimits(profile.getMaxDailyBasal(), R.string.profile_max_daily_basal_value, 0.02, hardLimits.maxBasal())) return
+        if (!hardLimits.checkHardLimits(pump.baseBasalRate, R.string.current_basal_value, 0.01, hardLimits.maxBasal())) return
         startPart = System.currentTimeMillis()
         if (constraintChecker.isAutosensModeEnabled().value()) {
             val autosensData = iobCobCalculator.getLastAutosensDataWithWaitForCalculationFinish("OpenAPSPlugin")
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSSMB/DetermineBasalAdapterSMBJS.kt b/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSSMB/DetermineBasalAdapterSMBJS.kt
index b32682c102..bdb1039bd2 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSSMB/DetermineBasalAdapterSMBJS.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSSMB/DetermineBasalAdapterSMBJS.kt
@@ -17,7 +17,6 @@ import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.aps.logger.LoggerCallback
 import info.nightscout.androidaps.plugins.aps.loop.ScriptReader
 import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
-import info.nightscout.androidaps.plugins.general.openhumans.OpenHumansUploader
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatus
 import info.nightscout.androidaps.utils.SafeParse
 import info.nightscout.androidaps.utils.resources.ResourceHelper
@@ -41,7 +40,6 @@ class DetermineBasalAdapterSMBJS internal constructor(private val scriptReader:
     @Inject lateinit var profileFunction: ProfileFunction
     @Inject lateinit var iobCobCalculator: IobCobCalculator
     @Inject lateinit var activePlugin: ActivePlugin
-    @Inject lateinit var openHumansUploader: OpenHumansUploader
 
     private var profile = JSONObject()
     private var mGlucoseStatus = JSONObject()
@@ -129,7 +127,6 @@ class DetermineBasalAdapterSMBJS internal constructor(private val scriptReader:
                 aapsLogger.debug(LTag.APS, "Result: $result")
                 try {
                     val resultJson = JSONObject(result)
-                    openHumansUploader.enqueueSMBData(profile, mGlucoseStatus, iobData, mealData, currentTemp, autosensData, microBolusAllowed, smbAlwaysAllowed, resultJson)
                     determineBasalResultSMB = DetermineBasalResultSMB(injector, resultJson)
                 } catch (e: JSONException) {
                     aapsLogger.error(LTag.APS, "Unhandled exception", e)
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSSMB/OpenAPSSMBFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSSMB/OpenAPSSMBFragment.kt
index f5e03f602f..61e52b0821 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSSMB/OpenAPSSMBFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSSMB/OpenAPSSMBFragment.kt
@@ -59,7 +59,6 @@ class OpenAPSSMBFragment : DaggerFragment() {
     }
 
     @Synchronized
-    @kotlin.ExperimentalStdlibApi
     override fun onResume() {
         super.onResume()
         disposable += rxBus
@@ -91,7 +90,6 @@ class OpenAPSSMBFragment : DaggerFragment() {
     }
 
     @Synchronized
-    @kotlin.ExperimentalStdlibApi
     fun updateGUI() {
         if (_binding == null) return
         openAPSSMBPlugin.lastAPSResult?.let { lastAPSResult ->
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSSMB/OpenAPSSMBPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSSMB/OpenAPSSMBPlugin.kt
index fb5d265335..e658f2d04c 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSSMB/OpenAPSSMBPlugin.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSSMB/OpenAPSSMBPlugin.kt
@@ -5,6 +5,7 @@ import androidx.preference.PreferenceFragmentCompat
 import androidx.preference.SwitchPreference
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.R
+import info.nightscout.androidaps.annotations.OpenForTesting
 import info.nightscout.androidaps.database.AppRepository
 import info.nightscout.androidaps.database.ValueWrapper
 import info.nightscout.androidaps.extensions.target
@@ -27,8 +28,9 @@ import info.nightscout.androidaps.utils.sharedPreferences.SP
 import javax.inject.Inject
 import javax.inject.Singleton
 
+@OpenForTesting
 @Singleton
-open class OpenAPSSMBPlugin @Inject constructor(
+class OpenAPSSMBPlugin @Inject constructor(
     injector: HasAndroidInjector,
     aapsLogger: AAPSLogger,
     private val rxBus: RxBusWrapper,
@@ -128,11 +130,11 @@ open class OpenAPSSMBPlugin @Inject constructor(
             maxBg = hardLimits.verifyHardLimits(tempTarget.value.highTarget, R.string.temp_target_high_target, HardLimits.VERY_HARD_LIMIT_TEMP_MAX_BG[0].toDouble(), HardLimits.VERY_HARD_LIMIT_TEMP_MAX_BG[1].toDouble())
             targetBg = hardLimits.verifyHardLimits(tempTarget.value.target(), R.string.temp_target_value, HardLimits.VERY_HARD_LIMIT_TEMP_TARGET_BG[0].toDouble(), HardLimits.VERY_HARD_LIMIT_TEMP_TARGET_BG[1].toDouble())
         }
-        if (!hardLimits.checkOnlyHardLimits(profile.dia, R.string.profile_dia, hardLimits.minDia(), hardLimits.maxDia())) return
-        if (!hardLimits.checkOnlyHardLimits(profile.getIcTimeFromMidnight(Profile.secondsFromMidnight()), R.string.profile_carbs_ratio_value, hardLimits.minIC(), hardLimits.maxIC())) return
-        if (!hardLimits.checkOnlyHardLimits(profile.getIsfMgdl(), R.string.profile_sensitivity_value, HardLimits.MIN_ISF, HardLimits.MAX_ISF)) return
-        if (!hardLimits.checkOnlyHardLimits(profile.getMaxDailyBasal(), R.string.profile_max_daily_basal_value, 0.02, hardLimits.maxBasal())) return
-        if (!hardLimits.checkOnlyHardLimits(pump.baseBasalRate, R.string.current_basal_value, 0.01, hardLimits.maxBasal())) return
+        if (!hardLimits.checkHardLimits(profile.dia, R.string.profile_dia, hardLimits.minDia(), hardLimits.maxDia())) return
+        if (!hardLimits.checkHardLimits(profile.getIcTimeFromMidnight(Profile.secondsFromMidnight()), R.string.profile_carbs_ratio_value, hardLimits.minIC(), hardLimits.maxIC())) return
+        if (!hardLimits.checkHardLimits(profile.getIsfMgdl(), R.string.profile_sensitivity_value, HardLimits.MIN_ISF, HardLimits.MAX_ISF)) return
+        if (!hardLimits.checkHardLimits(profile.getMaxDailyBasal(), R.string.profile_max_daily_basal_value, 0.02, hardLimits.maxBasal())) return
+        if (!hardLimits.checkHardLimits(pump.baseBasalRate, R.string.current_basal_value, 0.01, hardLimits.maxBasal())) return
         startPart = System.currentTimeMillis()
         if (constraintChecker.isAutosensModeEnabled().value()) {
             val autosensData = iobCobCalculator.getLastAutosensDataWithWaitForCalculationFinish("OpenAPSPlugin")
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/configBuilder/ConfigBuilderFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/configBuilder/ConfigBuilderFragment.kt
index 36c00a74e6..862a8c918a 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/configBuilder/ConfigBuilderFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/configBuilder/ConfigBuilderFragment.kt
@@ -114,7 +114,6 @@ class ConfigBuilderFragment : DaggerFragment() {
             createViewsForPlugins(R.string.configbuilder_loop, R.string.configbuilder_loop_description, PluginType.LOOP, activePlugin.getSpecificPluginsVisibleInList(PluginType.LOOP))
             createViewsForPlugins(R.string.constraints, R.string.configbuilder_constraints_description, PluginType.CONSTRAINTS, activePlugin.getSpecificPluginsVisibleInList(PluginType.CONSTRAINTS))
         }
-        createViewsForPlugins(R.string.configbuilder_treatments, R.string.configbuilder_treatments_description, PluginType.TREATMENT, activePlugin.getSpecificPluginsVisibleInList(PluginType.TREATMENT))
         createViewsForPlugins(R.string.configbuilder_general, R.string.configbuilder_general_description, PluginType.GENERAL, activePlugin.getSpecificPluginsVisibleInList(PluginType.GENERAL))
     }
 
@@ -139,22 +138,16 @@ class ConfigBuilderFragment : DaggerFragment() {
 
         @Suppress("InflateParams")
         val baseView: LinearLayout = fragment.layoutInflater.inflate(R.layout.configbuilder_single_plugin, null) as LinearLayout
-        private val enabledExclusive: RadioButton
-        private val enabledInclusive: CheckBox
-        private val pluginIcon: ImageView
-        private val pluginName: TextView
-        private val pluginDescription: TextView
-        private val pluginPreferences: ImageButton
-        private val pluginVisibility: CheckBox
+        private val enabledExclusive: RadioButton = baseView.findViewById(R.id.plugin_enabled_exclusive)
+        private val enabledInclusive: CheckBox = baseView.findViewById(R.id.plugin_enabled_inclusive)
+        private val pluginIcon: ImageView = baseView.findViewById(R.id.plugin_icon)
+        private val pluginIcon2: ImageView = baseView.findViewById(R.id.plugin_icon2)
+        private val pluginName: TextView = baseView.findViewById(R.id.plugin_name)
+        private val pluginDescription: TextView = baseView.findViewById(R.id.plugin_description)
+        private val pluginPreferences: ImageButton = baseView.findViewById(R.id.plugin_preferences)
+        private val pluginVisibility: CheckBox = baseView.findViewById(R.id.plugin_visibility)
 
         init {
-            enabledExclusive = baseView.findViewById(R.id.plugin_enabled_exclusive)
-            enabledInclusive = baseView.findViewById(R.id.plugin_enabled_inclusive)
-            pluginIcon = baseView.findViewById(R.id.plugin_icon)
-            pluginName = baseView.findViewById(R.id.plugin_name)
-            pluginDescription = baseView.findViewById(R.id.plugin_description)
-            pluginPreferences = baseView.findViewById(R.id.plugin_preferences)
-            pluginVisibility = baseView.findViewById(R.id.plugin_visibility)
 
             pluginVisibility.setOnClickListener {
                 plugin.setFragmentVisible(pluginType, pluginVisibility.isChecked)
@@ -192,6 +185,12 @@ class ConfigBuilderFragment : DaggerFragment() {
             if (plugin.menuIcon != -1) {
                 pluginIcon.visibility = View.VISIBLE
                 pluginIcon.setImageDrawable(context?.let { ContextCompat.getDrawable(it, plugin.menuIcon) })
+                if (plugin.menuIcon2 != -1) {
+                    pluginIcon2.visibility = View.VISIBLE
+                    pluginIcon2.setImageDrawable(context?.let { ContextCompat.getDrawable(it, plugin.menuIcon2) })
+                } else {
+                    pluginIcon2.visibility = View.GONE
+                }
             } else {
                 pluginIcon.visibility = View.GONE
             }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/configBuilder/ConfigBuilderPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/configBuilder/ConfigBuilderPlugin.kt
index 3b0ab58075..dce8c55206 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/configBuilder/ConfigBuilderPlugin.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/configBuilder/ConfigBuilderPlugin.kt
@@ -120,7 +120,6 @@ class ConfigBuilderPlugin @Inject constructor(
         for (p in activePlugin.getPluginsList()) {
             aapsLogger.debug(LTag.CONFIGBUILDER, p.name + ":" +
                 (if (p.isEnabled(PluginType.GENERAL)) " GENERAL" else "") +
-                (if (p.isEnabled(PluginType.TREATMENT)) " TREATMENT" else "") +
                 (if (p.isEnabled(PluginType.SENSITIVITY)) " SENSITIVITY" else "") +
                 (if (p.isEnabled(PluginType.PROFILE)) " PROFILE" else "") +
                 (if (p.isEnabled(PluginType.APS)) " APS" else "") +
@@ -135,7 +134,12 @@ class ConfigBuilderPlugin @Inject constructor(
 
     // Ask when switching to physical pump plugin
     fun switchAllowed(changedPlugin: PluginBase, newState: Boolean, activity: FragmentActivity?, type: PluginType) {
-        if (changedPlugin.getType() == PluginType.PUMP && changedPlugin.name != resourceHelper.gs(R.string.virtualpump)) confirmPumpPluginActivation(changedPlugin, newState, activity, type) else performPluginSwitch(changedPlugin, newState, type)
+        if (changedPlugin.getType() == PluginType.PUMP && changedPlugin.name != resourceHelper.gs(R.string.virtualpump))
+            confirmPumpPluginActivation(changedPlugin, newState, activity, type)
+        else if (changedPlugin.getType() == PluginType.PUMP) {
+            performPluginSwitch(changedPlugin, newState, type)
+            pumpSync.connectNewPump()
+        } else performPluginSwitch(changedPlugin, newState, type)
     }
 
     private fun confirmPumpPluginActivation(changedPlugin: PluginBase, newState: Boolean, activity: FragmentActivity?, type: PluginType) {
@@ -185,7 +189,6 @@ class ConfigBuilderPlugin @Inject constructor(
             PluginType.APS         -> pluginsInCategory = activePlugin.getSpecificPluginsListByInterface(APS::class.java)
             PluginType.PROFILE     -> pluginsInCategory = activePlugin.getSpecificPluginsListByInterface(ProfileSource::class.java)
             PluginType.BGSOURCE    -> pluginsInCategory = activePlugin.getSpecificPluginsListByInterface(BgSource::class.java)
-            PluginType.TREATMENT   -> pluginsInCategory = activePlugin.getSpecificPluginsListByInterface(TreatmentsInterface::class.java)
             PluginType.PUMP        -> pluginsInCategory = activePlugin.getSpecificPluginsListByInterface(Pump::class.java)
 
             else                   -> {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/configBuilder/PluginStore.kt b/app/src/main/java/info/nightscout/androidaps/plugins/configBuilder/PluginStore.kt
index 75946070ed..548625c396 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/configBuilder/PluginStore.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/configBuilder/PluginStore.kt
@@ -1,6 +1,5 @@
 package info.nightscout.androidaps.plugins.configBuilder
 
-import info.nightscout.androidaps.interfaces.Config
 import info.nightscout.androidaps.interfaces.*
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
@@ -21,7 +20,6 @@ class PluginStore @Inject constructor(
     private var activeAPSStore: APS? = null
     private var activeInsulinStore: Insulin? = null
     private var activeSensitivityStore: Sensitivity? = null
-    private var activeTreatmentsStore: TreatmentsInterface? = null
 
     fun loadDefaults() {
         verifySelectionInCategories()
@@ -121,16 +119,6 @@ class PluginStore @Inject constructor(
             aapsLogger.debug(LTag.CONFIGBUILDER, "Defaulting PumpInterface")
         }
         setFragmentVisibilities((activePumpStore as PluginBase).name, pluginsInCategory, PluginType.PUMP)
-
-        // PluginType.TREATMENT
-        pluginsInCategory = getSpecificPluginsList(PluginType.TREATMENT)
-        activeTreatmentsStore = getTheOneEnabledInArray(pluginsInCategory, PluginType.TREATMENT) as TreatmentsInterface?
-        if (activeTreatmentsStore == null) {
-            activeTreatmentsStore = getDefaultPlugin(PluginType.TREATMENT) as TreatmentsInterface
-            (activeTreatmentsStore as PluginBase).setPluginEnabled(PluginType.TREATMENT, true)
-            aapsLogger.debug(LTag.CONFIGBUILDER, "Defaulting PumpInterface")
-        }
-        setFragmentVisibilities((activeTreatmentsStore as PluginBase).name, pluginsInCategory, PluginType.TREATMENT)
     }
 
     private fun setFragmentVisibilities(activePluginName: String, pluginsInCategory: ArrayList<PluginBase>,
@@ -175,13 +163,12 @@ class PluginStore @Inject constructor(
         get() = activeSensitivityStore
             ?: checkNotNull(activeSensitivityStore) { "No sensitivity selected" }
 
-    override val activeTreatments: TreatmentsInterface
-        get() = activeTreatmentsStore
-            ?: checkNotNull(activeTreatmentsStore) { "No treatments selected" }
-
     override val activeOverview: Overview
         get() = getSpecificPluginsListByInterface(Overview::class.java).first() as Overview
 
+    override val activeSafety: Safety
+        get() = getSpecificPluginsListByInterface(Safety::class.java).first() as Safety
+
     override fun getPluginsList(): ArrayList<PluginBase> = ArrayList(plugins)
 
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/configBuilder/ProfileFunctionImplementation.kt b/app/src/main/java/info/nightscout/androidaps/plugins/configBuilder/ProfileFunctionImplementation.kt
index c5049d171d..83b8185da4 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/configBuilder/ProfileFunctionImplementation.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/configBuilder/ProfileFunctionImplementation.kt
@@ -9,14 +9,12 @@ import info.nightscout.androidaps.database.ValueWrapper
 import info.nightscout.androidaps.database.entities.ProfileSwitch
 import info.nightscout.androidaps.database.transactions.InsertOrUpdateProfileSwitch
 import info.nightscout.androidaps.extensions.fromConstant
-import info.nightscout.androidaps.interfaces.ActivePlugin
-import info.nightscout.androidaps.interfaces.GlucoseUnit
-import info.nightscout.androidaps.interfaces.Profile
-import info.nightscout.androidaps.interfaces.ProfileFunction
-import info.nightscout.androidaps.interfaces.ProfileStore
+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.utils.DateUtil
+import info.nightscout.androidaps.utils.HardLimits
 import info.nightscout.androidaps.utils.T
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import info.nightscout.androidaps.utils.sharedPreferences.SP
@@ -30,10 +28,13 @@ import javax.inject.Singleton
 class ProfileFunctionImplementation @Inject constructor(
     private val aapsLogger: AAPSLogger,
     private val sp: SP,
+    private val rxBus: RxBusWrapper,
     private val resourceHelper: ResourceHelper,
     private val activePlugin: ActivePlugin,
     private val repository: AppRepository,
-    private val dateUtil: DateUtil
+    private val dateUtil: DateUtil,
+    private val config: Config,
+    private val hardLimits: HardLimits
 ) : ProfileFunction {
 
     val cache = LongSparseArray<Profile>()
@@ -67,14 +68,15 @@ class ProfileFunctionImplementation @Inject constructor(
     override fun getProfile(): Profile? =
         getProfile(dateUtil.now())
 
+    @Synchronized
     override fun getProfile(time: Long): Profile? {
         val rounded = time - time % 1000
         val cached = cache[rounded]
         if (cached != null) {
-//            aapsLogger.debug("XXXXXXXXXXXXXXX HIT getProfile for $time $rounded")
+//            aapsLogger.debug("HIT getProfile for $time $rounded")
             return cached
         }
-//        aapsLogger.debug("XXXXXXXXXXXXXXX getProfile called for $time")
+//        aapsLogger.debug("getProfile called for $time")
         val ps = repository.getEffectiveProfileSwitchActiveAt(time).blockingGet()
         if (ps is ValueWrapper.Existing) {
             val sealed = ProfileSealed.EPS(ps.value)
@@ -90,10 +92,10 @@ class ProfileFunctionImplementation @Inject constructor(
         if (sp.getString(R.string.key_units, Constants.MGDL) == Constants.MGDL) GlucoseUnit.MGDL
         else GlucoseUnit.MMOL
 
-    override fun createProfileSwitch(profileStore: ProfileStore, profileName: String, durationInMinutes: Int, percentage: Int, timeShiftInHours: Int, timestamp: Long) {
+    override fun buildProfileSwitch(profileStore: ProfileStore, profileName: String, durationInMinutes: Int, percentage: Int, timeShiftInHours: Int, timestamp: Long) : ProfileSwitch {
         val pureProfile = profileStore.getSpecificProfile(profileName)
             ?: throw InvalidParameterSpecException(profileName)
-        val ps = ProfileSwitch(
+        return ProfileSwitch(
             timestamp = timestamp,
             basalBlocks = pureProfile.basalBlocks,
             isfBlocks = pureProfile.isfBlocks,
@@ -104,20 +106,49 @@ class ProfileFunctionImplementation @Inject constructor(
             timeshift = T.hours(timeShiftInHours.toLong()).msecs(),
             percentage = percentage,
             duration = T.mins(durationInMinutes.toLong()).msecs(),
-            insulinConfiguration = activePlugin.activeInsulin.insulinConfiguration)
-        disposable += repository.runTransactionForResult(InsertOrUpdateProfileSwitch(ps))
-            .subscribe({ result ->
-                result.inserted.forEach { aapsLogger.debug(LTag.DATABASE, "Inserted ProfileSwitch $it") }
-                result.updated.forEach { aapsLogger.debug(LTag.DATABASE, "Updated ProfileSwitch $it") }
-            }, {
-                aapsLogger.error(LTag.DATABASE, "Error while saving ProfileSwitch", it)
-            })
+            insulinConfiguration = activePlugin.activeInsulin.insulinConfiguration.also {
+                it.insulinEndTime = (pureProfile.dia * 3600 * 1000).toLong()
+            }
+        )
     }
 
-    override fun createProfileSwitch(durationInMinutes: Int, percentage: Int, timeShiftInHours: Int) {
-        val profileStore = activePlugin.activeProfileSource.profile ?: return
-        val profileName = activePlugin.activeProfileSource.profile?.getDefaultProfileName()
-            ?: return
-        createProfileSwitch(profileStore, profileName, durationInMinutes, percentage, timeShiftInHours, dateUtil.now())
+    override fun createProfileSwitch(profileStore: ProfileStore, profileName: String, durationInMinutes: Int, percentage: Int, timeShiftInHours: Int, timestamp: Long) {
+        val ps = buildProfileSwitch(profileStore, profileName, durationInMinutes, percentage, timeShiftInHours, timestamp)
+        disposable += repository.runTransactionForResult(InsertOrUpdateProfileSwitch(ps))
+            .subscribe({ result ->
+                           result.inserted.forEach { aapsLogger.debug(LTag.DATABASE, "Inserted ProfileSwitch $it") }
+                           result.updated.forEach { aapsLogger.debug(LTag.DATABASE, "Updated ProfileSwitch $it") }
+                       }, {
+                           aapsLogger.error(LTag.DATABASE, "Error while saving ProfileSwitch", it)
+                       })
+    }
+
+    override fun createProfileSwitch(durationInMinutes: Int, percentage: Int, timeShiftInHours: Int): Boolean {
+        val profile = repository.getPermanentProfileSwitch(dateUtil.now())
+            ?: throw InvalidParameterSpecException("No active ProfileSwitch")
+        val profileStore = activePlugin.activeProfileSource.profile ?: return false
+        val ps = buildProfileSwitch(profileStore, profile.profileName, durationInMinutes, percentage, 0, dateUtil.now())
+        val validity = ProfileSealed.PS(ps).isValid(
+            resourceHelper.gs(info.nightscout.androidaps.automation.R.string.careportal_profileswitch),
+            activePlugin.activePump,
+            config,
+            resourceHelper,
+            rxBus,
+            hardLimits
+        )
+        var returnValue = true
+        if (validity.isValid) {
+            repository.runTransactionForResult(InsertOrUpdateProfileSwitch(ps))
+                .doOnError {
+                    aapsLogger.error(LTag.DATABASE, "Error while saving ProfileSwitch", it)
+                    returnValue = false
+                }
+                .blockingGet()
+                .also { result ->
+                    result.inserted.forEach { aapsLogger.debug(LTag.DATABASE, "Inserted ProfileSwitch $it") }
+                    result.updated.forEach { aapsLogger.debug(LTag.DATABASE, "Updated ProfileSwitch $it") }
+                }
+        } else returnValue = false
+        return returnValue
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/ObjectivesPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/ObjectivesPlugin.kt
index 2e1061ff7b..224a89a888 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/ObjectivesPlugin.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/ObjectivesPlugin.kt
@@ -45,6 +45,7 @@ class ObjectivesPlugin @Inject constructor(
     var objectives: MutableList<Objective> = ArrayList()
 
     companion object {
+
         const val FIRST_OBJECTIVE = 0
         @Suppress("unused") const val USAGE_OBJECTIVE = 1
         @Suppress("unused") const val EXAM_OBJECTIVE = 2
@@ -53,40 +54,17 @@ class ObjectivesPlugin @Inject constructor(
         const val MAXIOB_ZERO_CL_OBJECTIVE = 5
         @Suppress("unused") const val MAXIOB_OBJECTIVE = 6
         const val AUTOSENS_OBJECTIVE = 7
-        const val AMA_OBJECTIVE = 8
-        const val SMB_OBJECTIVE = 9
-        const val AUTO_OBJECTIVE = 10
+        const val SMB_OBJECTIVE = 8
+        const val AUTO_OBJECTIVE = 9
     }
 
     public override fun onStart() {
         super.onStart()
-        convertSP()
         setupObjectives()
     }
 
-    override fun specialEnableCondition(): Boolean {
-        return activePlugin.activePump.pumpDescription.isTempBasalCapable
-    }
-
-    // convert 2.3 SP version
-    private fun convertSP() {
-        doConvertSP(0, "config")
-        doConvertSP(1, "openloop")
-        doConvertSP(2, "maxbasal")
-        doConvertSP(3, "maxiobzero")
-        doConvertSP(4, "maxiob")
-        doConvertSP(5, "autosens")
-        doConvertSP(6, "ama")
-        doConvertSP(7, "smb")
-    }
-
-    private fun doConvertSP(number: Int, name: String) {
-        if (!sp.contains("Objectives_" + name + "_started")) {
-            sp.putLong("Objectives_" + name + "_started", sp.getLong("Objectives" + number + "started", 0L))
-            sp.putLong("Objectives_" + name + "_accomplished", sp.getLong("Objectives" + number + "accomplished", 0L))
-        }
-        // TODO: we can remove Objectives1accomplished sometimes later
-    }
+    override fun specialEnableCondition(): Boolean =
+        activePlugin.activePump.pumpDescription.isTempBasalCapable
 
     private fun setupObjectives() {
         objectives.clear()
@@ -98,9 +76,9 @@ class ObjectivesPlugin @Inject constructor(
         objectives.add(Objective5(injector))
         objectives.add(Objective6(injector))
         objectives.add(Objective7(injector))
-        objectives.add(Objective8(injector))
         objectives.add(Objective9(injector))
         objectives.add(Objective10(injector))
+        // edit companion object if you remove/add Objective
     }
 
     fun reset() {
@@ -120,12 +98,11 @@ class ObjectivesPlugin @Inject constructor(
         sp.putBoolean(R.string.key_objectiveusescale, false)
     }
 
-    @kotlin.ExperimentalStdlibApi
     fun completeObjectives(activity: FragmentActivity, request: String) {
         val requestCode = sp.getString(R.string.key_objectives_request_code, "")
         var url = sp.getString(R.string.key_nsclientinternal_url, "").lowercase(Locale.getDefault())
         if (!url.endsWith("/")) url = "$url/"
-        @Suppress("DEPRECATION") val hashNS = Hashing.sha1().hashString(url + BuildConfig.APPLICATION_ID + "/" + requestCode, Charsets.UTF_8).toString()
+        @Suppress("DEPRECATION", "UnstableApiUsage") val hashNS = Hashing.sha1().hashString(url + BuildConfig.APPLICATION_ID + "/" + requestCode, Charsets.UTF_8).toString()
         if (request.equals(hashNS.substring(0, 10), ignoreCase = true)) {
             sp.putLong("Objectives_" + "openloop" + "_started", dateUtil.now())
             sp.putLong("Objectives_" + "openloop" + "_accomplished", dateUtil.now())
@@ -137,8 +114,6 @@ class ObjectivesPlugin @Inject constructor(
             sp.putLong("Objectives_" + "maxiob" + "_accomplished", dateUtil.now())
             sp.putLong("Objectives_" + "autosens" + "_started", dateUtil.now())
             sp.putLong("Objectives_" + "autosens" + "_accomplished", dateUtil.now())
-            sp.putLong("Objectives_" + "ama" + "_started", dateUtil.now())
-            sp.putLong("Objectives_" + "ama" + "_accomplished", dateUtil.now())
             sp.putLong("Objectives_" + "smb" + "_started", dateUtil.now())
             sp.putLong("Objectives_" + "smb" + "_accomplished", dateUtil.now())
             sp.putLong("Objectives_" + "auto" + "_started", dateUtil.now())
@@ -164,49 +139,43 @@ class ObjectivesPlugin @Inject constructor(
      */
     override fun isLoopInvocationAllowed(value: Constraint<Boolean>): Constraint<Boolean> {
         if (!objectives[FIRST_OBJECTIVE].isStarted)
-            value.set(aapsLogger, false, String.format(resourceHelper.gs(R.string.objectivenotstarted), FIRST_OBJECTIVE + 1), this)
+            value.set(aapsLogger, false, resourceHelper.gs(R.string.objectivenotstarted, FIRST_OBJECTIVE + 1), this)
         return value
     }
 
     override fun isLgsAllowed(value: Constraint<Boolean>): Constraint<Boolean> {
         if (!objectives[MAXBASAL_OBJECTIVE].isStarted)
-            value.set(aapsLogger, false, String.format(resourceHelper.gs(R.string.objectivenotstarted), MAXBASAL_OBJECTIVE + 1), this)
+            value.set(aapsLogger, false, resourceHelper.gs(R.string.objectivenotstarted, MAXBASAL_OBJECTIVE + 1), this)
         return value
     }
 
     override fun isClosedLoopAllowed(value: Constraint<Boolean>): Constraint<Boolean> {
         if (!objectives[MAXIOB_ZERO_CL_OBJECTIVE].isStarted)
-            value.set(aapsLogger, false, String.format(resourceHelper.gs(R.string.objectivenotstarted), MAXIOB_ZERO_CL_OBJECTIVE + 1), this)
+            value.set(aapsLogger, false, resourceHelper.gs(R.string.objectivenotstarted, MAXIOB_ZERO_CL_OBJECTIVE + 1), this)
         return value
     }
 
     override fun isAutosensModeEnabled(value: Constraint<Boolean>): Constraint<Boolean> {
         if (!objectives[AUTOSENS_OBJECTIVE].isStarted)
-            value.set(aapsLogger, false, String.format(resourceHelper.gs(R.string.objectivenotstarted), AUTOSENS_OBJECTIVE + 1), this)
-        return value
-    }
-
-    override fun isAMAModeEnabled(value: Constraint<Boolean>): Constraint<Boolean> {
-        if (!objectives[AMA_OBJECTIVE].isStarted)
-            value.set(aapsLogger, false, String.format(resourceHelper.gs(R.string.objectivenotstarted), AMA_OBJECTIVE + 1), this)
+            value.set(aapsLogger, false, resourceHelper.gs(R.string.objectivenotstarted, AUTOSENS_OBJECTIVE + 1), this)
         return value
     }
 
     override fun isSMBModeEnabled(value: Constraint<Boolean>): Constraint<Boolean> {
         if (!objectives[SMB_OBJECTIVE].isStarted)
-            value.set(aapsLogger, false, String.format(resourceHelper.gs(R.string.objectivenotstarted), SMB_OBJECTIVE + 1), this)
+            value.set(aapsLogger, false, resourceHelper.gs(R.string.objectivenotstarted, SMB_OBJECTIVE + 1), this)
         return value
     }
 
     override fun applyMaxIOBConstraints(maxIob: Constraint<Double>): Constraint<Double> {
         if (objectives[MAXIOB_ZERO_CL_OBJECTIVE].isStarted && !objectives[MAXIOB_ZERO_CL_OBJECTIVE].isAccomplished)
-            maxIob.set(aapsLogger, 0.0, String.format(resourceHelper.gs(R.string.objectivenotfinished), MAXIOB_ZERO_CL_OBJECTIVE + 1), this)
+            maxIob.set(aapsLogger, 0.0, resourceHelper.gs(R.string.objectivenotfinished, MAXIOB_ZERO_CL_OBJECTIVE + 1), this)
         return maxIob
     }
 
     override fun isAutomationEnabled(value: Constraint<Boolean>): Constraint<Boolean> {
         if (!objectives[AUTO_OBJECTIVE].isStarted)
-            value.set(aapsLogger, false, String.format(resourceHelper.gs(R.string.objectivenotstarted), AUTO_OBJECTIVE + 1), this)
+            value.set(aapsLogger, false, resourceHelper.gs(R.string.objectivenotstarted, AUTO_OBJECTIVE + 1), this)
         return value
     }
 }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/objectives/Objective3.kt b/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/objectives/Objective3.kt
index 5247e18fac..2ccd96f3b3 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/objectives/Objective3.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/objectives/Objective3.kt
@@ -29,7 +29,6 @@ class Objective3 @Inject constructor(injector: HasAndroidInjector) : Objective(i
     override fun specialActionEnabled(): Boolean =
         nsClientPlugin.nsClientService?.isConnected == true && nsClientPlugin.nsClientService?.hasWriteAuth == true
 
-    @kotlin.ExperimentalStdlibApi
     override fun specialAction(activity: FragmentActivity, input: String) {
         objectivesPlugin.completeObjectives(activity, input)
     }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/objectives/Objective8.kt b/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/objectives/Objective8.kt
deleted file mode 100644
index 27b2f8b4d2..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/objectives/Objective8.kt
+++ /dev/null
@@ -1,12 +0,0 @@
-package info.nightscout.androidaps.plugins.constraints.objectives.objectives
-
-import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.R
-import info.nightscout.androidaps.utils.T
-
-class Objective8(injector: HasAndroidInjector) : Objective(injector, "ama", R.string.objectives_ama_objective, 0) {
-
-    init {
-        tasks.add(MinimumDurationTask(this, T.days(28).msecs()))
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/constraints/safety/SafetyPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/constraints/safety/SafetyPlugin.kt
index cfabe73346..6c8523b482 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/constraints/safety/SafetyPlugin.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/constraints/safety/SafetyPlugin.kt
@@ -3,6 +3,7 @@ package info.nightscout.androidaps.plugins.constraints.safety
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.interfaces.Config
 import info.nightscout.androidaps.R
+import info.nightscout.androidaps.extensions.*
 import info.nightscout.androidaps.interfaces.Profile
 import info.nightscout.androidaps.interfaces.*
 import info.nightscout.androidaps.logging.AAPSLogger
@@ -20,6 +21,7 @@ import info.nightscout.androidaps.utils.Round
 import info.nightscout.androidaps.utils.buildHelper.BuildHelper
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import info.nightscout.androidaps.utils.sharedPreferences.SP
+import org.json.JSONObject
 import javax.inject.Inject
 import javax.inject.Singleton
 import kotlin.math.floor
@@ -49,7 +51,7 @@ class SafetyPlugin @Inject constructor(
     .pluginName(R.string.safety)
     .preferencesId(R.xml.pref_safety),
     aapsLogger, resourceHelper, injector
-), Constraints {
+), Constraints, Safety {
 
     /**
      * Constraints interface
@@ -186,11 +188,23 @@ class SafetyPlugin @Inject constructor(
 
     override fun applyMaxIOBConstraints(maxIob: Constraint<Double>): Constraint<Double> {
         val apsMode = sp.getString(R.string.key_aps_mode, "open")
-        val maxIobPref: Double = if (openAPSSMBPlugin.isEnabled(PluginType.APS)) sp.getDouble(R.string.key_openapssmb_max_iob, 3.0) else sp.getDouble(R.string.key_openapsma_max_iob, 1.5)
+        val maxIobPref: Double = if (openAPSSMBPlugin.isEnabled()) sp.getDouble(R.string.key_openapssmb_max_iob, 3.0) else sp.getDouble(R.string.key_openapsma_max_iob, 1.5)
         maxIob.setIfSmaller(aapsLogger, maxIobPref, String.format(resourceHelper.gs(R.string.limitingiob), maxIobPref, resourceHelper.gs(R.string.maxvalueinpreferences)), this)
-        if (openAPSAMAPlugin.isEnabled(PluginType.APS)) maxIob.setIfSmaller(aapsLogger, hardLimits.maxIobAMA(), String.format(resourceHelper.gs(R.string.limitingiob), hardLimits.maxIobAMA(), resourceHelper.gs(R.string.hardlimit)), this)
-        if (openAPSSMBPlugin.isEnabled(PluginType.APS)) maxIob.setIfSmaller(aapsLogger, hardLimits.maxIobSMB(), String.format(resourceHelper.gs(R.string.limitingiob), hardLimits.maxIobSMB(), resourceHelper.gs(R.string.hardlimit)), this)
+        if (openAPSAMAPlugin.isEnabled()) maxIob.setIfSmaller(aapsLogger, hardLimits.maxIobAMA(), String.format(resourceHelper.gs(R.string.limitingiob), hardLimits.maxIobAMA(), resourceHelper.gs(R.string.hardlimit)), this)
+        if (openAPSSMBPlugin.isEnabled()) maxIob.setIfSmaller(aapsLogger, hardLimits.maxIobSMB(), String.format(resourceHelper.gs(R.string.limitingiob), hardLimits.maxIobSMB(), resourceHelper.gs(R.string.hardlimit)), this)
         if (apsMode == "lgs") maxIob.setIfSmaller(aapsLogger, HardLimits.MAX_IOB_LGS, String.format(resourceHelper.gs(R.string.limitingiob), HardLimits.MAX_IOB_LGS, resourceHelper.gs(R.string.lowglucosesuspend)), this)
         return maxIob
     }
+
+    override fun configuration(): JSONObject =
+        JSONObject()
+            .putString(R.string.key_age, sp, resourceHelper)
+            .putDouble(R.string.key_treatmentssafety_maxbolus, sp, resourceHelper)
+            .putDouble(R.string.key_treatmentssafety_maxcarbs, sp, resourceHelper)
+
+    override fun applyConfiguration(configuration: JSONObject) {
+        configuration.storeString(R.string.key_age, sp, resourceHelper)
+        configuration.storeDouble(R.string.key_treatmentssafety_maxbolus, sp, resourceHelper)
+        configuration.storeDouble(R.string.key_treatmentssafety_maxcarbs, sp, resourceHelper)
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/constraints/signatureVerifier/SignatureVerifierPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/constraints/signatureVerifier/SignatureVerifierPlugin.kt
index 7c41902a08..d4a7a73dca 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/constraints/signatureVerifier/SignatureVerifierPlugin.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/constraints/signatureVerifier/SignatureVerifierPlugin.kt
@@ -152,7 +152,6 @@ class SignatureVerifierPlugin @Inject constructor(
         return sb.toString()
     }
 
-    @kotlin.ExperimentalStdlibApi
     fun singleCharUnMap(shortHash: String): String {
         val array = ByteArray(shortHash.length)
         val sb = StringBuilder()
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 cebf039967..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
@@ -5,6 +5,7 @@ import android.os.StatFs
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.Constants
 import info.nightscout.androidaps.R
+import info.nightscout.androidaps.annotations.OpenForTesting
 import info.nightscout.androidaps.interfaces.Constraint
 import info.nightscout.androidaps.interfaces.Constraints
 import info.nightscout.androidaps.interfaces.PluginBase
@@ -20,8 +21,9 @@ import info.nightscout.androidaps.utils.resources.ResourceHelper
 import javax.inject.Inject
 import javax.inject.Singleton
 
+@OpenForTesting
 @Singleton
-open class StorageConstraintPlugin @Inject constructor(
+class StorageConstraintPlugin @Inject constructor(
     injector: HasAndroidInjector,
     aapsLogger: AAPSLogger,
     resourceHelper: ResourceHelper,
@@ -48,7 +50,7 @@ open 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/actions/ActionsFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/actions/ActionsFragment.kt
index 1e18a5f54f..3688f1a55f 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/actions/ActionsFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/actions/ActionsFragment.kt
@@ -28,7 +28,8 @@ import info.nightscout.androidaps.events.EventTherapyEventChange
 import info.nightscout.androidaps.extensions.toStringMedium
 import info.nightscout.androidaps.extensions.toStringShort
 import info.nightscout.androidaps.extensions.toVisibility
-import info.nightscout.androidaps.historyBrowser.HistoryBrowseActivity
+import info.nightscout.androidaps.activities.HistoryBrowseActivity
+import info.nightscout.androidaps.diaconn.DiaconnG8Plugin
 import info.nightscout.androidaps.interfaces.ActivePlugin
 import info.nightscout.androidaps.interfaces.CommandQueueProvider
 import info.nightscout.androidaps.interfaces.Config
@@ -114,7 +115,10 @@ class ActionsFragment : DaggerFragment() {
                               savedInstanceState: Bundle?): View? {
         //check screen width
         dm = DisplayMetrics()
-        activity?.windowManager?.defaultDisplay?.getMetrics(dm)
+        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.R)
+            activity?.display?.getRealMetrics(dm)
+        else
+            @Suppress("DEPRECATION") activity?.windowManager?.defaultDisplay?.getMetrics(dm)
 
         val screenWidth = dm.widthPixels
         val screenHeight = dm.heightPixels
@@ -152,7 +156,7 @@ class ActionsFragment : DaggerFragment() {
         pbLevelLabel = view.findViewById(R.id.pb_level_label)
 
         profileSwitch?.setOnClickListener {
-            ProfileSwitchDialog().show(childFragmentManager, "Actions")
+            ProfileSwitchDialog().show(childFragmentManager, "ProfileSwitchDialog")
         }
         tempTarget?.setOnClickListener {
             TempTargetDialog().show(childFragmentManager, "Actions")
@@ -304,7 +308,11 @@ class ActionsFragment : DaggerFragment() {
         val activeBgSource = activePlugin.activeBgSource
         historyBrowser?.visibility = (profile != null).toVisibility()
         fill?.visibility = (pump.pumpDescription.isRefillingCapable && pump.isInitialized() && !pump.isSuspended()).toVisibility()
-        pumpBatteryChange?.visibility = (pump.pumpDescription.isBatteryReplaceable || (pump is OmnipodErosPumpPlugin && pump.isUseRileyLinkBatteryLevel && pump.isBatteryChangeLoggingEnabled)).toVisibility()
+        if(pump is DiaconnG8Plugin) {
+            pumpBatteryChange?.visibility = (pump.pumpDescription.isBatteryReplaceable && !pump.isBatteryChangeLoggingEnabled()).toVisibility()
+        } else {
+            pumpBatteryChange?.visibility = (pump.pumpDescription.isBatteryReplaceable || (pump is OmnipodErosPumpPlugin && pump.isUseRileyLinkBatteryLevel && pump.isBatteryChangeLoggingEnabled)).toVisibility()
+        }
         tempTarget?.visibility = (profile != null && config.APS).toVisibility()
         tddStats?.visibility = pump.pumpDescription.supportsTDDs.toVisibility()
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/food/FoodFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/food/FoodFragment.kt
index 364f64e180..97f780e842 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/food/FoodFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/food/FoodFragment.kt
@@ -67,7 +67,6 @@ class FoodFragment : DaggerFragment() {
         return binding.root
     }
 
-    @kotlin.ExperimentalStdlibApi
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
@@ -129,7 +128,6 @@ class FoodFragment : DaggerFragment() {
     }
 
     @Synchronized
-    @kotlin.ExperimentalStdlibApi
     override fun onResume() {
         super.onResume()
         disposable.add(rxBus
@@ -141,7 +139,6 @@ class FoodFragment : DaggerFragment() {
         swapAdapter()
     }
 
-    @kotlin.ExperimentalStdlibApi
     private fun swapAdapter() {
         disposable += repository
             .getFoodData()
@@ -202,7 +199,6 @@ class FoodFragment : DaggerFragment() {
         }
     }
 
-    @kotlin.ExperimentalStdlibApi
     private fun filterData() {
         val textFilter = binding.filter.text.toString()
         val categoryFilter = binding.category.selectedItem?.toString()
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/ImportExportPrefsImpl.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/ImportExportPrefsImpl.kt
index bf83f2c5bc..908d801137 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/ImportExportPrefsImpl.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/ImportExportPrefsImpl.kt
@@ -363,7 +363,7 @@ class ImportExportPrefsImpl @Inject constructor(
     override fun exportUserEntriesCsv(activity: FragmentActivity, singleEntries: Single<List<UserEntry>>) {
         val entries = singleEntries.blockingGet()
         prefFileList.ensureExportDirExists()
-        val newFile = prefFileList.newExportXmlFile()
+        val newFile = prefFileList.newExportCsvFile()
 
         try {
             classicPrefsFormat.saveCsv(newFile, entries)
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/LoggerUtils.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/LoggerUtils.kt
index e6ce7fb821..63bf4a5724 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/LoggerUtils.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/LoggerUtils.kt
@@ -1,6 +1,7 @@
 package info.nightscout.androidaps.plugins.general.maintenance
 
 import ch.qos.logback.classic.LoggerContext
+import info.nightscout.androidaps.annotations.OpenForTesting
 import org.slf4j.LoggerFactory
 import javax.inject.Inject
 import javax.inject.Singleton
@@ -8,6 +9,7 @@ import javax.inject.Singleton
 /**
  * This class provides several methods for log-handling (eg. sending logs as emails).
  */
+@OpenForTesting
 @Singleton
 class LoggerUtils @Inject constructor() {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/MaintenanceFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/MaintenanceFragment.kt
index 36df705147..a78575151c 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/MaintenanceFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/MaintenanceFragment.kt
@@ -16,11 +16,13 @@ import info.nightscout.androidaps.events.EventNewBG
 import info.nightscout.androidaps.insight.database.InsightDatabase
 import info.nightscout.androidaps.interfaces.DataSyncSelector
 import info.nightscout.androidaps.interfaces.ImportExportPrefs
+import info.nightscout.androidaps.interfaces.IobCobCalculator
 import info.nightscout.androidaps.interfaces.PumpSync
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.UserEntryLogger
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.general.maintenance.activities.LogSettingActivity
+import info.nightscout.androidaps.plugins.general.overview.OverviewData
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.events.EventNewHistoryData
 import info.nightscout.androidaps.utils.alertDialogs.OKDialog
 import info.nightscout.androidaps.utils.resources.ResourceHelper
@@ -44,6 +46,8 @@ class MaintenanceFragment : DaggerFragment() {
     @Inject lateinit var uel: UserEntryLogger
     @Inject lateinit var dataSyncSelector: DataSyncSelector
     @Inject lateinit var pumpSync: PumpSync
+    @Inject lateinit var iobCobCalculator: IobCobCalculator
+    @Inject lateinit var overviewData: OverviewData
 
     private val compositeDisposable = CompositeDisposable()
 
@@ -63,7 +67,9 @@ class MaintenanceFragment : DaggerFragment() {
         binding.logSend.setOnClickListener { maintenancePlugin.sendLogs() }
         binding.logDelete.setOnClickListener {
             uel.log(Action.DELETE_LOGS, Sources.Maintenance)
-            maintenancePlugin.deleteLogs()
+            Thread {
+                maintenancePlugin.deleteLogs(5)
+            }.start()
         }
         binding.navResetdb.setOnClickListener {
             activity?.let { activity ->
@@ -75,6 +81,9 @@ class MaintenanceFragment : DaggerFragment() {
                             insightDatabase.clearAllTables()
                             dataSyncSelector.resetToNextFullSync()
                             pumpSync.connectNewPump()
+                            overviewData.reset()
+                            iobCobCalculator.ads.reset()
+                            iobCobCalculator.clearCache()
                         }
                             .subscribeOn(aapsSchedulers.io)
                             .observeOn(aapsSchedulers.main)
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/MaintenancePlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/MaintenancePlugin.kt
index 20bdfa269a..73395d4e96 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/MaintenancePlugin.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/MaintenancePlugin.kt
@@ -8,8 +8,8 @@ import androidx.preference.PreferenceFragmentCompat
 import androidx.preference.SwitchPreference
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.BuildConfig
-import info.nightscout.androidaps.interfaces.Config
 import info.nightscout.androidaps.R
+import info.nightscout.androidaps.interfaces.Config
 import info.nightscout.androidaps.interfaces.PluginBase
 import info.nightscout.androidaps.interfaces.PluginDescription
 import info.nightscout.androidaps.interfaces.PluginType
@@ -35,17 +35,19 @@ class MaintenancePlugin @Inject constructor(
     aapsLogger: AAPSLogger,
     private val buildHelper: BuildHelper,
     private val config: Config,
+    private val fileListProvider: PrefFileListProvider,
     private val loggerUtils: LoggerUtils
-) : PluginBase(PluginDescription()
-    .mainType(PluginType.GENERAL)
-    .fragmentClass(MaintenanceFragment::class.java.name)
-    .alwaysVisible(false)
-    .alwaysEnabled(true)
-    .pluginIcon(R.drawable.ic_maintenance)
-    .pluginName(R.string.maintenance)
-    .shortName(R.string.maintenance_shortname)
-    .preferencesId(R.xml.pref_maintenance)
-    .description(R.string.description_maintenance),
+) : PluginBase(
+    PluginDescription()
+        .mainType(PluginType.GENERAL)
+        .fragmentClass(MaintenanceFragment::class.java.name)
+        .alwaysVisible(false)
+        .alwaysEnabled(true)
+        .pluginIcon(R.drawable.ic_maintenance)
+        .pluginName(R.string.maintenance)
+        .shortName(R.string.maintenance_shortname)
+        .preferencesId(R.xml.pref_maintenance)
+        .description(R.string.description_maintenance),
     aapsLogger, resourceHelper, injector
 ) {
 
@@ -53,11 +55,12 @@ class MaintenancePlugin @Inject constructor(
         val recipient = sp.getString(R.string.key_maintenance_logs_email, "logs@androidaps.org")
         val amount = sp.getInt(R.string.key_maintenance_logs_amount, 2)
         val logs = getLogFiles(amount)
-        val zipDir = context.getExternalFilesDir("exports")
+        val zipDir = fileListProvider.ensureTempDirExists()
         val zipFile = File(zipDir, constructName())
         aapsLogger.debug("zipFile: ${zipFile.absolutePath}")
         val zip = zipLogs(zipFile, logs)
-        val attachmentUri = FileProvider.getUriForFile(context, BuildConfig.APPLICATION_ID + ".fileprovider", zip)
+        val attachmentUri =
+            FileProvider.getUriForFile(context, BuildConfig.APPLICATION_ID + ".fileprovider", zip)
         val emailIntent: Intent = this.sendMail(attachmentUri, recipient, "Log Export")
         aapsLogger.debug("sending emailIntent")
         context.startActivity(emailIntent)
@@ -65,14 +68,15 @@ class MaintenancePlugin @Inject constructor(
 
     //todo replace this with a call on startup of the application, specifically to remove
     // unnecessary garbage from the log exports
-    fun deleteLogs() {
+    fun deleteLogs(keep: Int) {
         val logDir = File(loggerUtils.logDirectory)
         val files = logDir.listFiles { _: File?, name: String ->
             (name.startsWith("AndroidAPS") && name.endsWith(".zip"))
         }
-        Arrays.sort(files) { f1: File, f2: File -> f1.name.compareTo(f2.name) }
+        if (files == null || files.isEmpty()) return
+        Arrays.sort(files) { f1: File, f2: File -> f2.name.compareTo(f1.name) }
         var delFiles = listOf(*files)
-        val amount = sp.getInt(R.string.key_logshipper_amount, 2)
+        val amount = sp.getInt(R.string.key_logshipper_amount, keep)
         val keepIndex = amount - 1
         if (keepIndex < delFiles.size) {
             delFiles = delFiles.subList(keepIndex, delFiles.size)
@@ -80,11 +84,10 @@ class MaintenancePlugin @Inject constructor(
                 file.delete()
             }
         }
-        val exportDir = File(loggerUtils.logDirectory, "exports")
+        val exportDir = fileListProvider.ensureTempDirExists()
         if (exportDir.exists()) {
-            val expFiles = exportDir.listFiles()
-            for (file in expFiles) {
-                file.delete()
+            exportDir.listFiles()?.let { expFiles ->
+                for (file in expFiles) file.delete()
             }
             exportDir.delete()
         }
@@ -106,7 +109,7 @@ class MaintenancePlugin @Inject constructor(
             (name.startsWith("AndroidAPS")
                 && (name.endsWith(".log")
                 || name.endsWith(".zip") && !name.endsWith(loggerUtils.suffix)))
-        }
+        } ?: emptyArray()
         Arrays.sort(files) { f1: File, f2: File -> f2.name.compareTo(f1.name) }
         val result = listOf(*files)
         var toIndex = amount
@@ -192,7 +195,12 @@ class MaintenancePlugin @Inject constructor(
      *
      * @return
      */
-    private fun sendMail(attachmentUri: Uri, recipient: String, subject: String, body: String): Intent {
+    private fun sendMail(
+        attachmentUri: Uri,
+        recipient: String,
+        subject: String,
+        body: String
+    ): Intent {
         aapsLogger.debug("sending email to $recipient with subject $subject")
         val emailIntent = Intent(Intent.ACTION_SEND)
         emailIntent.type = "text/plain"
@@ -207,8 +215,9 @@ class MaintenancePlugin @Inject constructor(
 
     override fun preprocessPreferences(preferenceFragment: PreferenceFragmentCompat) {
         super.preprocessPreferences(preferenceFragment)
-        val encryptSwitch = preferenceFragment.findPreference(resourceHelper.gs(R.string.key_maintenance_encrypt_exported_prefs)) as SwitchPreference?
-            ?: return
+        val encryptSwitch =
+            preferenceFragment.findPreference(resourceHelper.gs(R.string.key_maintenance_encrypt_exported_prefs)) as SwitchPreference?
+                ?: return
         encryptSwitch.isVisible = buildHelper.isEngineeringMode()
         encryptSwitch.isEnabled = buildHelper.isEngineeringMode()
     }
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 5f1e910af8..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,11 +34,13 @@ class DataSyncSelectorImplementation @Inject constructor(
             processChangedTemporaryBasalsCompat()
             processChangedExtendedBolusesCompat()
             processChangedProfileSwitchesCompat()
+            processChangedEffectiveProfileSwitchesCompat()
             processChangedGlucoseValuesCompat()
             processChangedTempTargetsCompat()
             processChangedFoodsCompat()
             processChangedTherapyEventsCompat()
             processChangedDeviceStatusesCompat()
+            processChangedOfflineEventsCompat()
             processChangedProfileStore()
         }
     }
@@ -55,6 +57,8 @@ 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)
     }
 
@@ -76,8 +80,8 @@ class DataSyncSelectorImplementation @Inject constructor(
             }
     }
 
-    private var lastBolusId = -1L
-    private var lastBolusTime = -1L
+    @Volatile private var lastBolusId = -1L
+    @Volatile private var lastBolusTime = -1L
     override fun processChangedBolusesCompat(): Boolean {
         val lastDbIdWrapped = appRepository.getLastBolusIdWrapped().blockingGet()
         val lastDbId = if (lastDbIdWrapped is ValueWrapper.Existing) lastDbIdWrapped.value else 0L
@@ -119,8 +123,8 @@ class DataSyncSelectorImplementation @Inject constructor(
         }
     }
 
-    private var lastCarbsId = -1L
-    private var lastCarbsTime = -1L
+    @Volatile private var lastCarbsId = -1L
+    @Volatile private var lastCarbsTime = -1L
     override fun processChangedCarbsCompat(): Boolean {
         val lastDbIdWrapped = appRepository.getLastCarbsIdWrapped().blockingGet()
         val lastDbId = if (lastDbIdWrapped is ValueWrapper.Existing) lastDbIdWrapped.value else 0L
@@ -162,8 +166,8 @@ class DataSyncSelectorImplementation @Inject constructor(
         }
     }
 
-    private var lastBcrId = -1L
-    private var lastBcrTime = -1L
+    @Volatile private var lastBcrId = -1L
+    @Volatile private var lastBcrTime = -1L
     override fun processChangedBolusCalculatorResultsCompat(): Boolean {
         val lastDbIdWrapped = appRepository.getLastBolusCalculatorResultIdWrapped().blockingGet()
         val lastDbId = if (lastDbIdWrapped is ValueWrapper.Existing) lastDbIdWrapped.value else 0L
@@ -205,8 +209,8 @@ class DataSyncSelectorImplementation @Inject constructor(
         }
     }
 
-    private var lastTtId = -1L
-    private var lastTtTime = -1L
+    @Volatile private var lastTtId = -1L
+    @Volatile private var lastTtTime = -1L
     override fun processChangedTempTargetsCompat(): Boolean {
         val lastDbIdWrapped = appRepository.getLastTempTargetIdWrapped().blockingGet()
         val lastDbId = if (lastDbIdWrapped is ValueWrapper.Existing) lastDbIdWrapped.value else 0L
@@ -248,8 +252,8 @@ class DataSyncSelectorImplementation @Inject constructor(
         }
     }
 
-    private var lastFoodId = -1L
-    private var lastFoodTime = -1L
+    @Volatile private var lastFoodId = -1L
+    @Volatile private var lastFoodTime = -1L
     override fun processChangedFoodsCompat(): Boolean {
         val lastDbIdWrapped = appRepository.getLastFoodIdWrapped().blockingGet()
         val lastDbId = if (lastDbIdWrapped is ValueWrapper.Existing) lastDbIdWrapped.value else 0L
@@ -291,8 +295,8 @@ class DataSyncSelectorImplementation @Inject constructor(
         }
     }
 
-    private var lastGvId = -1L
-    private var lastGvTime = -1L
+    @Volatile private var lastGvId = -1L
+    @Volatile private var lastGvTime = -1L
     override fun processChangedGlucoseValuesCompat(): Boolean {
         val lastDbIdWrapped = appRepository.getLastGlucoseValueIdWrapped().blockingGet()
         val lastDbId = if (lastDbIdWrapped is ValueWrapper.Existing) lastDbIdWrapped.value else 0L
@@ -340,8 +344,8 @@ class DataSyncSelectorImplementation @Inject constructor(
         }
     }
 
-    private var lastTeId = -1L
-    private var lastTeTime = -1L
+    @Volatile private var lastTeId = -1L
+    @Volatile private var lastTeTime = -1L
     override fun processChangedTherapyEventsCompat(): Boolean {
         val lastDbIdWrapped = appRepository.getLastTherapyEventIdWrapped().blockingGet()
         val lastDbId = if (lastDbIdWrapped is ValueWrapper.Existing) lastDbIdWrapped.value else 0L
@@ -358,10 +362,10 @@ class DataSyncSelectorImplementation @Inject constructor(
             when {
                 // without nsId = create new
                 te.first.interfaceIDs.nightscoutId == null ->
-                    nsClientPlugin.nsClientService?.dbAdd("treatments", te.first.toJson(true), DataSyncSelector.PairTherapyEvent(te.first, te.second), "$startId/$lastDbId")
+                    nsClientPlugin.nsClientService?.dbAdd("treatments", te.first.toJson(true, dateUtil), DataSyncSelector.PairTherapyEvent(te.first, te.second), "$startId/$lastDbId")
                 // nsId = update
                 te.first.interfaceIDs.nightscoutId != null ->
-                    nsClientPlugin.nsClientService?.dbUpdate("treatments", te.first.interfaceIDs.nightscoutId, te.first.toJson(false), DataSyncSelector.PairTherapyEvent(te.first, te.second), "$startId/$lastDbId")
+                    nsClientPlugin.nsClientService?.dbUpdate("treatments", te.first.interfaceIDs.nightscoutId, te.first.toJson(false, dateUtil), DataSyncSelector.PairTherapyEvent(te.first, te.second), "$startId/$lastDbId")
             }
             return true
         }
@@ -382,8 +386,8 @@ class DataSyncSelectorImplementation @Inject constructor(
         }
     }
 
-    private var lastDsId = -1L
-    private var lastDsTime = -1L
+    @Volatile private var lastDsId = -1L
+    @Volatile private var lastDsTime = -1L
     override fun processChangedDeviceStatusesCompat(): Boolean {
         val lastDbIdWrapped = appRepository.getLastDeviceStatusIdWrapped().blockingGet()
         val lastDbId = if (lastDbIdWrapped is ValueWrapper.Existing) lastDbIdWrapped.value else 0L
@@ -424,8 +428,8 @@ class DataSyncSelectorImplementation @Inject constructor(
         }
     }
 
-    private var lastTbrId = -1L
-    private var lastTbrTime = -1L
+    @Volatile private var lastTbrId = -1L
+    @Volatile private var lastTbrTime = -1L
     override fun processChangedTemporaryBasalsCompat(): Boolean {
         val useAbsolute = sp.getBoolean(R.string.key_ns_sync_use_absolute, false)
         val lastDbIdWrapped = appRepository.getLastTemporaryBasalIdWrapped().blockingGet()
@@ -475,8 +479,8 @@ class DataSyncSelectorImplementation @Inject constructor(
         }
     }
 
-    private var lastEbId = -1L
-    private var lastEbTime = -1L
+    @Volatile private var lastEbId = -1L
+    @Volatile private var lastEbTime = -1L
     override fun processChangedExtendedBolusesCompat(): Boolean {
         val useAbsolute = sp.getBoolean(R.string.key_ns_sync_use_absolute, false)
         val lastDbIdWrapped = appRepository.getLastExtendedBolusIdWrapped().blockingGet()
@@ -525,8 +529,8 @@ class DataSyncSelectorImplementation @Inject constructor(
         }
     }
 
-    private var lastPsId = -1L
-    private var lastPsTime = -1L
+    @Volatile private var lastPsId = -1L
+    @Volatile private var lastPsTime = -1L
     override fun processChangedProfileSwitchesCompat(): Boolean {
         val lastDbIdWrapped = appRepository.getLastProfileSwitchIdWrapped().blockingGet()
         val lastDbId = if (lastDbIdWrapped is ValueWrapper.Existing) lastDbIdWrapped.value else 0L
@@ -553,6 +557,91 @@ 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")
+            sp.putLong(R.string.key_ns_offline_event_last_synced_id, lastSynced)
+        }
+    }
+
+    // Prepared for v3 (returns all modified after)
+    override fun changedOfflineEvents(): List<OfflineEvent> {
+        val startId = sp.getLong(R.string.key_ns_offline_event_last_synced_id, 0)
+        return appRepository.getModifiedOfflineEventsDataFromId(startId).blockingGet().also {
+            aapsLogger.debug(LTag.NSCLIENT, "Loading OfflineEvent data for sync from $startId. Records ${it.size}")
+        }
+    }
+
+    @Volatile private var lastOeId = -1L
+    @Volatile private var lastOeTime = -1L
+    override fun processChangedOfflineEventsCompat(): Boolean {
+        val lastDbIdWrapped = appRepository.getLastOfflineEventIdWrapped().blockingGet()
+        val lastDbId = if (lastDbIdWrapped is ValueWrapper.Existing) lastDbIdWrapped.value else 0L
+        var startId = sp.getLong(R.string.key_ns_offline_event_last_synced_id, 0)
+        if (startId > lastDbId) {
+            sp.putLong(R.string.key_ns_offline_event_last_synced_id, 0)
+            startId = 0
+        }
+        if (startId == lastOeId && dateUtil.now() - lastOeTime < 5000) return false
+        lastOeId = startId
+        lastOeTime = dateUtil.now()
+        appRepository.getNextSyncElementOfflineEvent(startId).blockingGet()?.let { oe ->
+            aapsLogger.info(LTag.DATABASE, "Loading OfflineEvent data Start: $startId ID: ${oe.first.id} HistoryID: ${oe.second} ")
+            when {
+                // without nsId = create new
+                oe.first.interfaceIDs.nightscoutId == null ->
+                    nsClientPlugin.nsClientService?.dbAdd("treatments", oe.first.toJson(true, dateUtil), DataSyncSelector.PairOfflineEvent(oe.first, oe.second), "$startId/$lastDbId")
+                // existing with nsId = update
+                oe.first.interfaceIDs.nightscoutId != null ->
+                    nsClientPlugin.nsClientService?.dbUpdate("treatments", oe.first.interfaceIDs.nightscoutId, oe.first.toJson(false, dateUtil), DataSyncSelector.PairOfflineEvent(oe.first, oe.second), "$startId/$lastDbId")
+            }
+            return true
+        }
+        return false
+    }
+
     override fun confirmLastProfileStore(lastSynced: Long) {
         sp.putLong(R.string.key_ns_profile_store_last_synced_timestamp, lastSynced)
     }
@@ -561,9 +650,9 @@ class DataSyncSelectorImplementation @Inject constructor(
         val lastSync = sp.getLong(R.string.key_ns_profile_store_last_synced_timestamp, 0)
         val lastChange = sp.getLong(R.string.key_local_profile_last_change, 0)
         if (lastChange == 0L) return
-        localProfilePlugin.createProfileStore()
-        val profileJson = localProfilePlugin.profile?.data ?: return
-        if (lastChange > lastSync)
+        if (lastChange > lastSync) {
+            val profileJson = localProfilePlugin.profile?.data ?: return
             nsClientPlugin.nsClientService?.dbAdd("profile", profileJson, DataSyncSelector.PairProfileStore(profileJson, dateUtil.now()), "")
+        }
     }
 }
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 cc3c6b6aea..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
@@ -251,6 +270,26 @@ class NSClientAddAckWorker(
                 dataSyncSelector.confirmLastProfileStore(ack.originalObject.timestampSync)
                 rxBus.send(EventNSClientNewLog("DBADD", "Acked ProfileStore " + ack.id))
             }
+
+            is PairOfflineEvent       -> {
+                val pair = ack.originalObject
+                pair.value.interfaceIDs.nightscoutId = ack.id
+                repository.runTransactionForResult(UpdateNsIdOfflineEventTransaction(pair.value))
+                    .doOnError { error ->
+                        aapsLogger.error(LTag.DATABASE, "Updated ns id of OfflineEvent 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 OfflineEvent " + pair.value)
+                        dataSyncSelector.confirmLastOfflineEventIdIfGreater(pair.updateRecordId)
+                    }
+                    .blockingGet()
+                rxBus.send(EventNSClientNewLog("DBADD", "Acked OfflineEvent " + pair.value.interfaceIDs.nightscoutId))
+                // Send new if waiting
+                dataSyncSelector.processChangedOfflineEventsCompat()
+            }
+
         }
         return ret
     }
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 216e4eb0ca..3bd4bf76ca 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
@@ -26,7 +26,6 @@ import info.nightscout.androidaps.receivers.DataWorker
 import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.utils.JsonHelper
 import info.nightscout.androidaps.utils.JsonHelper.safeGetLong
-import info.nightscout.androidaps.utils.T
 import info.nightscout.androidaps.utils.buildHelper.BuildHelper
 import info.nightscout.androidaps.utils.sharedPreferences.SP
 import java.util.concurrent.TimeUnit
@@ -186,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)?.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 ||
@@ -194,7 +219,7 @@ class NSClientAddUpdateWorker(
                     eventType == TherapyEvent.Type.ANNOUNCEMENT.text ||
                     eventType == TherapyEvent.Type.QUESTION.text ||
                     eventType == TherapyEvent.Type.EXERCISE.text ||
-                    eventType == TherapyEvent.Type.APS_OFFLINE.text ||
+                    eventType == TherapyEvent.Type.NOTE.text ||
                     eventType == TherapyEvent.Type.PUMP_BATTERY_CHANGE.text ->
                     if (sp.getBoolean(R.string.key_ns_receive_therapy_events, false) || config.NSCLIENT) {
                         therapyEventFromJson(json)?.let { therapyEvent ->
@@ -341,6 +366,43 @@ class NSClientAddUpdateWorker(
                                 }
                         } ?: aapsLogger.error("Error parsing ProfileSwitch json $json")
                     }
+                eventType == TherapyEvent.Type.APS_OFFLINE.text          ->
+                    if (sp.getBoolean(R.string.key_ns_receive_offline_event, false) && buildHelper.isEngineeringMode() || config.NSCLIENT) {
+                        offlineEventFromJson(json)?.let { offlineEvent ->
+                            repository.runTransactionForResult(SyncNsOfflineEventTransaction(offlineEvent, invalidateByNsOnly = false))
+                                .doOnError {
+                                    aapsLogger.error(LTag.DATABASE, "Error while saving OfflineEvent", it)
+                                    ret = Result.failure(workDataOf("Error" to it.toString()))
+                                }
+                                .blockingGet()
+                                .also { result ->
+                                    result.inserted.forEach { oe ->
+                                        uel.log(Action.LOOP_CHANGE, Sources.NSClient,
+                                            ValueWithUnit.OfflineEventReason(oe.reason),
+                                            ValueWithUnit.Minute(TimeUnit.MILLISECONDS.toMinutes(oe.duration).toInt())
+                                        )
+                                        aapsLogger.debug(LTag.DATABASE, "Inserted OfflineEvent $oe")
+                                    }
+                                    result.invalidated.forEach { oe ->
+                                        uel.log(Action.LOOP_REMOVED, Sources.NSClient,
+                                            ValueWithUnit.OfflineEventReason(oe.reason),
+                                            ValueWithUnit.Minute(TimeUnit.MILLISECONDS.toMinutes(oe.duration).toInt())
+                                        )
+                                        aapsLogger.debug(LTag.DATABASE, "Invalidated OfflineEvent $oe")
+                                    }
+                                    result.ended.forEach { oe ->
+                                        uel.log(Action.LOOP_CHANGE, Sources.NSClient,
+                                            ValueWithUnit.OfflineEventReason(oe.reason),
+                                            ValueWithUnit.Minute(TimeUnit.MILLISECONDS.toMinutes(oe.duration).toInt())
+                                        )
+                                        aapsLogger.debug(LTag.DATABASE, "Updated OfflineEvent $oe")
+                                    }
+                                    result.updatedNsId.forEach {
+                                        aapsLogger.debug(LTag.DATABASE, "Updated nsId OfflineEvent $it")
+                                    }
+                                }
+                        } ?: aapsLogger.error("Error parsing OfflineEvent json $json")
+                    }
             }
             if (sp.getBoolean(R.string.key_ns_receive_therapy_events, false) || config.NSCLIENT)
                 if (eventType == TherapyEvent.Type.ANNOUNCEMENT.text) {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientMbgWorker.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientMbgWorker.kt
index 8c73fd908f..b7f1d1540c 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientMbgWorker.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientMbgWorker.kt
@@ -34,7 +34,7 @@ class NSClientMbgWorker(
         var ret = Result.success()
 
         val acceptNSData = sp.getBoolean(R.string.key_ns_receive_therapy_events, false) || config.NSCLIENT
-        if (!acceptNSData) return ret
+        if (!acceptNSData) return Result.success(workDataOf("Result" to "Sync not enabled"))
 
         val mbgArray = dataWorker.pickupJSONArray(inputData.getLong(DataWorker.STORE_KEY, -1))
             ?: return Result.failure(workDataOf("Error" to "missing input data"))
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 a7f51cbc70..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
@@ -125,6 +125,24 @@ class NSClientUpdateRemoveAckWorker(
                 dataSyncSelector.processChangedProfileSwitchesCompat()
                 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)
+                rxBus.send(EventNSClientNewLog("DBUPDATE", "Acked OfflineEvent" + ack._id))
+                // Send new if waiting
+                dataSyncSelector.processChangedOfflineEventsCompat()
+                ret = Result.success(workDataOf("ProcessedData" to pair.toString()))
+            }
         }
         return ret
     }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/acks/NSAddAck.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/acks/NSAddAck.kt
index 930defad05..78bded1d0d 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/acks/NSAddAck.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/acks/NSAddAck.kt
@@ -16,8 +16,8 @@ class NSAddAck(
 ) : Event(), Ack {
 
     var id: String? = null
-    @JvmField var nsClientID: String? = null
-    @JvmField var json: JSONObject? = null
+    var nsClientID: String? = null
+    var json: JSONObject? = null
     override fun call(vararg args: Any) {
         // Regular response
         try {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/data/NSSettingsStatus.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/data/NSSettingsStatus.kt
index 7efeb7c466..43e68ec743 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/data/NSSettingsStatus.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/data/NSSettingsStatus.kt
@@ -3,6 +3,7 @@ package info.nightscout.androidaps.plugins.general.nsclient.data
 import android.content.Context
 import info.nightscout.androidaps.interfaces.Config
 import info.nightscout.androidaps.R
+import info.nightscout.androidaps.annotations.OpenForTesting
 import info.nightscout.androidaps.database.entities.UserEntry
 import info.nightscout.androidaps.database.entities.UserEntry.Action
 import info.nightscout.androidaps.logging.AAPSLogger
@@ -113,6 +114,7 @@ import javax.inject.Singleton
  }
  */
 @Suppress("SpellCheckingInspection")
+@OpenForTesting
 @Singleton
 class NSSettingsStatus @Inject constructor(
     private val aapsLogger: AAPSLogger,
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/services/NSClientService.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/services/NSClientService.kt
index 6510abb76a..8d0a8691c1 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/services/NSClientService.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/services/NSClientService.kt
@@ -3,6 +3,7 @@ package info.nightscout.androidaps.plugins.general.nsclient.services
 import android.annotation.SuppressLint
 import android.content.Context
 import android.content.Intent
+import android.content.pm.ResolveInfo
 import android.os.*
 import androidx.work.OneTimeWorkRequest
 import com.google.common.base.Charsets
@@ -16,7 +17,6 @@ import info.nightscout.androidaps.events.EventConfigBuilderChange
 import info.nightscout.androidaps.events.EventPreferenceChange
 import info.nightscout.androidaps.interfaces.Config
 import info.nightscout.androidaps.interfaces.DataSyncSelector
-import info.nightscout.androidaps.interfaces.DatabaseHelperInterface
 import info.nightscout.androidaps.interfaces.PluginType
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
@@ -71,7 +71,6 @@ class NSClientService : DaggerService() {
     @Inject lateinit var aapsSchedulers: AapsSchedulers
     @Inject lateinit var nsSettingsStatus: NSSettingsStatus
     @Inject lateinit var nsDeviceStatus: NSDeviceStatus
-    @Inject lateinit var databaseHelper: DatabaseHelperInterface
     @Inject lateinit var rxBus: RxBusWrapper
     @Inject lateinit var resourceHelper: ResourceHelper
     @Inject lateinit var sp: SP
@@ -113,7 +112,6 @@ class NSClientService : DaggerService() {
     var latestDateInReceivedData: Long = 0
 
     @SuppressLint("WakelockTimeout")
-    @kotlin.ExperimentalStdlibApi
     override fun onCreate() {
         super.onCreate()
         wakeLock = (getSystemService(Context.POWER_SERVICE) as PowerManager).newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "AndroidAPS:NSClientService")
@@ -199,7 +197,7 @@ class NSClientService : DaggerService() {
                 .build())
     }
 
-    fun processAuthAck(ack: NSAuthAck) {
+    private fun processAuthAck(ack: NSAuthAck) {
         var connectionStatus = "Authenticated ("
         if (ack.read) connectionStatus += "R"
         if (ack.write) connectionStatus += "W"
@@ -237,7 +235,6 @@ class NSClientService : DaggerService() {
         return START_STICKY
     }
 
-    @kotlin.ExperimentalStdlibApi
     fun initialize() {
         dataCounter = 0
         readPreferences()
@@ -488,7 +485,7 @@ class NSClientService : DaggerService() {
                                 val intent = Intent(Intents.ACTION_NEW_PROFILE)
                                 intent.putExtras(bundle)
                                 intent.addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES)
-                                sendBroadcast(intent)
+                                broadcast(intent)
                             }
                         }
                     }
@@ -516,7 +513,7 @@ class NSClientService : DaggerService() {
                                 val intent = Intent(Intents.ACTION_REMOVED_TREATMENT)
                                 intent.putExtras(bundle)
                                 intent.addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES)
-                                sendBroadcast(intent)
+                                broadcast(intent)
                             }
                         }
                         if (addedOrUpdatedTreatments.length() > 0) {
@@ -533,7 +530,7 @@ class NSClientService : DaggerService() {
                                     val intent = Intent(Intents.ACTION_CHANGED_TREATMENT)
                                     intent.putExtras(bundle)
                                     intent.addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES)
-                                    sendBroadcast(intent)
+                                    broadcast(intent)
                                 }
                             }
                         }
@@ -581,7 +578,7 @@ class NSClientService : DaggerService() {
                                 val intent = Intent(Intents.ACTION_NEW_SGV)
                                 intent.putExtras(bundle)
                                 intent.addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES)
-                                sendBroadcast(intent)
+                                broadcast(intent)
                             }
                         }
                     }
@@ -652,7 +649,6 @@ class NSClientService : DaggerService() {
         }
     }
 
-    @kotlin.ExperimentalStdlibApi
     fun restart() {
         destroy()
         initialize()
@@ -721,6 +717,16 @@ class NSClientService : DaggerService() {
         return ret
     }
 
+    private fun broadcast(intent: Intent) {
+        val receivers: List<ResolveInfo> = packageManager.queryBroadcastReceivers(intent, 0)
+        for (resolveInfo in receivers)
+            resolveInfo.activityInfo.packageName?.let {
+                intent.setPackage(it)
+                sendBroadcast(intent)
+                aapsLogger.debug(LTag.CORE, "Sending broadcast " + intent.action + " to: " + it)
+            }
+    }
+
     init {
         if (handler == null) {
             val handlerThread = HandlerThread(NSClientService::class.java.simpleName + "Handler")
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/openhumans/OHUploadWorker.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/openhumans/OHUploadWorker.kt
deleted file mode 100644
index f6d5dca118..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/openhumans/OHUploadWorker.kt
+++ /dev/null
@@ -1,68 +0,0 @@
-package info.nightscout.androidaps.plugins.general.openhumans
-
-import android.app.Notification
-import android.content.Context
-import android.net.wifi.WifiManager
-import androidx.core.app.NotificationCompat
-import androidx.work.ForegroundInfo
-import androidx.work.RxWorker
-import androidx.work.WorkerParameters
-import info.nightscout.androidaps.MainApp
-import info.nightscout.androidaps.plugins.general.openhumans.OpenHumansUploader.Companion.NOTIFICATION_CHANNEL
-import info.nightscout.androidaps.plugins.general.openhumans.OpenHumansUploader.Companion.UPLOAD_NOTIFICATION_ID
-import info.nightscout.androidaps.utils.resources.ResourceHelper
-import info.nightscout.androidaps.utils.sharedPreferences.SP
-import io.reactivex.Single
-import java.util.concurrent.TimeUnit
-import javax.inject.Inject
-
-class OHUploadWorker(context: Context, workerParameters: WorkerParameters)
-    : RxWorker(context, workerParameters) {
-
-    @Inject
-    lateinit var sp: SP
-
-    @Inject
-    lateinit var openHumansUploader: OpenHumansUploader
-
-    @Inject
-    lateinit var resourceHelper: ResourceHelper
-
-    @kotlin.ExperimentalStdlibApi
-    override fun createWork(): Single<Result> = Single.defer {
-
-        // Here we inject every time we create work
-        // We could build our own WorkerFactory with dagger but this will create conflicts with other Workers
-        // (see https://medium.com/wonderquill/how-to-pass-custom-parameters-to-rxworker-worker-using-dagger-2-f4cfbc9892ba)
-        // This class will be replaced with new DB
-
-        (applicationContext as MainApp).androidInjector().inject(this)
-
-        val wifiManager = applicationContext.getSystemService(Context.WIFI_SERVICE) as? WifiManager
-        val wifiOnly = sp.getBoolean("key_oh_wifi_only", true)
-        val isConnectedToWifi = wifiManager?.isWifiEnabled ?: false && wifiManager?.connectionInfo?.networkId != -1
-        if (!wifiOnly || (wifiOnly && isConnectedToWifi)) {
-            setForegroundAsync(createForegroundInfo())
-            openHumansUploader.uploadDataSegmentally()
-                .andThen(Single.just(Result.success()))
-                .onErrorResumeNext { Single.just(Result.retry()) }
-        } else {
-            Single.just(Result.retry())
-        }
-    }
-
-    private fun createForegroundInfo(): ForegroundInfo {
-        val title = resourceHelper.gs(info.nightscout.androidaps.R.string.open_humans)
-
-        val notification: Notification = NotificationCompat.Builder(applicationContext, NOTIFICATION_CHANNEL)
-            .setContentTitle(title)
-            .setTicker(title)
-            .setContentText(resourceHelper.gs(info.nightscout.androidaps.R.string.your_phone_is_upload_data))
-            .setSmallIcon(info.nightscout.androidaps.R.drawable.notif_icon)
-            .setOngoing(true)
-            .setProgress(0, 0 , true)
-            .build()
-        return ForegroundInfo(UPLOAD_NOTIFICATION_ID, notification)
-    }
-
-}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/openhumans/OpenHumansAPI.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/openhumans/OpenHumansAPI.kt
deleted file mode 100644
index 91fa60ca25..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/openhumans/OpenHumansAPI.kt
+++ /dev/null
@@ -1,191 +0,0 @@
-package info.nightscout.androidaps.plugins.general.openhumans
-
-import android.annotation.SuppressLint
-import android.util.Base64
-import io.reactivex.Completable
-import io.reactivex.Single
-import io.reactivex.disposables.Disposables
-import okhttp3.*
-import okio.BufferedSink
-import org.json.JSONArray
-import org.json.JSONObject
-import java.io.IOException
-import java.text.SimpleDateFormat
-import java.util.*
-
-class OpenHumansAPI(
-    private val baseUrl: String,
-    clientId: String,
-    clientSecret: String,
-    private val redirectUri: String
-) {
-
-    private val authHeader = "Basic " + Base64.encodeToString("$clientId:$clientSecret".toByteArray(), Base64.NO_WRAP)
-    private val client = OkHttpClient()
-
-    fun exchangeAuthToken(code: String): Single<OAuthTokens> = sendTokenRequest(FormBody.Builder()
-        .add("grant_type", "authorization_code")
-        .add("redirect_uri", redirectUri)
-        .add("code", code)
-        .build())
-
-    fun refreshAccessToken(refreshToken: String): Single<OAuthTokens> = sendTokenRequest(FormBody.Builder()
-        .add("grant_type", "refresh_token")
-        .add("redirect_uri", redirectUri)
-        .add("refresh_token", refreshToken)
-        .build())
-
-    private fun sendTokenRequest(body: FormBody) = Request.Builder()
-        .url("$baseUrl/oauth2/token/")
-        .addHeader("Authorization", authHeader)
-        .post(body)
-        .build()
-        .toSingle()
-        .map { response ->
-            response.use { _ ->
-                val responseBody = response.body
-                val jsonObject = responseBody?.let { JSONObject(it.string()) }
-                if (!response.isSuccessful) throw OHHttpException(response.code, response.message, jsonObject?.getString("error"))
-                if (jsonObject == null) throw OHHttpException(response.code, response.message, "No body")
-                if (!jsonObject.has("expires_in")) throw OHMissingFieldException("expires_in")
-                OAuthTokens(
-                    accessToken = jsonObject.getString("access_token")
-                        ?: throw OHMissingFieldException("access_token"),
-                    refreshToken = jsonObject.getString("refresh_token")
-                        ?: throw OHMissingFieldException("refresh_token"),
-                    expiresAt = response.sentRequestAtMillis + jsonObject.getInt("expires_in") * 1000L
-                )
-            }
-        }
-
-    fun getProjectMemberId(accessToken: String): Single<String> = Request.Builder()
-        .url("$baseUrl/api/direct-sharing/project/exchange-member/?access_token=$accessToken")
-        .get()
-        .build()
-        .toSingle()
-        .map {
-            it.jsonBody.getString("project_member_id")
-                ?: throw OHMissingFieldException("project_member_id")
-        }
-
-    fun prepareFileUpload(accessToken: String, fileName: String, metadata: FileMetadata): Single<PreparedUpload> = Request.Builder()
-        .url("$baseUrl/api/direct-sharing/project/files/upload/direct/?access_token=$accessToken")
-        .post(FormBody.Builder()
-            .add("filename", fileName)
-            .add("metadata", metadata.toJSON().toString())
-            .build())
-        .build()
-        .toSingle()
-        .map {
-            val json = it.jsonBody
-            PreparedUpload(
-                fileId = json.getString("id") ?: throw OHMissingFieldException("id"),
-                uploadURL = json.getString("url") ?: throw OHMissingFieldException("url")
-            )
-        }
-
-    fun uploadFile(url: String, content: ByteArray): Completable = Request.Builder()
-        .url(url)
-        .put(object : RequestBody() {
-            override fun contentType(): MediaType? = null
-
-            override fun contentLength() = content.size.toLong()
-
-            override fun writeTo(sink: BufferedSink) {
-                sink.write(content)
-            }
-        })
-        .build()
-        .toSingle()
-        .doOnSuccess { response ->
-            response.use { _ ->
-                if (!response.isSuccessful) throw OHHttpException(response.code, response.message, null)
-            }
-        }
-        .ignoreElement()
-
-    fun completeFileUpload(accessToken: String, fileId: String): Completable = Request.Builder()
-        .url("$baseUrl/api/direct-sharing/project/files/upload/complete/?access_token=$accessToken")
-        .post(FormBody.Builder()
-            .add("file_id", fileId)
-            .build())
-        .build()
-        .toSingle()
-        .doOnSuccess { it.jsonBody }
-        .ignoreElement()
-
-    private fun Request.toSingle() = Single.create<Response> {
-        val call = client.newCall(this)
-        call.enqueue(object : Callback {
-            override fun onFailure(call: Call, e: IOException) {
-                it.tryOnError(e)
-            }
-
-            override fun onResponse(call: Call, response: Response) {
-                it.onSuccess(response)
-            }
-        })
-        it.setDisposable(Disposables.fromRunnable { call.cancel() })
-    }
-
-    private val Response.jsonBody
-        get() = use { _ ->
-            val jsonObject = body?.let { JSONObject(it.string()) }
-                ?: throw OHHttpException(code, message, null)
-            if (!isSuccessful) throw OHHttpException(code, message, jsonObject.getString("detail"))
-            jsonObject
-        }
-
-    data class OAuthTokens(
-        val accessToken: String,
-        val refreshToken: String,
-        val expiresAt: Long
-    )
-
-    data class FileMetadata(
-        val tags: List<String>,
-        val description: String,
-        val md5: String? = null,
-        val creationDate: Long? = null,
-        val startDate: Long? = null,
-        val endDate: Long? = null
-    ) {
-
-        fun toJSON(): JSONObject {
-            val jsonObject = JSONObject()
-            jsonObject.put("tags", JSONArray().apply { tags.forEach { put(it) } })
-            jsonObject.put("description", description)
-            jsonObject.put("md5", md5)
-            creationDate?.let { jsonObject.put("creation_date", iso8601DateFormatter.format(Date(it))) }
-            startDate?.let { jsonObject.put("start_date", iso8601DateFormatter.format(Date(it))) }
-            endDate?.let { jsonObject.put("end_date", iso8601DateFormatter.format(Date(it))) }
-            return jsonObject
-        }
-    }
-
-    data class PreparedUpload(
-        val fileId: String,
-        val uploadURL: String
-    )
-
-    data class OHHttpException(
-        val code: Int,
-        val meaning: String,
-        val detail: String?
-    ) : RuntimeException() {
-
-        override val message: String get() = toString()
-    }
-
-    data class OHMissingFieldException(
-        val name: String
-    ) : RuntimeException() {
-
-        override val message: String get() = toString()
-    }
-
-    companion object {
-        @SuppressLint("SimpleDateFormat")
-        private val iso8601DateFormatter = SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSXXX")
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/openhumans/OpenHumansFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/openhumans/OpenHumansFragment.kt
deleted file mode 100644
index e6d26b1bb9..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/openhumans/OpenHumansFragment.kt
+++ /dev/null
@@ -1,116 +0,0 @@
-package info.nightscout.androidaps.plugins.general.openhumans
-
-import android.content.Intent
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.widget.Button
-import android.widget.TextView
-import androidx.work.WorkManager
-import dagger.android.support.DaggerFragment
-import info.nightscout.androidaps.R
-import info.nightscout.androidaps.events.Event
-import info.nightscout.androidaps.interfaces.DatabaseHelperInterface
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
-import info.nightscout.androidaps.utils.alertDialogs.OKDialog
-import info.nightscout.androidaps.utils.resources.ResourceHelper
-import info.nightscout.androidaps.utils.rx.AapsSchedulers
-import io.reactivex.BackpressureStrategy
-import io.reactivex.Single
-import io.reactivex.disposables.CompositeDisposable
-import io.reactivex.rxkotlin.plusAssign
-import java.util.concurrent.TimeUnit
-import javax.inject.Inject
-
-class OpenHumansFragment : DaggerFragment() {
-
-    private var viewsCreated = false
-    private var login: Button? = null
-    private var logout: Button? = null
-    private var memberId: TextView? = null
-    private var queueSize: TextView? = null
-    private var workerState: TextView? = null
-    private var queueSizeValue = 0L
-    private val compositeDisposable = CompositeDisposable()
-
-    @Inject lateinit var rxBus: RxBusWrapper
-    @Inject lateinit var openHumansUploader: OpenHumansUploader
-    @Inject lateinit var resourceHelper: ResourceHelper
-    @Inject lateinit var aapsSchedulers: AapsSchedulers
-    @Inject lateinit var databaseHelper: DatabaseHelperInterface
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        compositeDisposable += Single.fromCallable { databaseHelper.getOHQueueSize() }
-            .subscribeOn(aapsSchedulers.io)
-            .repeatWhen {
-                rxBus.toObservable(UpdateViewEvent::class.java)
-                    .cast(Any::class.java)
-                    .mergeWith(rxBus.toObservable(UpdateQueueEvent::class.java)
-                        .throttleLatest(5, TimeUnit.SECONDS))
-                    .toFlowable(BackpressureStrategy.LATEST)
-            }
-            .observeOn(aapsSchedulers.main)
-            .subscribe({
-                queueSizeValue = it
-                updateGUI()
-            }, {})
-        context?.applicationContext?.let { appContext ->
-            WorkManager.getInstance(appContext).getWorkInfosForUniqueWorkLiveData(OpenHumansUploader.WORK_NAME).observe(this, {
-                val workInfo = it.lastOrNull()
-                if (workInfo == null) {
-                    workerState?.visibility = View.GONE
-                } else {
-                    workerState?.visibility = View.VISIBLE
-                    workerState?.text = getString(R.string.worker_state, workInfo.state.toString())
-                }
-            })
-        }
-    }
-
-    override fun onDestroy() {
-        compositeDisposable.clear()
-        super.onDestroy()
-    }
-
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
-        val view = inflater.inflate(R.layout.fragment_open_humans, container, false)
-        login = view.findViewById(R.id.login)
-        logout = view.findViewById(R.id.logout)
-        memberId = view.findViewById(R.id.member_id)
-        queueSize = view.findViewById(R.id.queue_size)
-        workerState = view.findViewById(R.id.worker_state)
-        login!!.setOnClickListener { startActivity(Intent(context, OpenHumansLoginActivity::class.java)) }
-        logout!!.setOnClickListener {
-            activity?.let { activity -> OKDialog.showConfirmation(activity, resourceHelper.gs(R.string.oh_logout_confirmation)) { openHumansUploader.logout() } }
-        }
-        viewsCreated = true
-        updateGUI()
-        return view
-    }
-
-    override fun onDestroyView() {
-        viewsCreated = false
-        login = null
-        logout = null
-        memberId = null
-        queueSize = null
-        super.onDestroyView()
-    }
-
-    fun updateGUI() {
-        if (viewsCreated) {
-            queueSize!!.text = getString(R.string.queue_size, queueSizeValue)
-            val projectMemberId = openHumansUploader.projectMemberId
-            memberId!!.text = getString(R.string.project_member_id, projectMemberId
-                ?: getString(R.string.not_logged_in))
-            login!!.visibility = if (projectMemberId == null) View.VISIBLE else View.GONE
-            logout!!.visibility = if (projectMemberId != null) View.VISIBLE else View.GONE
-        }
-    }
-
-    object UpdateViewEvent : Event()
-
-    object UpdateQueueEvent : Event()
-}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/openhumans/OpenHumansLoginActivity.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/openhumans/OpenHumansLoginActivity.kt
deleted file mode 100644
index ecb110d6dd..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/openhumans/OpenHumansLoginActivity.kt
+++ /dev/null
@@ -1,138 +0,0 @@
-package info.nightscout.androidaps.plugins.general.openhumans
-
-import android.app.Dialog
-import android.content.Intent
-import android.net.Uri
-import android.os.Bundle
-import android.widget.Button
-import android.widget.CheckBox
-import android.widget.Toast
-import androidx.appcompat.app.AlertDialog
-import androidx.browser.customtabs.CustomTabsIntent
-import androidx.fragment.app.DialogFragment
-import androidx.fragment.app.FragmentActivity
-import dagger.android.support.DaggerDialogFragment
-import info.nightscout.androidaps.R
-import info.nightscout.androidaps.activities.NoSplashAppCompatActivity
-import info.nightscout.androidaps.utils.rx.AapsSchedulers
-import io.reactivex.disposables.Disposable
-import javax.inject.Inject
-
-class OpenHumansLoginActivity : NoSplashAppCompatActivity() {
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        setContentView(R.layout.activity_open_humans_login)
-        val button = findViewById<Button>(R.id.button)
-        val checkbox = findViewById<CheckBox>(R.id.checkbox)
-
-        button.setOnClickListener {
-            if (checkbox.isChecked) {
-                CustomTabsIntent.Builder().build().launchUrl(this, Uri.parse(OpenHumansUploader.AUTH_URL))
-            } else {
-                Toast.makeText(this, R.string.you_need_to_accept_the_of_use_first, Toast.LENGTH_SHORT).show()
-            }
-        }
-    }
-
-    override fun onNewIntent(intent: Intent) {
-        super.onNewIntent(intent)
-        val code = intent.data?.getQueryParameter("code")
-        if (supportFragmentManager.fragments.size == 0 && code != null) {
-            ExchangeAuthTokenDialog(code).show(supportFragmentManager, "ExchangeAuthTokenDialog")
-        }
-    }
-
-    class ExchangeAuthTokenDialog : DaggerDialogFragment() {
-
-        @Inject lateinit var openHumansUploader: OpenHumansUploader
-        @Inject lateinit var aapsSchedulers: AapsSchedulers
-
-        private var disposable: Disposable? = null
-
-        init {
-            isCancelable = false
-        }
-
-        override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
-            return AlertDialog.Builder(requireActivity())
-                .setTitle(R.string.completing_login)
-                .setMessage(R.string.please_wait)
-                .create()
-        }
-
-        override fun onCreate(savedInstanceState: Bundle?) {
-            super.onCreate(savedInstanceState)
-            disposable = openHumansUploader.login(arguments?.getString("authToken")!!).subscribeOn(aapsSchedulers.io).subscribe({
-                dismiss()
-                SetupDoneDialog().show(parentFragmentManager, "SetupDoneDialog")
-            }, {
-                dismiss()
-                ErrorDialog(it.message).show(parentFragmentManager, "ErrorDialog")
-            })
-        }
-
-        override fun onDestroy() {
-            disposable?.dispose()
-            super.onDestroy()
-        }
-
-        companion object {
-
-            operator fun invoke(authToken: String): ExchangeAuthTokenDialog {
-                val dialog = ExchangeAuthTokenDialog()
-                val args = Bundle()
-                args.putString("authToken", authToken)
-                dialog.arguments = args
-                return dialog
-            }
-
-        }
-    }
-
-    class ErrorDialog : DialogFragment() {
-
-        override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
-            val message = arguments?.getString("message")
-            val shownMessage = if (message == null) getString(R.string.there_was_an_error)
-            else "${getString(R.string.there_was_an_error)}\n\n$message"
-            return AlertDialog.Builder(requireActivity())
-                .setTitle(R.string.error)
-                .setMessage(shownMessage)
-                .setPositiveButton(R.string.close, null)
-                .create()
-        }
-
-        companion object {
-
-            operator fun invoke(message: String?): ErrorDialog {
-                val dialog = ErrorDialog()
-                val args = Bundle()
-                args.putString("message", message)
-                dialog.arguments = args
-                return dialog
-            }
-        }
-    }
-
-    class SetupDoneDialog : DialogFragment() {
-
-        init {
-            isCancelable = false
-        }
-
-        override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
-            return AlertDialog.Builder(requireActivity())
-                .setTitle(R.string.successfully_logged_in)
-                .setMessage(R.string.setup_will_continue_in_background)
-                .setCancelable(false)
-                .setPositiveButton(R.string.close) { _, _ ->
-                    requireActivity().run {
-                        setResult(FragmentActivity.RESULT_OK)
-                        requireActivity().finish()
-                    }
-                }
-                .create()
-        }
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/openhumans/OpenHumansUploader.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/openhumans/OpenHumansUploader.kt
deleted file mode 100644
index 1af58b5089..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/openhumans/OpenHumansUploader.kt
+++ /dev/null
@@ -1,652 +0,0 @@
-package info.nightscout.androidaps.plugins.general.openhumans
-
-import android.app.NotificationChannel
-import android.app.NotificationManager
-import android.app.PendingIntent
-import android.content.Context
-import android.content.Intent
-import android.os.Build
-import android.os.PowerManager
-import android.util.DisplayMetrics
-import android.view.WindowManager
-import androidx.core.app.NotificationCompat
-import androidx.core.app.NotificationManagerCompat
-import androidx.work.*
-import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.BuildConfig
-import info.nightscout.androidaps.R
-import info.nightscout.androidaps.database.AppRepository
-import info.nightscout.androidaps.database.entities.GlucoseValue
-import info.nightscout.androidaps.database.entities.TemporaryTarget
-import info.nightscout.androidaps.database.entities.TherapyEvent
-import info.nightscout.androidaps.db.*
-import info.nightscout.androidaps.events.EventPreferenceChange
-import info.nightscout.androidaps.interfaces.DatabaseHelperInterface
-import info.nightscout.androidaps.interfaces.PluginBase
-import info.nightscout.androidaps.interfaces.PluginDescription
-import info.nightscout.androidaps.interfaces.PluginType
-import info.nightscout.androidaps.logging.AAPSLogger
-import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
-import info.nightscout.androidaps.extensions.toConstant
-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.Observable
-import io.reactivex.Single
-import io.reactivex.disposables.CompositeDisposable
-import io.reactivex.disposables.Disposable
-import io.reactivex.rxkotlin.plusAssign
-import org.json.JSONArray
-import org.json.JSONException
-import org.json.JSONObject
-import java.io.ByteArrayOutputStream
-import java.security.MessageDigest
-import java.text.SimpleDateFormat
-import java.util.*
-import java.util.concurrent.TimeUnit
-import java.util.zip.ZipEntry
-import java.util.zip.ZipOutputStream
-import javax.inject.Inject
-import javax.inject.Singleton
-
-@Singleton
-class OpenHumansUploader @Inject constructor(
-    injector: HasAndroidInjector,
-    resourceHelper: ResourceHelper,
-    aapsLogger: AAPSLogger,
-    private val aapsSchedulers: AapsSchedulers,
-    private val sp: SP,
-    private val rxBus: RxBusWrapper,
-    private val context: Context,
-    private val databaseHelper: DatabaseHelperInterface,
-    val repository: AppRepository
-) : PluginBase(
-    PluginDescription()
-        .mainType(PluginType.GENERAL)
-        .pluginIcon(R.drawable.open_humans_white)
-        .pluginName(R.string.open_humans)
-        .shortName(R.string.open_humans_short)
-        .description(R.string.donate_your_data_to_science)
-        .fragmentClass(OpenHumansFragment::class.qualifiedName)
-        .preferencesId(R.xml.pref_openhumans),
-    aapsLogger, resourceHelper, injector) {
-
-    companion object {
-
-        private const val OPEN_HUMANS_URL = "https://www.openhumans.org"
-        private const val CLIENT_ID = "oie6DvnaEOagTxSoD6BukkLPwDhVr6cMlN74Ihz1"
-        private const val CLIENT_SECRET = "jR0N8pkH1jOwtozHc7CsB1UPcJzFN95ldHcK4VGYIApecr8zGJox0v06xLwPLMASScngT12aIaIHXAVCJeKquEXAWG1XekZdbubSpccgNiQBmuVmIF8nc1xSKSNJltCf"
-        private const val REDIRECT_URL = "androidaps://setup-openhumans"
-        const val AUTH_URL = "https://www.openhumans.org/direct-sharing/projects/oauth2/authorize/?client_id=$CLIENT_ID&response_type=code"
-        const val WORK_NAME = "Open Humans"
-        const val NOTIFICATION_CHANNEL = "OpenHumans"
-        private const val COPY_NOTIFICATION_ID = 3122
-        private const val FAILURE_NOTIFICATION_ID = 3123
-        private const val SUCCESS_NOTIFICATION_ID = 3124
-        private const val SIGNED_OUT_NOTIFICATION_ID = 3125
-        const val UPLOAD_NOTIFICATION_ID = 3126
-        private const val UPLOAD_SEGMENT_SIZE = 10000L
-    }
-
-    private val openHumansAPI = OpenHumansAPI(OPEN_HUMANS_URL, CLIENT_ID, CLIENT_SECRET, REDIRECT_URL)
-
-    @Suppress("PrivatePropertyName")
-    private val FILE_NAME_DATE_FORMAT = SimpleDateFormat("yyyyMMdd'T'HHmmss", Locale.US).apply { timeZone = TimeZone.getTimeZone("UTC") }
-
-    private var isSetup
-        get() = sp.getBoolean("openhumans_is_setup", false)
-        set(value) = sp.putBoolean("openhumans_is_setup", value)
-    private var oAuthTokens: OpenHumansAPI.OAuthTokens?
-        get() {
-            return if (sp.contains("openhumans_access_token") && sp.contains("openhumans_refresh_token") && sp.contains("openhumans_expires_at")) {
-                OpenHumansAPI.OAuthTokens(
-                    accessToken = sp.getStringOrNull("openhumans_access_token", null)!!,
-                    refreshToken = sp.getStringOrNull("openhumans_refresh_token", null)!!,
-                    expiresAt = sp.getLong("openhumans_expires_at", 0)
-                )
-            } else {
-                null
-            }
-        }
-        set(value) {
-            if (value != null) {
-                sp.putString("openhumans_access_token", value.accessToken)
-                sp.putString("openhumans_refresh_token", value.refreshToken)
-                sp.putLong("openhumans_expires_at", value.expiresAt)
-            } else {
-                sp.remove("openhumans_access_token")
-                sp.remove("openhumans_refresh_token")
-                sp.remove("openhumans_expires_at")
-                sp.remove("openhumans_expires_at")
-            }
-        }
-    var projectMemberId: String?
-        get() = sp.getStringOrNull("openhumans_project_member_id", null)
-        private set(value) {
-            if (value == null) sp.remove("openhumans_project_member_id")
-            else sp.putString("openhumans_project_member_id", value)
-        }
-    private var uploadCounter: Int
-        get() = sp.getInt("openhumans_counter", 1)
-        set(value) = sp.putInt("openhumans_counter", value)
-    private val appId: UUID
-        get() {
-            val id = sp.getStringOrNull("openhumans_appid", null)
-            return if (id == null) {
-                val generated = UUID.randomUUID()
-                sp.putString("openhumans_appid", generated.toString())
-                generated
-            } else {
-                UUID.fromString(id)
-            }
-        }
-
-    private var copyDisposable: Disposable? = null
-
-    private val wakeLock = (context.getSystemService(Context.POWER_SERVICE) as PowerManager)
-        .newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "AndroidAPS::OpenHumans")
-
-    private val preferenceChangeDisposable = CompositeDisposable()
-
-    override fun onStart() {
-        super.onStart()
-        setupNotificationChannel()
-        if (isSetup) scheduleWorker(false)
-        preferenceChangeDisposable += rxBus.toObservable(EventPreferenceChange::class.java).subscribe {
-            onSharedPreferenceChanged(it)
-        }
-    }
-
-    override fun onStop() {
-        copyDisposable?.dispose()
-        cancelWorker()
-        preferenceChangeDisposable.clear()
-        super.onStop()
-    }
-
-    fun enqueueBGReading(glucoseValue: GlucoseValue?) = glucoseValue?.let {
-        insertQueueItem("BgReadings") {
-            put("date", glucoseValue.timestamp)
-            put("isValid", glucoseValue.isValid)
-            put("value", glucoseValue.value)
-            put("direction", glucoseValue.trendArrow)
-            put("raw", glucoseValue.raw)
-            put("source", glucoseValue.sourceSensor)
-            put("nsId", glucoseValue.interfaceIDs.nightscoutId)
-        }
-    }
-
-    // @JvmOverloads
-    // fun enqueueTreatment(treatment: Treatment?, deleted: Boolean = false) = treatment?.let {
-    //     insertQueueItem("Treatments") {
-    //         put("date", treatment.date)
-    //         put("isValid", treatment.isValid)
-    //         put("source", treatment.source)
-    //         put("nsId", treatment._id)
-    //         put("boluscalc", treatment.boluscalc)
-    //         put("carbs", treatment.carbs)
-    //         put("dia", treatment.dia)
-    //         put("insulin", treatment.insulin)
-    //         put("insulinInterfaceID", treatment.insulinInterfaceID)
-    //         put("isSMB", treatment.isSMB)
-    //         put("mealBolus", treatment.mealBolus)
-    //         put("bolusCalcJson", treatment.getBoluscalc())
-    //         put("isDeletion", deleted)
-    //     }
-    // }
-
-    @JvmOverloads
-    fun enqueueTherapyEvent(therapyEvent: TherapyEvent, deleted: Boolean = false) = insertQueueItem("TherapyEvents") {
-        put("date", therapyEvent.timestamp)
-        put("isValid", therapyEvent.isValid)
-        put("nsId", therapyEvent.interfaceIDs.nightscoutId)
-        put("eventType", therapyEvent.type.text)
-        put("glucose", therapyEvent.glucose)
-        put("units", therapyEvent.glucoseUnit.toConstant())
-        put("glucoseType", therapyEvent.glucoseType?.text)
-        put("duration", therapyEvent.duration)
-        put("isDeletion", deleted)
-    }
-
-    // @JvmOverloads
-    // fun enqueueExtendedBolus(extendedBolus: ExtendedBolus, deleted: Boolean = false) = insertQueueItem("ExtendedBoluses") {
-    //     put("date", extendedBolus.date)
-    //     put("isValid", extendedBolus.isValid)
-    //     put("source", extendedBolus.source)
-    //     put("nsId", extendedBolus._id)
-    //     put("pumpId", extendedBolus.pumpId)
-    //     put("insulin", extendedBolus.insulin)
-    //     put("durationInMinutes", extendedBolus.durationInMinutes)
-    //     put("isDeletion", deleted)
-    // }
-
-    // @JvmOverloads
-    // fun enqueueProfileSwitch(profileSwitch: ProfileSwitch, deleted: Boolean = false) = insertQueueItem("ProfileSwitches") {
-    //     put("date", profileSwitch.date)
-    //     put("isValid", profileSwitch.isValid)
-    //     put("source", profileSwitch.source)
-    //     put("nsId", profileSwitch._id)
-    //     put("isCPP", profileSwitch.isCPP)
-    //     put("timeshift", profileSwitch.timeshift)
-    //     put("percentage", profileSwitch.percentage)
-    //     put("profile", JSONObject(profileSwitch.profileJson))
-    //     put("profilePlugin", profileSwitch.profilePlugin)
-    //     put("durationInMinutes", profileSwitch.durationInMinutes)
-    //     put("isDeletion", deleted)
-    // }
-
-    // fun enqueueTotalDailyDose(tdd: TDD) = insertQueueItem("TotalDailyDoses") {
-    //     put("double", tdd.date)
-    //     put("double", tdd.bolus)
-    //     put("double", tdd.basal)
-    //     put("double", tdd.total)
-    // }
-
-    // @JvmOverloads
-    // fun enqueueTemporaryBasal(temporaryBasal: TemporaryBasal?, deleted: Boolean = false) = temporaryBasal?.let {
-    //     insertQueueItem("TemporaryBasals") {
-    //         put("date", temporaryBasal.date)
-    //         put("isValid", temporaryBasal.isValid)
-    //         put("source", temporaryBasal.source)
-    //         put("nsId", temporaryBasal._id)
-    //         put("pumpId", temporaryBasal.pumpId)
-    //         put("durationInMinutes", temporaryBasal.durationInMinutes)
-    //         put("durationInMinutes", temporaryBasal.durationInMinutes)
-    //         put("isAbsolute", temporaryBasal.isAbsolute)
-    //         put("percentRate", temporaryBasal.percentRate)
-    //         put("absoluteRate", temporaryBasal.absoluteRate)
-    //         put("isDeletion", deleted)
-    //     }
-    // }
-
-    @JvmOverloads
-    fun enqueueTempTarget(tempTarget: TemporaryTarget?, deleted: Boolean = false) = tempTarget?.let {
-        insertQueueItem("TempTargets") {
-            put("date", tempTarget.timestamp)
-            put("isValid", tempTarget.isValid)
-            put("nsId", tempTarget.interfaceIDs_backing?.nightscoutId)
-            put("low", tempTarget.lowTarget)
-            put("high", tempTarget.highTarget)
-            put("reason", tempTarget.reason)
-            put("durationInMinutes", tempTarget.duration)
-            put("isDeletion", deleted)
-        }
-    }
-
-    fun enqueueSMBData(profile: JSONObject?, glucoseStatus: JSONObject?, iobData: JSONArray?, mealData: JSONObject?, currentTemp: JSONObject?, autosensData: JSONObject?, smbAllowed: Boolean, smbAlwaysAllowed: Boolean, result: JSONObject?) = insertQueueItem("APSData") {
-        put("algorithm", "SMB")
-        put("profile", profile)
-        put("glucoseStatus", glucoseStatus)
-        put("iobData", iobData)
-        put("mealData", mealData)
-        put("currentTemp", currentTemp)
-        put("autosensData", autosensData)
-        put("smbAllowed", smbAllowed)
-        put("smbAlwaysAllowed", smbAlwaysAllowed)
-        put("result", result)
-    }
-
-    fun enqueueAMAData(profile: JSONObject?, glucoseStatus: JSONObject?, iobData: JSONArray?, mealData: JSONObject?, currentTemp: JSONObject?, autosensData: JSONObject?, result: JSONObject?) = insertQueueItem("APSData") {
-        put("algorithm", "AMA")
-        put("profile", profile)
-        put("glucoseStatus", glucoseStatus)
-        put("iobData", iobData)
-        put("mealData", mealData)
-        put("currentTemp", currentTemp)
-        put("autosensData", autosensData)
-        put("result", result)
-    }
-
-    private fun insertQueueItem(file: String, structureVersion: Int = 1, generator: JSONObject.() -> Unit) {
-        if (oAuthTokens != null && this.isEnabled(PluginType.GENERAL)) {
-            try {
-                val jsonObject = JSONObject()
-                jsonObject.put("structureVersion", structureVersion)
-                jsonObject.put("queuedOn", System.currentTimeMillis())
-                generator(jsonObject)
-                val queueItem = OHQueueItem(
-                    file = file,
-                    content = jsonObject.toString()
-                )
-                databaseHelper.createOrUpdate(queueItem)
-                rxBus.send(OpenHumansFragment.UpdateQueueEvent)
-            } catch (e: JSONException) {
-                e.printStackTrace()
-            }
-        }
-    }
-
-    fun login(authCode: String): Completable =
-        openHumansAPI.exchangeAuthToken(authCode)
-            .doOnSuccess {
-                oAuthTokens = it
-            }
-            .flatMap { openHumansAPI.getProjectMemberId(it.accessToken) }
-            .doOnSuccess {
-                projectMemberId = it
-                copyExistingDataToQueue()
-                rxBus.send(OpenHumansFragment.UpdateViewEvent)
-            }
-            .doOnError {
-                aapsLogger.error("Failed to login to Open Humans", it)
-            }
-            .ignoreElement()
-
-    fun logout() {
-        cancelWorker()
-        copyDisposable?.dispose()
-        isSetup = false
-        oAuthTokens = null
-        projectMemberId = null
-        databaseHelper.clearOpenHumansQueue()
-        rxBus.send(OpenHumansFragment.UpdateViewEvent)
-    }
-
-    private fun copyExistingDataToQueue() {
-        copyDisposable?.dispose()
-        var currentProgress = 0L
-        var maxProgress = 0L
-        val increaseCounter = {
-            currentProgress++
-            //Updating the notification for every item drastically slows down the operation
-            if (currentProgress % 1000L == 0L) showOngoingNotification(maxProgress, currentProgress)
-        }
-        copyDisposable = Completable.fromCallable { databaseHelper.clearOpenHumansQueue() }
-//            .andThen(Single.defer { Single.just(databaseHelper.getCountOfAllRows() + treatmentsPlugin.service.count()) })
-//            .doOnSuccess { maxProgress = it }
-//            .flatMapObservable { Observable.defer { Observable.fromIterable(treatmentsPlugin.service.getTreatmentData()) } }
-//            .map { enqueueTreatment(it); increaseCounter() }
-//            .ignoreElements()
-            .andThen(Observable.defer { Observable.fromIterable(repository.compatGetBgReadingsDataFromTime(0, true).blockingGet()) })
-            .map { enqueueBGReading(it); increaseCounter() }
-            .ignoreElements()
-            .andThen(Observable.defer { Observable.fromIterable(repository.compatGetTherapyEventDataFromTime(0, true).blockingGet()) })
-            .map { enqueueTherapyEvent(it); increaseCounter() }
-            .ignoreElements()
-//            .andThen(Observable.defer { Observable.fromIterable(databaseHelper.getAllExtendedBoluses()) })
-//            .map { enqueueExtendedBolus(it); increaseCounter() }
-//            .ignoreElements()
-//             .andThen(Observable.defer { Observable.fromIterable(databaseHelper.getAllProfileSwitches()) })
-//             .map { enqueueProfileSwitch(it); increaseCounter() }
-//             .ignoreElements()
-            // .andThen(Observable.defer { Observable.fromIterable(databaseHelper.getAllTDDs()) })
-            // .map { enqueueTotalDailyDose(it); increaseCounter() }
-            // .ignoreElements()
-            // .andThen(Observable.defer { Observable.fromIterable(databaseHelper.getAllTemporaryBasals()) })
-            // .map { enqueueTemporaryBasal(it); increaseCounter() }
-            // .ignoreElements()
-            .andThen(Observable.defer { Observable.fromIterable(repository.compatGetTemporaryTargetData().blockingGet()) })
-            .map { enqueueTempTarget(it); increaseCounter() }
-            .ignoreElements()
-            .doOnSubscribe {
-                wakeLock.acquire(TimeUnit.MINUTES.toMillis(30))
-                showOngoingNotification()
-            }
-            .doOnComplete {
-                isSetup = true
-                scheduleWorker(false)
-                showSetupFinishedNotification()
-            }
-            .doOnError {
-                logout()
-                showSetupFailedNotification()
-            }
-            .doFinally {
-                copyDisposable = null
-                NotificationManagerCompat.from(context).cancel(COPY_NOTIFICATION_ID)
-                wakeLock.release()
-            }
-            .onErrorComplete()
-            .subscribeOn(aapsSchedulers.io)
-            .subscribe()
-    }
-
-    private fun showOngoingNotification(maxProgress: Long? = null, currentProgress: Long? = null) {
-        val notification = NotificationCompat.Builder(context, NOTIFICATION_CHANNEL)
-            .setContentTitle(resourceHelper.gs(R.string.finishing_open_humans_setup))
-            .setContentText(resourceHelper.gs(R.string.this_may_take_a_while))
-            .setStyle(NotificationCompat.BigTextStyle())
-            .setProgress(maxProgress?.toInt() ?: 0, currentProgress?.toInt()
-                ?: 0, maxProgress == null || currentProgress == null)
-            .setOngoing(true)
-            .setAutoCancel(false)
-            .setSmallIcon(R.drawable.notif_icon)
-            .build()
-        NotificationManagerCompat.from(context).notify(COPY_NOTIFICATION_ID, notification)
-    }
-
-    private fun showSetupFinishedNotification() {
-        val notification = NotificationCompat.Builder(context, NOTIFICATION_CHANNEL)
-            .setContentTitle(resourceHelper.gs(R.string.setup_finished))
-            .setContentText(resourceHelper.gs(R.string.your_phone_will_upload_data))
-            .setStyle(NotificationCompat.BigTextStyle())
-            .setSmallIcon(R.drawable.notif_icon)
-            .build()
-        val notificationManager = NotificationManagerCompat.from(context)
-        notificationManager.notify(SUCCESS_NOTIFICATION_ID, notification)
-    }
-
-    private fun showSetupFailedNotification() {
-        val notification = NotificationCompat.Builder(context, NOTIFICATION_CHANNEL)
-            .setContentTitle(resourceHelper.gs(R.string.setup_failed))
-            .setContentText(resourceHelper.gs(R.string.there_was_an_error))
-            .setStyle(NotificationCompat.BigTextStyle())
-            .setSmallIcon(R.drawable.notif_icon)
-            .build()
-        val notificationManager = NotificationManagerCompat.from(context)
-        notificationManager.notify(FAILURE_NOTIFICATION_ID, notification)
-    }
-
-    @kotlin.ExperimentalStdlibApi
-    fun uploadDataSegmentally(): Completable =
-        uploadData(UPLOAD_SEGMENT_SIZE)
-            .repeatUntil { databaseHelper.getOHQueueSize() == 0L }
-            .doOnSubscribe {
-                aapsLogger.info(LTag.OHUPLOADER, "Starting segmental upload")
-            }
-            .doOnComplete {
-                aapsLogger.info(LTag.OHUPLOADER, "Segmental upload successful")
-            }
-            .doOnError {
-                aapsLogger.error(LTag.OHUPLOADER, "Segmental upload exceptional", it)
-            }
-
-    @kotlin.ExperimentalStdlibApi
-    @Suppress("SameParameterValue")
-    private fun uploadData(maxEntries: Long): Completable = gatherData(maxEntries)
-        .flatMap { data -> refreshAccessTokensIfNeeded().map { accessToken -> accessToken to data } }
-        .flatMap { uploadFile(it.first, it.second).andThen(Single.just(it.second)) }
-        .flatMapCompletable {
-            if (it.highestQueueId != null) {
-                removeUploadedEntriesFromQueue(it.highestQueueId)
-            } else {
-                Completable.complete()
-            }
-        }
-        .doOnError {
-            if (it is OpenHumansAPI.OHHttpException && it.code == 401 && it.detail == "Invalid token.") {
-                handleSignOut()
-            }
-            aapsLogger.error("Error while uploading to Open Humans", it)
-        }
-        .doOnComplete {
-            aapsLogger.info(LTag.OHUPLOADER, "Upload successful")
-            rxBus.send(OpenHumansFragment.UpdateQueueEvent)
-        }
-        .doOnSubscribe {
-            aapsLogger.info(LTag.OHUPLOADER, "Starting upload")
-        }
-
-    private fun uploadFile(accessToken: String, uploadData: UploadData) = Completable.defer {
-        openHumansAPI.prepareFileUpload(accessToken, uploadData.fileName, uploadData.metadata)
-            .flatMap { openHumansAPI.uploadFile(it.uploadURL, uploadData.content).andThen(Single.just(it.fileId)) }
-            .flatMapCompletable { openHumansAPI.completeFileUpload(accessToken, it) }
-    }
-
-    private fun refreshAccessTokensIfNeeded() = Single.defer {
-        val oAuthTokens = this.oAuthTokens!!
-        if (oAuthTokens.expiresAt <= System.currentTimeMillis() - TimeUnit.HOURS.toMillis(1)) {
-            openHumansAPI.refreshAccessToken(oAuthTokens.refreshToken)
-                .doOnSuccess { this.oAuthTokens = it }
-                .map { it.accessToken }
-        } else {
-            Single.just(oAuthTokens.accessToken)
-        }
-    }
-
-    @kotlin.ExperimentalStdlibApi
-    private fun gatherData(maxEntries: Long) = Single.defer {
-        val items = databaseHelper.getAllOHQueueItems(maxEntries)
-        val baos = ByteArrayOutputStream()
-        val zos = ZipOutputStream(baos)
-        val tags = mutableListOf<String>()
-
-        items.groupBy { it.file }.forEach { entry ->
-            tags.add(entry.key)
-            val jsonArray = JSONArray()
-            entry.value.map { it.content }.forEach { jsonArray.put(JSONObject(it)) }
-            zos.writeFile("${entry.key}.json", jsonArray.toString().toByteArray())
-        }
-
-        val applicationInfo = JSONObject()
-        applicationInfo.put("versionName", BuildConfig.VERSION_NAME)
-        applicationInfo.put("versionCode", BuildConfig.VERSION_CODE)
-        val hasGitInfo = !BuildConfig.HEAD.endsWith("NoGitSystemAvailable", true)
-        val customRemote = !BuildConfig.REMOTE.equals("https://github.com/nightscout/AndroidAPS.git", true)
-        applicationInfo.put("hasGitInfo", hasGitInfo)
-        applicationInfo.put("customRemote", customRemote)
-        applicationInfo.put("applicationId", appId.toString())
-        zos.writeFile("ApplicationInfo.json", applicationInfo.toString().toByteArray())
-        tags.add("ApplicationInfo")
-
-        val preferences = JSONObject(sp.getAll().filterKeys { it.isAllowedKey() })
-        zos.writeFile("Preferences.json", preferences.toString().toByteArray())
-        tags.add("Preferences")
-
-        val deviceInfo = JSONObject()
-        deviceInfo.put("brand", Build.BRAND)
-        deviceInfo.put("device", Build.DEVICE)
-        deviceInfo.put("manufacturer", Build.MANUFACTURER)
-        deviceInfo.put("model", Build.MODEL)
-        deviceInfo.put("product", Build.PRODUCT)
-        zos.writeFile("DeviceInfo.json", deviceInfo.toString().toByteArray())
-        tags.add("DeviceInfo")
-
-        val displayMetrics = DisplayMetrics()
-        (context.getSystemService(Context.WINDOW_SERVICE) as WindowManager).defaultDisplay.getMetrics(displayMetrics)
-        val displayInfo = JSONObject()
-        displayInfo.put("height", displayMetrics.heightPixels)
-        displayInfo.put("width", displayMetrics.widthPixels)
-        displayInfo.put("density", displayMetrics.density)
-        displayInfo.put("scaledDensity", displayMetrics.scaledDensity)
-        displayInfo.put("xdpi", displayMetrics.xdpi)
-        displayInfo.put("ydpi", displayMetrics.ydpi)
-        zos.writeFile("DisplayInfo.json", displayInfo.toString().toByteArray())
-        tags.add("DisplayInfo")
-
-        val uploadNumber = this.uploadCounter++
-        val uploadDate = Date()
-        val uploadInfo = JSONObject()
-        uploadInfo.put("fileVersion", 1)
-        uploadInfo.put("counter", uploadNumber)
-        uploadInfo.put("timestamp", uploadDate.time)
-        uploadInfo.put("utcOffset", TimeZone.getDefault().getOffset(uploadDate.time))
-        zos.writeFile("UploadInfo.json", uploadInfo.toString().toByteArray())
-        tags.add("UploadInfo")
-
-        zos.close()
-        val bytes = baos.toByteArray()
-
-        Single.just(UploadData(
-            fileName = "upload-num$uploadNumber-ver1-date${FILE_NAME_DATE_FORMAT.format(uploadDate)}-appid${appId.toString().replace("-", "")}.zip",
-            metadata = OpenHumansAPI.FileMetadata(
-                tags = tags,
-                description = "AndroidAPS Database Upload",
-                md5 = MessageDigest.getInstance("MD5").digest(bytes).toHexString(),
-                creationDate = uploadDate.time
-            ),
-            content = bytes,
-            highestQueueId = items.map { it.id }.maxOrNull()
-        ))
-    }
-
-    private fun ZipOutputStream.writeFile(name: String, bytes: ByteArray) {
-        putNextEntry(ZipEntry(name))
-        write(bytes)
-        closeEntry()
-    }
-
-    private fun removeUploadedEntriesFromQueue(highestId: Long) = Completable.fromCallable {
-        databaseHelper.removeAllOHQueueItemsWithIdSmallerThan(highestId)
-    }
-
-    private fun handleSignOut() {
-        val notification = NotificationCompat.Builder(context, NOTIFICATION_CHANNEL)
-            .setContentTitle(resourceHelper.gs(R.string.you_have_been_signed_out_of_open_humans))
-            .setContentText(resourceHelper.gs(R.string.click_here_to_sign_in_again_if_this_wasnt_on_purpose))
-            .setStyle(NotificationCompat.BigTextStyle())
-            .setSmallIcon(R.drawable.notif_icon)
-            .setAutoCancel(true)
-            .setContentIntent(PendingIntent.getActivity(
-                context,
-                0,
-                Intent(context, OpenHumansLoginActivity::class.java).apply {
-                    flags = Intent.FLAG_ACTIVITY_CLEAR_TOP
-                },
-                0
-            ))
-            .build()
-        NotificationManagerCompat.from(context).notify(SIGNED_OUT_NOTIFICATION_ID, notification)
-        logout()
-    }
-
-    private fun cancelWorker() {
-        WorkManager.getInstance(context).cancelUniqueWork(WORK_NAME)
-    }
-
-    private fun scheduleWorker(replace: Boolean) {
-        val constraints = Constraints.Builder()
-            .setRequiredNetworkType(NetworkType.CONNECTED)
-            .setRequiresCharging(sp.getBoolean("key_oh_charging_only", false))
-            .build()
-        val workRequest = PeriodicWorkRequestBuilder<OHUploadWorker>(1, TimeUnit.DAYS)
-            .setConstraints(constraints)
-            .setBackoffCriteria(BackoffPolicy.LINEAR, 20, TimeUnit.MINUTES)
-            .build()
-        WorkManager.getInstance(context).enqueueUniquePeriodicWork(WORK_NAME, if (replace) ExistingPeriodicWorkPolicy.REPLACE else ExistingPeriodicWorkPolicy.KEEP, workRequest)
-    }
-
-    private fun setupNotificationChannel() {
-        val notificationManagerCompat = NotificationManagerCompat.from(context)
-        notificationManagerCompat.createNotificationChannel(NotificationChannel(
-            NOTIFICATION_CHANNEL,
-            resourceHelper.gs(R.string.open_humans),
-            NotificationManager.IMPORTANCE_DEFAULT
-        ))
-    }
-
-    private class UploadData(
-        val fileName: String,
-        val metadata: OpenHumansAPI.FileMetadata,
-        val content: ByteArray,
-        val highestQueueId: Long?
-    )
-
-    @Suppress("PrivatePropertyName")
-    private val HEX_DIGITS = "0123456789ABCDEF".toCharArray()
-
-    private fun ByteArray.toHexString(): String {
-        val stringBuilder = StringBuilder()
-        map { it.toInt() }.forEach {
-            stringBuilder.append(HEX_DIGITS[(it shr 4) and 0x0F])
-            stringBuilder.append(HEX_DIGITS[it and 0x0F])
-        }
-        return stringBuilder.toString()
-    }
-
-    private fun onSharedPreferenceChanged(event: EventPreferenceChange) {
-        if (event.changedKey == "key_oh_charging_only" && isSetup) scheduleWorker(true)
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewData.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewData.kt
index d5f64cc96e..2cdd860ce3 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewData.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewData.kt
@@ -1,46 +1,56 @@
 package info.nightscout.androidaps.plugins.general.overview
 
+import android.graphics.DashPathEffect
+import android.graphics.Paint
 import com.jjoe64.graphview.series.BarGraphSeries
 import com.jjoe64.graphview.series.DataPoint
 import com.jjoe64.graphview.series.LineGraphSeries
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.data.IobTotal
-import info.nightscout.androidaps.database.entities.ExtendedBolus
-import info.nightscout.androidaps.database.entities.GlucoseValue
-import info.nightscout.androidaps.database.entities.TemporaryBasal
-import info.nightscout.androidaps.database.entities.TemporaryTarget
-import info.nightscout.androidaps.extensions.convertedToPercent
-import info.nightscout.androidaps.extensions.toStringFull
-import info.nightscout.androidaps.extensions.toStringShort
-import info.nightscout.androidaps.extensions.valueToUnits
-import info.nightscout.androidaps.interfaces.ActivePlugin
-import info.nightscout.androidaps.interfaces.Profile
-import info.nightscout.androidaps.interfaces.ProfileFunction
-import info.nightscout.androidaps.plugins.general.overview.graphExtensions.DataPointWithLabelInterface
-import info.nightscout.androidaps.plugins.general.overview.graphExtensions.FixedLineGraphSeries
-import info.nightscout.androidaps.plugins.general.overview.graphExtensions.PointsWithLabelGraphSeries
-import info.nightscout.androidaps.plugins.general.overview.graphExtensions.Scale
-import info.nightscout.androidaps.plugins.general.overview.graphExtensions.ScaledDataPoint
+import info.nightscout.androidaps.database.AppRepository
+import info.nightscout.androidaps.database.ValueWrapper
+import info.nightscout.androidaps.database.entities.*
+import info.nightscout.androidaps.extensions.*
+import info.nightscout.androidaps.interfaces.*
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.aps.loop.LoopPlugin
+import info.nightscout.androidaps.plugins.aps.openAPSSMB.SMBDefaults
+import info.nightscout.androidaps.plugins.general.nsclient.data.NSDeviceStatus
+import info.nightscout.androidaps.plugins.general.overview.graphExtensions.*
+import info.nightscout.androidaps.plugins.iob.iobCobCalculator.AutosensResult
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.CobInfo
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.data.AutosensData
-import info.nightscout.androidaps.utils.DateUtil
-import info.nightscout.androidaps.utils.DefaultValueHelper
-import info.nightscout.androidaps.utils.T
+import info.nightscout.androidaps.utils.*
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import info.nightscout.androidaps.utils.sharedPreferences.SP
 import java.util.*
 import javax.inject.Inject
 import javax.inject.Singleton
 import kotlin.collections.ArrayList
+import kotlin.math.abs
+import kotlin.math.ceil
+import kotlin.math.max
+import kotlin.math.min
 
 @Singleton
 class OverviewData @Inject constructor(
+    private val injector: HasAndroidInjector,
+    private val aapsLogger: AAPSLogger,
     private val resourceHelper: ResourceHelper,
     private val dateUtil: DateUtil,
     private val sp: SP,
     private val activePlugin: ActivePlugin,
     private val defaultValueHelper: DefaultValueHelper,
-    private val profileFunction: ProfileFunction
+    private val profileFunction: ProfileFunction,
+    private val config: Config,
+    private val loopPlugin: LoopPlugin,
+    private val nsDeviceStatus: NSDeviceStatus,
+    private val repository: AppRepository,
+    private val overviewMenus: OverviewMenus,
+    private val iobCobCalculator: IobCobCalculator,
+    private val translator: Translator
 ) {
 
     enum class Property {
@@ -53,7 +63,8 @@ class OverviewData @Inject constructor(
         BG,
         IOB_COB,
         SENSITIVITY,
-        GRAPH
+        GRAPH,
+        PUMPSTATUS
     }
 
     var rangeToDisplay = 6 // for graph
@@ -61,6 +72,42 @@ class OverviewData @Inject constructor(
     var fromTime: Long = 0
     var endTime: Long = 0
 
+    fun reset() {
+        pumpStatus = ""
+        calcProgress = ""
+        lastBg = null
+        temporaryBasal = null
+        extendedBolus = null
+        bolusIob = null
+        basalIob = null
+        cobInfo = null
+        lastCarbsTime = 0L
+        temporaryTarget = null
+        lastAutosensData = null
+        bgReadingsArray = ArrayList()
+        bucketedGraphSeries = PointsWithLabelGraphSeries()
+        bgReadingGraphSeries = PointsWithLabelGraphSeries()
+        predictionsGraphSeries = PointsWithLabelGraphSeries()
+        baseBasalGraphSeries = LineGraphSeries()
+        tempBasalGraphSeries = LineGraphSeries()
+        basalLineGraphSeries = LineGraphSeries()
+        absoluteBasalGraphSeries = LineGraphSeries()
+        activitySeries = FixedLineGraphSeries()
+        activityPredictionSeries = FixedLineGraphSeries()
+        iobSeries = FixedLineGraphSeries()
+        absIobSeries = FixedLineGraphSeries()
+        iobPredictions1Series = PointsWithLabelGraphSeries()
+        iobPredictions2Series = PointsWithLabelGraphSeries()
+        minusBgiSeries = FixedLineGraphSeries()
+        minusBgiHistSeries = FixedLineGraphSeries()
+        cobSeries = FixedLineGraphSeries()
+        cobMinFailOverSeries = PointsWithLabelGraphSeries()
+        deviationsSeries = BarGraphSeries()
+        ratioSeries = LineGraphSeries()
+        dsMaxSeries = LineGraphSeries()
+        dsMinSeries = LineGraphSeries()
+    }
+
     fun initRange() {
         rangeToDisplay = sp.getInt(R.string.key_rangetodisplay, 6)
 
@@ -78,25 +125,10 @@ class OverviewData @Inject constructor(
     }
 
     /*
-     * PROFILE
+     * PUMP STATUS
      */
-    var profile: Profile? = null
-    var profileName: String? = null
-    var profileNameWithRemainingTime: String? = null
 
-    val profileBackgroudColor: Int
-        get() =
-            profile?.let { profile ->
-                if (profile.percentage != 100 || profile.timeshift != 0) resourceHelper.gc(R.color.ribbonWarning)
-                else resourceHelper.gc(R.color.ribbonDefault)
-            } ?: resourceHelper.gc(R.color.ribbonTextDefault)
-
-    val profileTextColor: Int
-        get() =
-            profile?.let { profile ->
-                if (profile.percentage != 100 || profile.timeshift != 0) resourceHelper.gc(R.color.ribbonTextWarning)
-                else resourceHelper.gc(R.color.ribbonTextDefault)
-            } ?: resourceHelper.gc(R.color.ribbonTextDefault)
+    var pumpStatus: String = ""
 
     /*
      * CALC PROGRESS
@@ -133,13 +165,14 @@ class OverviewData @Inject constructor(
 
     val temporaryBasalText: String
         get() =
-            profile?.let { profile ->
+            profileFunction.getProfile()?.let { profile ->
+                if (temporaryBasal?.isInProgress == false) temporaryBasal = null
                 temporaryBasal?.let { "T:" + it.toStringShort() }
                     ?: resourceHelper.gs(R.string.pump_basebasalrate, profile.getBasal())
             } ?: resourceHelper.gs(R.string.notavailable)
 
     val temporaryBasalDialogText: String
-        get() = profile?.let { profile ->
+        get() = profileFunction.getProfile()?.let { profile ->
             temporaryBasal?.let { temporaryBasal ->
                 "${resourceHelper.gs(R.string.basebasalrate_label)}: ${resourceHelper.gs(R.string.pump_basebasalrate, profile.getBasal())}" +
                     "\n" + resourceHelper.gs(R.string.tempbasal_label) + ": " + temporaryBasal.toStringFull(profile, dateUtil)
@@ -149,7 +182,7 @@ class OverviewData @Inject constructor(
 
     val temporaryBasalIcon: Int
         get() =
-            profile?.let { profile ->
+            profileFunction.getProfile()?.let { profile ->
                 temporaryBasal?.let { temporaryBasal ->
                     val percentRate = temporaryBasal.convertedToPercent(dateUtil.now(), profile)
                     when {
@@ -173,7 +206,10 @@ class OverviewData @Inject constructor(
     val extendedBolusText: String
         get() =
             extendedBolus?.let { extendedBolus ->
-                if (activePlugin.activePump.isFakingTempsByExtendedBoluses) resourceHelper.gs(R.string.pump_basebasalrate, extendedBolus.rate)
+                if (!extendedBolus.isInProgress(dateUtil)) {
+                    this@OverviewData.extendedBolus = null
+                    ""
+                } else if (!activePlugin.activePump.isFakingTempsByExtendedBoluses) resourceHelper.gs(R.string.pump_basebasalrate, extendedBolus.rate)
                 else ""
             } ?: ""
 
@@ -211,7 +247,7 @@ class OverviewData @Inject constructor(
      * TEMP TARGET
      */
 
-    var temporarytarget: TemporaryTarget? = null
+    var temporaryTarget: TemporaryTarget? = null
 
     /*
      * SENSITIVITY
@@ -278,4 +314,520 @@ class OverviewData @Inject constructor(
     var dsMaxSeries: LineGraphSeries<ScaledDataPoint> = LineGraphSeries()
     var dsMinSeries: LineGraphSeries<ScaledDataPoint> = LineGraphSeries()
 
+    @Synchronized
+    @Suppress("SameParameterValue", "UNUSED_PARAMETER")
+    fun prepareBgData(from: String) {
+//        val start = dateUtil.now()
+        maxBgValue = Double.MIN_VALUE
+        bgReadingsArray = repository.compatGetBgReadingsDataFromTime(fromTime, toTime, false).blockingGet()
+        val bgListArray: MutableList<DataPointWithLabelInterface> = java.util.ArrayList()
+        for (bg in bgReadingsArray) {
+            if (bg.timestamp < fromTime || bg.timestamp > toTime) continue
+            if (bg.value > maxBgValue) maxBgValue = bg.value
+            bgListArray.add(GlucoseValueDataPoint(bg, defaultValueHelper, profileFunction, resourceHelper))
+        }
+        bgReadingGraphSeries = PointsWithLabelGraphSeries(Array(bgListArray.size) { i -> bgListArray[i] })
+        maxBgValue = Profile.fromMgdlToUnits(maxBgValue, profileFunction.getUnits())
+        if (defaultValueHelper.determineHighLine() > maxBgValue) maxBgValue = defaultValueHelper.determineHighLine()
+        maxBgValue = addUpperChartMargin(maxBgValue)
+//        profiler.log(LTag.UI, "prepareBgData() $from", start)
+    }
+
+    @Suppress("UNUSED_PARAMETER")
+    @Synchronized
+    fun preparePredictions(from: String) {
+//        val start = dateUtil.now()
+        val apsResult = if (config.APS) loopPlugin.lastRun?.constraintsProcessed else nsDeviceStatus.getAPSResult(injector)
+        val predictionsAvailable = if (config.APS) loopPlugin.lastRun?.request?.hasPredictions == true else config.NSCLIENT
+        val menuChartSettings = overviewMenus.setting
+        // align to hours
+        val calendar = Calendar.getInstance().also {
+            it.timeInMillis = System.currentTimeMillis()
+            it[Calendar.MILLISECOND] = 0
+            it[Calendar.SECOND] = 0
+            it[Calendar.MINUTE] = 0
+            it.add(Calendar.HOUR, 1)
+        }
+        if (predictionsAvailable && apsResult != null && menuChartSettings[0][OverviewMenus.CharType.PRE.ordinal]) {
+            var predictionHours = (ceil(apsResult.latestPredictionsTime - System.currentTimeMillis().toDouble()) / (60 * 60 * 1000)).toInt()
+            predictionHours = min(2, predictionHours)
+            predictionHours = max(0, predictionHours)
+            val hoursToFetch = rangeToDisplay - predictionHours
+            toTime = calendar.timeInMillis + 100000 // little bit more to avoid wrong rounding - GraphView specific
+            fromTime = toTime - T.hours(hoursToFetch.toLong()).msecs()
+            endTime = toTime + T.hours(predictionHours.toLong()).msecs()
+        } else {
+            toTime = calendar.timeInMillis + 100000 // little bit more to avoid wrong rounding - GraphView specific
+            fromTime = toTime - T.hours(rangeToDisplay.toLong()).msecs()
+            endTime = toTime
+        }
+
+        val bgListArray: MutableList<DataPointWithLabelInterface> = java.util.ArrayList()
+        val predictions: MutableList<GlucoseValueDataPoint>? = apsResult?.predictions
+            ?.map { bg -> GlucoseValueDataPoint(bg, defaultValueHelper, profileFunction, resourceHelper) }
+            ?.toMutableList()
+        if (predictions != null) {
+            predictions.sortWith { o1: GlucoseValueDataPoint, o2: GlucoseValueDataPoint -> o1.x.compareTo(o2.x) }
+            for (prediction in predictions) if (prediction.data.value >= 40) bgListArray.add(prediction)
+        }
+        predictionsGraphSeries = PointsWithLabelGraphSeries(Array(bgListArray.size) { i -> bgListArray[i] })
+//        profiler.log(LTag.UI, "preparePredictions() $from", start)
+    }
+
+    @Synchronized
+    @Suppress("SameParameterValue", "UNUSED_PARAMETER")
+    fun prepareBucketedData(from: String) {
+//        val start = dateUtil.now()
+        val bucketedData = iobCobCalculator.ads.getBucketedDataTableCopy() ?: return
+        if (bucketedData.isEmpty()) {
+            aapsLogger.debug("No bucketed data.")
+            return
+        }
+        val bucketedListArray: MutableList<DataPointWithLabelInterface> = java.util.ArrayList()
+        for (inMemoryGlucoseValue in bucketedData) {
+            if (inMemoryGlucoseValue.timestamp < fromTime || inMemoryGlucoseValue.timestamp > toTime) continue
+            bucketedListArray.add(InMemoryGlucoseValueDataPoint(inMemoryGlucoseValue, profileFunction, resourceHelper))
+        }
+        bucketedGraphSeries = PointsWithLabelGraphSeries(Array(bucketedListArray.size) { i -> bucketedListArray[i] })
+//        profiler.log(LTag.UI, "prepareBucketedData() $from", start)
+    }
+
+    @Suppress("UNUSED_PARAMETER")
+    @Synchronized
+    fun prepareBasalData(from: String) {
+//        val start = dateUtil.now()
+        maxBasalValueFound = 0.0
+        val baseBasalArray: MutableList<ScaledDataPoint> = java.util.ArrayList()
+        val tempBasalArray: MutableList<ScaledDataPoint> = java.util.ArrayList()
+        val basalLineArray: MutableList<ScaledDataPoint> = java.util.ArrayList()
+        val absoluteBasalLineArray: MutableList<ScaledDataPoint> = java.util.ArrayList()
+        var lastLineBasal = 0.0
+        var lastAbsoluteLineBasal = -1.0
+        var lastBaseBasal = 0.0
+        var lastTempBasal = 0.0
+        var time = fromTime
+        while (time < toTime) {
+            val profile = profileFunction.getProfile(time)
+            if (profile == null) {
+                time += 60 * 1000L
+                continue
+            }
+            val basalData = iobCobCalculator.getBasalData(profile, time)
+            val baseBasalValue = basalData.basal
+            var absoluteLineValue = baseBasalValue
+            var tempBasalValue = 0.0
+            var basal = 0.0
+            if (basalData.isTempBasalRunning) {
+                tempBasalValue = basalData.tempBasalAbsolute
+                absoluteLineValue = tempBasalValue
+                if (tempBasalValue != lastTempBasal) {
+                    tempBasalArray.add(ScaledDataPoint(time, lastTempBasal, basalScale))
+                    tempBasalArray.add(ScaledDataPoint(time, tempBasalValue.also { basal = it }, basalScale))
+                }
+                if (lastBaseBasal != 0.0) {
+                    baseBasalArray.add(ScaledDataPoint(time, lastBaseBasal, basalScale))
+                    baseBasalArray.add(ScaledDataPoint(time, 0.0, basalScale))
+                    lastBaseBasal = 0.0
+                }
+            } else {
+                if (baseBasalValue != lastBaseBasal) {
+                    baseBasalArray.add(ScaledDataPoint(time, lastBaseBasal, basalScale))
+                    baseBasalArray.add(ScaledDataPoint(time, baseBasalValue.also { basal = it }, basalScale))
+                    lastBaseBasal = baseBasalValue
+                }
+                if (lastTempBasal != 0.0) {
+                    tempBasalArray.add(ScaledDataPoint(time, lastTempBasal, basalScale))
+                    tempBasalArray.add(ScaledDataPoint(time, 0.0, basalScale))
+                }
+            }
+            if (baseBasalValue != lastLineBasal) {
+                basalLineArray.add(ScaledDataPoint(time, lastLineBasal, basalScale))
+                basalLineArray.add(ScaledDataPoint(time, baseBasalValue, basalScale))
+            }
+            if (absoluteLineValue != lastAbsoluteLineBasal) {
+                absoluteBasalLineArray.add(ScaledDataPoint(time, lastAbsoluteLineBasal, basalScale))
+                absoluteBasalLineArray.add(ScaledDataPoint(time, basal, basalScale))
+            }
+            lastAbsoluteLineBasal = absoluteLineValue
+            lastLineBasal = baseBasalValue
+            lastTempBasal = tempBasalValue
+            maxBasalValueFound = max(maxBasalValueFound, max(tempBasalValue, baseBasalValue))
+            time += 60 * 1000L
+        }
+
+        // final points
+        basalLineArray.add(ScaledDataPoint(toTime, lastLineBasal, basalScale))
+        baseBasalArray.add(ScaledDataPoint(toTime, lastBaseBasal, basalScale))
+        tempBasalArray.add(ScaledDataPoint(toTime, lastTempBasal, basalScale))
+        absoluteBasalLineArray.add(ScaledDataPoint(toTime, lastAbsoluteLineBasal, basalScale))
+
+        // create series
+        baseBasalGraphSeries = LineGraphSeries(Array(baseBasalArray.size) { i -> baseBasalArray[i] }).also {
+            it.isDrawBackground = true
+            it.backgroundColor = resourceHelper.gc(R.color.basebasal)
+            it.thickness = 0
+        }
+        tempBasalGraphSeries = LineGraphSeries(Array(tempBasalArray.size) { i -> tempBasalArray[i] }).also {
+            it.isDrawBackground = true
+            it.backgroundColor = resourceHelper.gc(R.color.tempbasal)
+            it.thickness = 0
+        }
+        basalLineGraphSeries = LineGraphSeries(Array(basalLineArray.size) { i -> basalLineArray[i] }).also {
+            it.setCustomPaint(Paint().also { paint ->
+                paint.style = Paint.Style.STROKE
+                paint.strokeWidth = resourceHelper.getDisplayMetrics().scaledDensity * 2
+                paint.pathEffect = DashPathEffect(floatArrayOf(2f, 4f), 0f)
+                paint.color = resourceHelper.gc(R.color.basal)
+            })
+        }
+        absoluteBasalGraphSeries = LineGraphSeries(Array(absoluteBasalLineArray.size) { i -> absoluteBasalLineArray[i] }).also {
+            it.setCustomPaint(Paint().also { absolutePaint ->
+                absolutePaint.style = Paint.Style.STROKE
+                absolutePaint.strokeWidth = resourceHelper.getDisplayMetrics().scaledDensity * 2
+                absolutePaint.color = resourceHelper.gc(R.color.basal)
+            })
+        }
+//        profiler.log(LTag.UI, "prepareBasalData() $from", start)
+    }
+
+    @Suppress("UNUSED_PARAMETER")
+    @Synchronized
+    fun prepareTemporaryTargetData(from: String) {
+//        val start = dateUtil.now()
+        val profile = profileFunction.getProfile() ?: return
+        val units = profileFunction.getUnits()
+        var toTime = toTime
+        val targetsSeriesArray: MutableList<DataPoint> = java.util.ArrayList()
+        var lastTarget = -1.0
+        loopPlugin.lastRun?.constraintsProcessed?.let { toTime = max(it.latestPredictionsTime, toTime) }
+        var time = fromTime
+        while (time < toTime) {
+            val tt = repository.getTemporaryTargetActiveAt(time).blockingGet()
+            val value: Double = if (tt is ValueWrapper.Existing) {
+                Profile.fromMgdlToUnits(tt.value.target(), units)
+            } else {
+                Profile.fromMgdlToUnits((profile.getTargetLowMgdl(time) + profile.getTargetHighMgdl(time)) / 2, units)
+            }
+            if (lastTarget != value) {
+                if (lastTarget != -1.0) targetsSeriesArray.add(DataPoint(time.toDouble(), lastTarget))
+                targetsSeriesArray.add(DataPoint(time.toDouble(), value))
+            }
+            lastTarget = value
+            time += 5 * 60 * 1000L
+        }
+        // final point
+        targetsSeriesArray.add(DataPoint(toTime.toDouble(), lastTarget))
+        // create series
+        temporaryTargetSeries = LineGraphSeries(Array(targetsSeriesArray.size) { i -> targetsSeriesArray[i] }).also {
+            it.isDrawBackground = false
+            it.color = resourceHelper.gc(R.color.tempTargetBackground)
+            it.thickness = 2
+        }
+//        profiler.log(LTag.UI, "prepareTemporaryTargetData() $from", start)
+    }
+
+    @Suppress("UNUSED_PARAMETER")
+    @Synchronized
+    fun prepareTreatmentsData(from: String) {
+//        val start = dateUtil.now()
+        maxTreatmentsValue = 0.0
+        val filteredTreatments: MutableList<DataPointWithLabelInterface> = java.util.ArrayList()
+        repository.getBolusesDataFromTimeToTime(fromTime, endTime, true).blockingGet()
+            .map { BolusDataPoint(it, resourceHelper, activePlugin, defaultValueHelper) }
+            .filter { it.data.type == Bolus.Type.NORMAL || it.data.type == Bolus.Type.SMB }
+            .forEach {
+                it.y = getNearestBg(it.x.toLong())
+                filteredTreatments.add(it)
+            }
+        repository.getCarbsDataFromTimeToTimeExpanded(fromTime, endTime, true).blockingGet()
+            .map { CarbsDataPoint(it, resourceHelper) }
+            .forEach {
+                it.y = getNearestBg(it.x.toLong())
+                filteredTreatments.add(it)
+            }
+
+        // ProfileSwitch
+        repository.getEffectiveProfileSwitchDataFromTimeToTime(fromTime, endTime, true).blockingGet()
+            .map { EffectiveProfileSwitchDataPoint(it) }
+            .forEach(filteredTreatments::add)
+
+        // OfflineEvent
+        repository.getOfflineEventDataFromTimeToTime(fromTime, endTime, true).blockingGet()
+            .map { TherapyEventDataPoint(TherapyEvent(timestamp = it.timestamp, duration = it.duration, type = TherapyEvent.Type.APS_OFFLINE, glucoseUnit = TherapyEvent.GlucoseUnit.MMOL), resourceHelper, profileFunction, translator) }
+            .forEach(filteredTreatments::add)
+
+        // Extended bolus
+        if (!activePlugin.activePump.isFakingTempsByExtendedBoluses) {
+            repository.getExtendedBolusDataFromTimeToTime(fromTime, endTime, true).blockingGet()
+                .map { ExtendedBolusDataPoint(it) }
+                .filter { it.duration != 0L }
+                .forEach {
+                    it.y = getNearestBg(it.x.toLong())
+                    filteredTreatments.add(it)
+                }
+        }
+
+        // Careportal
+        repository.compatGetTherapyEventDataFromToTime(fromTime - T.hours(6).msecs(), endTime).blockingGet()
+            .map { TherapyEventDataPoint(it, resourceHelper, profileFunction, translator) }
+            .filterTimeframe(fromTime, endTime)
+            .forEach {
+                if (it.y == 0.0) it.y = getNearestBg(it.x.toLong())
+                filteredTreatments.add(it)
+            }
+
+        // increase maxY if a treatment forces it's own height that's higher than a BG value
+        filteredTreatments.map { it.y }
+            .maxOrNull()
+            ?.let(::addUpperChartMargin)
+            ?.let { maxTreatmentsValue = maxOf(maxTreatmentsValue, it) }
+
+        treatmentsSeries = PointsWithLabelGraphSeries(filteredTreatments.toTypedArray())
+//        profiler.log(LTag.UI, "prepareTreatmentsData() $from", start)
+    }
+
+    @Suppress("UNUSED_PARAMETER")
+    @Synchronized
+    fun prepareIobAutosensData(from: String) {
+//        val start = dateUtil.now()
+        val iobArray: MutableList<ScaledDataPoint> = java.util.ArrayList()
+        val absIobArray: MutableList<ScaledDataPoint> = java.util.ArrayList()
+        maxIobValueFound = Double.MIN_VALUE
+        var lastIob = 0.0
+        var absLastIob = 0.0
+        var time = fromTime
+
+        val minFailOverActiveList: MutableList<DataPointWithLabelInterface> = java.util.ArrayList()
+        val cobArray: MutableList<ScaledDataPoint> = java.util.ArrayList()
+        maxCobValueFound = Double.MIN_VALUE
+        var lastCob = 0
+
+        val actArrayHist: MutableList<ScaledDataPoint> = java.util.ArrayList()
+        val actArrayPrediction: MutableList<ScaledDataPoint> = java.util.ArrayList()
+        val now = dateUtil.now().toDouble()
+        maxIAValue = 0.0
+
+        val bgiArrayHist: MutableList<ScaledDataPoint> = java.util.ArrayList()
+        val bgiArrayPrediction: MutableList<ScaledDataPoint> = java.util.ArrayList()
+        maxBGIValue = Double.MIN_VALUE
+
+        val devArray: MutableList<OverviewPlugin.DeviationDataPoint> = java.util.ArrayList()
+        maxDevValueFound = Double.MIN_VALUE
+
+        val ratioArray: MutableList<ScaledDataPoint> = java.util.ArrayList()
+        maxRatioValueFound = 5.0                    //even if sens data equals 0 for all the period, minimum scale is between 95% and 105%
+        minRatioValueFound = -5.0
+
+        val dsMaxArray: MutableList<ScaledDataPoint> = java.util.ArrayList()
+        val dsMinArray: MutableList<ScaledDataPoint> = java.util.ArrayList()
+        maxFromMaxValueFound = Double.MIN_VALUE
+        maxFromMinValueFound = Double.MIN_VALUE
+
+        val adsData = iobCobCalculator.ads.clone()
+
+        while (time <= toTime) {
+            val profile = profileFunction.getProfile(time)
+            if (profile == null) {
+                time += 5 * 60 * 1000L
+                continue
+            }
+            // IOB
+            val iob = iobCobCalculator.calculateFromTreatmentsAndTemps(time, profile)
+            val baseBasalIob = iobCobCalculator.calculateAbsoluteIobFromBaseBasals(time)
+            val absIob = IobTotal.combine(iob, baseBasalIob)
+            val autosensData = adsData.getAutosensDataAtTime(time)
+            if (abs(lastIob - iob.iob) > 0.02) {
+                if (abs(lastIob - iob.iob) > 0.2) iobArray.add(ScaledDataPoint(time, lastIob, iobScale))
+                iobArray.add(ScaledDataPoint(time, iob.iob, iobScale))
+                maxIobValueFound = maxOf(maxIobValueFound, abs(iob.iob))
+                lastIob = iob.iob
+            }
+            if (abs(absLastIob - absIob.iob) > 0.02) {
+                if (abs(absLastIob - absIob.iob) > 0.2) absIobArray.add(ScaledDataPoint(time, absLastIob, iobScale))
+                absIobArray.add(ScaledDataPoint(time, absIob.iob, iobScale))
+                maxIobValueFound = maxOf(maxIobValueFound, abs(absIob.iob))
+                absLastIob = absIob.iob
+            }
+
+            // COB
+            if (autosensData != null) {
+                val cob = autosensData.cob.toInt()
+                if (cob != lastCob) {
+                    if (autosensData.carbsFromBolus > 0) cobArray.add(ScaledDataPoint(time, lastCob.toDouble(), cobScale))
+                    cobArray.add(ScaledDataPoint(time, cob.toDouble(), cobScale))
+                    maxCobValueFound = max(maxCobValueFound, cob.toDouble())
+                    lastCob = cob
+                }
+                if (autosensData.failoverToMinAbsorbtionRate) {
+                    autosensData.setScale(cobScale)
+                    autosensData.setChartTime(time)
+                    minFailOverActiveList.add(autosensData)
+                }
+            }
+
+            // ACTIVITY
+            if (time <= now) actArrayHist.add(ScaledDataPoint(time, iob.activity, actScale))
+            else actArrayPrediction.add(ScaledDataPoint(time, iob.activity, actScale))
+            maxIAValue = max(maxIAValue, abs(iob.activity))
+
+            // BGI
+            val devBgiScale = overviewMenus.isEnabledIn(OverviewMenus.CharType.DEV) == overviewMenus.isEnabledIn(OverviewMenus.CharType.BGI)
+            val deviation = if (devBgiScale) autosensData?.deviation ?: 0.0 else 0.0
+            val bgi: Double = iob.activity * profile.getIsfMgdl(time) * 5.0
+            if (time <= now) bgiArrayHist.add(ScaledDataPoint(time, bgi, bgiScale))
+            else bgiArrayPrediction.add(ScaledDataPoint(time, bgi, bgiScale))
+            maxBGIValue = max(maxBGIValue, max(abs(bgi), deviation))
+
+            // DEVIATIONS
+            if (autosensData != null) {
+                var color = resourceHelper.gc(R.color.deviationblack) // "="
+                if (autosensData.type == "" || autosensData.type == "non-meal") {
+                    if (autosensData.pastSensitivity == "C") color = resourceHelper.gc(R.color.deviationgrey)
+                    if (autosensData.pastSensitivity == "+") color = resourceHelper.gc(R.color.deviationgreen)
+                    if (autosensData.pastSensitivity == "-") color = resourceHelper.gc(R.color.deviationred)
+                } else if (autosensData.type == "uam") {
+                    color = resourceHelper.gc(R.color.uam)
+                } else if (autosensData.type == "csf") {
+                    color = resourceHelper.gc(R.color.deviationgrey)
+                }
+                devArray.add(OverviewPlugin.DeviationDataPoint(time.toDouble(), autosensData.deviation, color, devScale))
+                maxDevValueFound = maxOf(maxDevValueFound, abs(autosensData.deviation), abs(bgi))
+            }
+
+            // RATIO
+            if (autosensData != null) {
+                ratioArray.add(ScaledDataPoint(time, 100.0 * (autosensData.autosensResult.ratio - 1), ratioScale))
+                maxRatioValueFound = max(maxRatioValueFound, 100.0 * (autosensData.autosensResult.ratio - 1))
+                minRatioValueFound = min(minRatioValueFound, 100.0 * (autosensData.autosensResult.ratio - 1))
+            }
+
+            // DEV SLOPE
+            if (autosensData != null) {
+                dsMaxArray.add(ScaledDataPoint(time, autosensData.slopeFromMaxDeviation, dsMaxScale))
+                dsMinArray.add(ScaledDataPoint(time, autosensData.slopeFromMinDeviation, dsMinScale))
+                maxFromMaxValueFound = max(maxFromMaxValueFound, abs(autosensData.slopeFromMaxDeviation))
+                maxFromMinValueFound = max(maxFromMinValueFound, abs(autosensData.slopeFromMinDeviation))
+            }
+
+            time += 5 * 60 * 1000L
+        }
+        // IOB
+        iobSeries = FixedLineGraphSeries(Array(iobArray.size) { i -> iobArray[i] }).also {
+            it.isDrawBackground = true
+            it.backgroundColor = -0x7f000001 and resourceHelper.gc(R.color.iob) //50%
+            it.color = resourceHelper.gc(R.color.iob)
+            it.thickness = 3
+        }
+        absIobSeries = FixedLineGraphSeries(Array(absIobArray.size) { i -> absIobArray[i] }).also {
+            it.isDrawBackground = true
+            it.backgroundColor = -0x7f000001 and resourceHelper.gc(R.color.iob) //50%
+            it.color = resourceHelper.gc(R.color.iob)
+            it.thickness = 3
+        }
+
+        if (overviewMenus.setting[0][OverviewMenus.CharType.PRE.ordinal]) {
+            val autosensData = adsData.getLastAutosensData("GraphData", aapsLogger, dateUtil)
+            val lastAutosensResult = autosensData?.autosensResult ?: AutosensResult()
+            val isTempTarget = repository.getTemporaryTargetActiveAt(dateUtil.now()).blockingGet() is ValueWrapper.Existing
+            val iobPrediction: MutableList<DataPointWithLabelInterface> = java.util.ArrayList()
+            val iobPredictionArray = iobCobCalculator.calculateIobArrayForSMB(lastAutosensResult, SMBDefaults.exercise_mode, SMBDefaults.half_basal_exercise_target, isTempTarget)
+            for (i in iobPredictionArray) {
+                iobPrediction.add(i.setColor(resourceHelper.gc(R.color.iobPredAS)))
+                maxIobValueFound = max(maxIobValueFound, abs(i.iob))
+            }
+            iobPredictions1Series = PointsWithLabelGraphSeries(Array(iobPrediction.size) { i -> iobPrediction[i] })
+            val iobPrediction2: MutableList<DataPointWithLabelInterface> = java.util.ArrayList()
+            val iobPredictionArray2 = iobCobCalculator.calculateIobArrayForSMB(AutosensResult(), SMBDefaults.exercise_mode, SMBDefaults.half_basal_exercise_target, isTempTarget)
+            for (i in iobPredictionArray2) {
+                iobPrediction2.add(i.setColor(resourceHelper.gc(R.color.iobPred)))
+                maxIobValueFound = max(maxIobValueFound, abs(i.iob))
+            }
+            iobPredictions2Series = PointsWithLabelGraphSeries(Array(iobPrediction2.size) { i -> iobPrediction2[i] })
+            aapsLogger.debug(LTag.AUTOSENS, "IOB prediction for AS=" + DecimalFormatter.to2Decimal(lastAutosensResult.ratio) + ": " + iobCobCalculator.iobArrayToString(iobPredictionArray))
+            aapsLogger.debug(LTag.AUTOSENS, "IOB prediction for AS=" + DecimalFormatter.to2Decimal(1.0) + ": " + iobCobCalculator.iobArrayToString(iobPredictionArray2))
+        } else {
+            iobPredictions1Series = PointsWithLabelGraphSeries()
+            iobPredictions2Series = PointsWithLabelGraphSeries()
+        }
+
+        // COB
+        cobSeries = FixedLineGraphSeries(Array(cobArray.size) { i -> cobArray[i] }).also {
+            it.isDrawBackground = true
+            it.backgroundColor = -0x7f000001 and resourceHelper.gc(R.color.cob) //50%
+            it.color = resourceHelper.gc(R.color.cob)
+            it.thickness = 3
+        }
+        cobMinFailOverSeries = PointsWithLabelGraphSeries(Array(minFailOverActiveList.size) { i -> minFailOverActiveList[i] })
+
+        // ACTIVITY
+        activitySeries = FixedLineGraphSeries(Array(actArrayHist.size) { i -> actArrayHist[i] }).also {
+            it.isDrawBackground = false
+            it.color = resourceHelper.gc(R.color.activity)
+            it.thickness = 3
+        }
+        activityPredictionSeries = FixedLineGraphSeries(Array(actArrayPrediction.size) { i -> actArrayPrediction[i] }).also {
+            it.setCustomPaint(Paint().also { paint ->
+                paint.style = Paint.Style.STROKE
+                paint.strokeWidth = 3f
+                paint.pathEffect = DashPathEffect(floatArrayOf(4f, 4f), 0f)
+                paint.color = resourceHelper.gc(R.color.activity)
+            })
+        }
+
+        // BGI
+        minusBgiSeries = FixedLineGraphSeries(Array(bgiArrayHist.size) { i -> bgiArrayHist[i] }).also {
+            it.isDrawBackground = false
+            it.color = resourceHelper.gc(R.color.bgi)
+            it.thickness = 3
+        }
+        minusBgiHistSeries = FixedLineGraphSeries(Array(bgiArrayPrediction.size) { i -> bgiArrayPrediction[i] }).also {
+            it.setCustomPaint(Paint().also { paint ->
+                paint.style = Paint.Style.STROKE
+                paint.strokeWidth = 3f
+                paint.pathEffect = DashPathEffect(floatArrayOf(4f, 4f), 0f)
+                paint.color = resourceHelper.gc(R.color.bgi)
+            })
+        }
+
+        // DEVIATIONS
+        deviationsSeries = BarGraphSeries(Array(devArray.size) { i -> devArray[i] }).also {
+            it.setValueDependentColor { data: OverviewPlugin.DeviationDataPoint -> data.color }
+        }
+
+        // RATIO
+        ratioSeries = LineGraphSeries(Array(ratioArray.size) { i -> ratioArray[i] }).also {
+            it.color = resourceHelper.gc(R.color.ratio)
+            it.thickness = 3
+        }
+
+        // DEV SLOPE
+        dsMaxSeries = LineGraphSeries(Array(dsMaxArray.size) { i -> dsMaxArray[i] }).also {
+            it.color = resourceHelper.gc(R.color.devslopepos)
+            it.thickness = 3
+        }
+        dsMinSeries = LineGraphSeries(Array(dsMinArray.size) { i -> dsMinArray[i] }).also {
+            it.color = resourceHelper.gc(R.color.devslopeneg)
+            it.thickness = 3
+        }
+
+//        profiler.log(LTag.UI, "prepareIobAutosensData() $from", start)
+    }
+
+    private fun addUpperChartMargin(maxBgValue: Double) =
+        if (profileFunction.getUnits() == GlucoseUnit.MGDL) Round.roundTo(maxBgValue, 40.0) + 80 else Round.roundTo(maxBgValue, 2.0) + 4
+
+    private fun getNearestBg(date: Long): Double {
+        bgReadingsArray.let { bgReadingsArray ->
+            for (reading in bgReadingsArray) {
+                if (reading.timestamp > date) continue
+                return Profile.fromMgdlToUnits(reading.value, profileFunction.getUnits())
+            }
+            return if (bgReadingsArray.isNotEmpty()) Profile.fromMgdlToUnits(bgReadingsArray[0].value, profileFunction.getUnits())
+            else Profile.fromMgdlToUnits(100.0, profileFunction.getUnits())
+        }
+    }
+
+    private fun <E : DataPointWithLabelInterface> List<E>.filterTimeframe(fromTime: Long, endTime: Long): List<E> =
+        filter { it.x + it.duration >= fromTime && it.x <= endTime }
+
 }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt
index d4b9d90774..e38310b1ba 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt
@@ -26,6 +26,7 @@ import dagger.android.HasAndroidInjector
 import dagger.android.support.DaggerFragment
 import info.nightscout.androidaps.Constants
 import info.nightscout.androidaps.R
+import info.nightscout.androidaps.data.ProfileSealed
 import info.nightscout.androidaps.database.AppRepository
 import info.nightscout.androidaps.database.entities.UserEntry.Action
 import info.nightscout.androidaps.database.entities.UserEntry.Sources
@@ -38,6 +39,7 @@ import info.nightscout.androidaps.events.EventPreferenceChange
 import info.nightscout.androidaps.events.EventPumpStatusChanged
 import info.nightscout.androidaps.events.EventRefreshOverview
 import info.nightscout.androidaps.extensions.directionToIcon
+import info.nightscout.androidaps.extensions.isInProgress
 import info.nightscout.androidaps.extensions.toVisibility
 import info.nightscout.androidaps.extensions.valueToUnitsString
 import info.nightscout.androidaps.interfaces.*
@@ -57,10 +59,13 @@ import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatusProv
 import info.nightscout.androidaps.plugins.pump.common.defs.PumpType
 import info.nightscout.androidaps.plugins.source.DexcomPlugin
 import info.nightscout.androidaps.plugins.source.XdripPlugin
-import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin
 import info.nightscout.androidaps.queue.CommandQueue
 import info.nightscout.androidaps.skins.SkinProvider
-import info.nightscout.androidaps.utils.*
+import info.nightscout.androidaps.utils.DateUtil
+import info.nightscout.androidaps.utils.DefaultValueHelper
+import info.nightscout.androidaps.utils.FabricPrivacy
+import info.nightscout.androidaps.utils.ToastUtils
+import info.nightscout.androidaps.utils.TrendCalculator
 import info.nightscout.androidaps.utils.alertDialogs.OKDialog
 import info.nightscout.androidaps.utils.buildHelper.BuildHelper
 import info.nightscout.androidaps.utils.protection.ProtectionCheck
@@ -72,6 +77,7 @@ import info.nightscout.androidaps.utils.wizard.QuickWizard
 import io.reactivex.disposables.CompositeDisposable
 import io.reactivex.rxkotlin.plusAssign
 import java.util.*
+import java.util.concurrent.TimeUnit
 import javax.inject.Inject
 import kotlin.collections.ArrayList
 import kotlin.math.abs
@@ -92,7 +98,6 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
     @Inject lateinit var nsDeviceStatus: NSDeviceStatus
     @Inject lateinit var loopPlugin: LoopPlugin
     @Inject lateinit var activePlugin: ActivePlugin
-    @Inject lateinit var treatmentsPlugin: TreatmentsPlugin
     @Inject lateinit var iobCobCalculator: IobCobCalculator
     @Inject lateinit var dexcomPlugin: DexcomPlugin
     @Inject lateinit var dexcomMediator: DexcomPlugin.DexcomMediator
@@ -108,7 +113,6 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
     @Inject lateinit var trendCalculator: TrendCalculator
     @Inject lateinit var config: Config
     @Inject lateinit var dateUtil: DateUtil
-    @Inject lateinit var databaseHelper: DatabaseHelperInterface
     @Inject lateinit var uel: UserEntryLogger
     @Inject lateinit var repository: AppRepository
     @Inject lateinit var glucoseStatusProvider: GlucoseStatusProvider
@@ -121,7 +125,7 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
     private var smallHeight = false
     private lateinit var dm: DisplayMetrics
     private var axisWidth: Int = 0
-    private var refreshLoop: Runnable? = null
+    private lateinit var refreshLoop: Runnable
     private lateinit var handler: Handler
 
     private val secondaryGraphs = ArrayList<GraphView>()
@@ -140,7 +144,10 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
             _binding = it
             //check screen width
             dm = DisplayMetrics()
-            activity?.windowManager?.defaultDisplay?.getMetrics(dm)
+            if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.R)
+                activity?.display?.getRealMetrics(dm)
+            else
+                @Suppress("DEPRECATION") activity?.windowManager?.defaultDisplay?.getMetrics(dm)
         }.root
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
@@ -157,8 +164,6 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
         skinProvider.activeSkin().preProcessLandscapeOverviewLayout(dm, view, landscape, resourceHelper.gb(R.bool.isTablet), smallHeight)
         binding.nsclientLayout.visibility = config.NSCLIENT.toVisibility()
 
-        binding.loopPumpStatusLayout.pumpStatus.setBackgroundColor(resourceHelper.gc(R.color.colorInitializingBorder))
-
         binding.notifications.setHasFixedSize(false)
         binding.notifications.layoutManager = LinearLayoutManager(view.context)
         axisWidth = if (dm.densityDpi <= 120) 3 else if (dm.densityDpi <= 160) 10 else if (dm.densityDpi <= 320) 35 else if (dm.densityDpi <= 420) 50 else if (dm.densityDpi <= 560) 70 else 80
@@ -177,6 +182,8 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
             overviewData.rangeToDisplay = if (overviewData.rangeToDisplay > 24) 6 else overviewData.rangeToDisplay
             sp.putInt(R.string.key_rangetodisplay, overviewData.rangeToDisplay)
             overviewData.initRange()
+            overviewData.prepareBucketedData("EventBucketedDataCreated")
+            overviewData.prepareBgData("EventBucketedDataCreated")
             updateGUI("rangeChange", OverviewData.Property.GRAPH)
             rxBus.send(EventPreferenceChange(resourceHelper, R.string.key_rangetodisplay))
             sp.putBoolean(R.string.key_objectiveusescale, true)
@@ -185,10 +192,10 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
         prepareGraphsIfNeeded(overviewMenus.setting.size)
         overviewMenus.setupChartMenu(binding.graphsLayout.chartMenuButton)
 
-        binding.loopPumpStatusLayout.activeProfile.setOnClickListener(this)
-        binding.loopPumpStatusLayout.activeProfile.setOnLongClickListener(this)
-        binding.loopPumpStatusLayout.tempTarget.setOnClickListener(this)
-        binding.loopPumpStatusLayout.tempTarget.setOnLongClickListener(this)
+        binding.activeProfile.setOnClickListener(this)
+        binding.activeProfile.setOnLongClickListener(this)
+        binding.tempTarget.setOnClickListener(this)
+        binding.tempTarget.setOnLongClickListener(this)
         binding.buttonsLayout.acceptTempButton.setOnClickListener(this)
         binding.buttonsLayout.treatmentButton.setOnClickListener(this)
         binding.buttonsLayout.wizardButton.setOnClickListener(this)
@@ -200,7 +207,7 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
         binding.buttonsLayout.quickWizardButton.setOnLongClickListener(this)
         binding.infoLayout.apsMode.setOnClickListener(this)
         binding.infoLayout.apsMode.setOnLongClickListener(this)
-        binding.loopPumpStatusLayout.activeProfile.setOnLongClickListener(this)
+        binding.activeProfile.setOnLongClickListener(this)
     }
 
     @Synchronized
@@ -241,10 +248,14 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
             .toObservable(EventNewOpenLoopNotification::class.java)
             .observeOn(aapsSchedulers.io)
             .subscribe({ scheduleUpdateGUI("EventNewOpenLoopNotification") }, fabricPrivacy::logException))
-        disposable.add(rxBus
+        disposable += rxBus
             .toObservable(EventPumpStatusChanged::class.java)
             .observeOn(aapsSchedulers.main)
-            .subscribe({ updatePumpStatus(it) }, fabricPrivacy::logException))
+            .delay (30, TimeUnit.MILLISECONDS, aapsSchedulers.main)
+            .subscribe({
+                overviewData.pumpStatus = it.getStatus(resourceHelper)
+                updateGUI("EventPumpStatusChanged", OverviewData.Property.PUMPSTATUS)
+            }, fabricPrivacy::logException)
 
         refreshLoop = Runnable {
             overviewPlugin.refreshLoop("refreshLoop")
@@ -374,7 +385,7 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
             }
 
             R.id.temp_target         -> v.performClick()
-            R.id.active_profile      -> activity?.let { activity -> protectionCheck.queryProtection(activity, ProtectionCheck.Protection.BOLUS, UIRunnable { ProfileSwitchDialog().show(childFragmentManager, "Overview") }) }
+            R.id.active_profile      -> activity?.let { activity -> protectionCheck.queryProtection(activity, ProtectionCheck.Protection.BOLUS, UIRunnable { ProfileSwitchDialog().show(childFragmentManager, "ProfileSwitchDialog") }) }
 
         }
         return false
@@ -402,18 +413,6 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
         }
     }
 
-    private fun updatePumpStatus(event: EventPumpStatusChanged) {
-        val status = event.getStatus(resourceHelper)
-        if (status != "") {
-            binding.loopPumpStatusLayout.pumpStatus.text = status
-            binding.loopPumpStatusLayout.pumpStatusLayout.visibility = View.VISIBLE
-            binding.loopPumpStatusLayout.loopLayout.visibility = View.GONE
-        } else {
-            binding.loopPumpStatusLayout.pumpStatusLayout.visibility = View.GONE
-            binding.loopPumpStatusLayout.loopLayout.visibility = View.VISIBLE
-        }
-    }
-
     @SuppressLint("SetTextI18n")
     private fun processButtonsVisibility() {
         val lastBG = iobCobCalculator.ads.lastBg()
@@ -585,9 +584,9 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
                 task = null
             }
         }
-        handler.removeCallbacks(task)
+        task?.let { handler.removeCallbacks(it) }
         task = UpdateRunnable()
-        handler.postDelayed(task, 500)
+        task?.let { handler.postDelayed(it, 500) }
     }
 
     @Suppress("UNUSED_PARAMETER")
@@ -595,15 +594,12 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
     fun updateGUI(from: String, what: OverviewData.Property) {
 //        if (what != OverviewData.Property.CALC_PROGRESS)
 //            aapsLogger.debug(LTag.UI, "UpdateGui $from $what")
-        if (overviewData.profile == null) {
-            binding.loopPumpStatusLayout.pumpStatus.setText(R.string.noprofileset)
-            binding.loopPumpStatusLayout.pumpStatusLayout.visibility = View.VISIBLE
-            binding.loopPumpStatusLayout.loopLayout.visibility = View.GONE
+        if (profileFunction.getProfile() == null) {
+            binding.activeProfile.setText(R.string.noprofileset)
+            binding.activeProfile.setBackgroundColor(resourceHelper.gc(R.color.errorAlertBackground))
             return
         }
         binding.notifications.let { notificationStore.updateNotifications(it) }
-        binding.loopPumpStatusLayout.pumpStatusLayout.visibility = View.GONE
-        binding.loopPumpStatusLayout.loopLayout.visibility = View.VISIBLE
 
         val units = profileFunction.getUnits()
         val pump = activePlugin.activePump
@@ -623,7 +619,7 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
                     binding.infoLayout.avgDelta.text = Profile.toSignedUnitsString(glucoseStatus.shortAvgDelta, glucoseStatus.shortAvgDelta * Constants.MGDL_TO_MMOLL, units)
                     binding.infoLayout.longAvgDelta.text = Profile.toSignedUnitsString(glucoseStatus.longAvgDelta, glucoseStatus.longAvgDelta * Constants.MGDL_TO_MMOLL, units)
                 } else {
-                    binding.infoLayout.deltaLarge.text = "Δ " + resourceHelper.gs(R.string.notavailable)
+                    binding.infoLayout.deltaLarge.text = ""
                     binding.infoLayout.delta.text = "Δ " + resourceHelper.gs(R.string.notavailable)
                     binding.infoLayout.avgDelta.text = ""
                     binding.infoLayout.longAvgDelta.text = ""
@@ -638,10 +634,25 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
             }
 
             OverviewData.Property.PROFILE          -> {
-                binding.loopPumpStatusLayout.activeProfile.text = overviewData.profileNameWithRemainingTime
-                    ?: ""
-                binding.loopPumpStatusLayout.activeProfile.setBackgroundColor(overviewData.profileBackgroudColor)
-                binding.loopPumpStatusLayout.activeProfile.setTextColor(overviewData.profileTextColor)
+                val profileBackgroundColor =
+                    profileFunction.getProfile()?.let {
+                        val profile = (it as ProfileSealed.EPS).value
+                        if (profile.originalPercentage != 100 || profile.originalTimeshift != 0L || profile.originalDuration != 0L)
+                            resourceHelper.gc(R.color.ribbonWarning)
+                        else resourceHelper.gc(R.color.ribbonDefault)
+                    } ?: resourceHelper.gc(R.color.ribbonTextDefault)
+
+                val profileTextColor =
+                    profileFunction.getProfile()?.let {
+                        val profile = (it as ProfileSealed.EPS).value
+                        if (profile.originalPercentage != 100 || profile.originalTimeshift != 0L || profile.originalDuration != 0L)
+                            resourceHelper.gc(R.color.ribbonTextWarning)
+                        else resourceHelper.gc(R.color.ribbonTextDefault)
+                    } ?: resourceHelper.gc(R.color.ribbonTextDefault)
+
+                binding.activeProfile.text = profileFunction.getProfileNameWithRemainingTime()
+                binding.activeProfile.setBackgroundColor(profileBackgroundColor)
+                binding.activeProfile.setTextColor(profileTextColor)
             }
 
             OverviewData.Property.TEMPORARY_BASAL  -> {
@@ -655,7 +666,7 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
 
             OverviewData.Property.EXTENDED_BOLUS   -> {
                 binding.infoLayout.extendedBolus.text = overviewData.extendedBolusText
-                binding.infoLayout.extendedBolus.setOnClickListener {
+                binding.infoLayout.extendedLayout.setOnClickListener {
                     activity?.let { OKDialog.show(it, resourceHelper.gs(R.string.extended_bolus), overviewData.extendedBolusDialogText) }
                 }
                 binding.infoLayout.extendedLayout.visibility = (overviewData.extendedBolus != null && !pump.isFakingTempsByExtendedBoluses).toVisibility()
@@ -677,14 +688,7 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
                     activity?.let { OKDialog.show(it, resourceHelper.gs(R.string.iob), overviewData.iobDialogText) }
                 }
                 // cob
-                var cobText: String = resourceHelper.gs(R.string.value_unavailable_short)
-                overviewData.cobInfo?.let { cobInfo ->
-                    if (cobInfo.displayCob != null) {
-                        cobText = resourceHelper.gs(R.string.format_carbs, cobInfo.displayCob!!.toInt())
-                        if (cobInfo.futureCarbs > 0) cobText += "(" + DecimalFormatter.to0Decimal(cobInfo.futureCarbs) + ")"
-                    }
-                }
-                binding.infoLayout.cob.text = cobText
+                var cobText = overviewData.cobInfo?.displayText(resourceHelper, dateUtil, buildHelper.isDev()) ?: resourceHelper.gs(R.string.value_unavailable_short)
 
                 val constraintsProcessed = loopPlugin.lastRun?.constraintsProcessed
                 val lastRun = loopPlugin.lastRun
@@ -692,7 +696,7 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
                     if (constraintsProcessed.carbsReq > 0) {
                         //only display carbsreq when carbs have not been entered recently
                         if (overviewData.lastCarbsTime < lastRun.lastAPSRun) {
-                            cobText = cobText + " | " + constraintsProcessed.carbsReq + " " + resourceHelper.gs(R.string.required)
+                            cobText += " | " + constraintsProcessed.carbsReq + " " + resourceHelper.gs(R.string.required)
                         }
                         if (carbAnimation?.isRunning == false)
                             carbAnimation?.start()
@@ -701,36 +705,38 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
                         carbAnimation?.selectDrawable(0)
                     }
                 }
+                binding.infoLayout.cob.text = cobText
             }
 
             OverviewData.Property.TEMPORARY_TARGET -> {
                 // temp target
-                val tempTarget = overviewData.temporarytarget
+                if (overviewData.temporaryTarget?.isInProgress(dateUtil) == false) overviewData.temporaryTarget = null
+                val tempTarget = overviewData.temporaryTarget
                 if (tempTarget != null) {
-                    binding.loopPumpStatusLayout.tempTarget.setTextColor(resourceHelper.gc(R.color.ribbonTextWarning))
-                    binding.loopPumpStatusLayout.tempTarget.setBackgroundColor(resourceHelper.gc(R.color.ribbonWarning))
-                    binding.loopPumpStatusLayout.tempTarget.text = Profile.toTargetRangeString(tempTarget.lowTarget, tempTarget.highTarget, GlucoseUnit.MGDL, units) + " " + dateUtil.untilString(tempTarget.end, resourceHelper)
+                    binding.tempTarget.setTextColor(resourceHelper.gc(R.color.ribbonTextWarning))
+                    binding.tempTarget.setBackgroundColor(resourceHelper.gc(R.color.ribbonWarning))
+                    binding.tempTarget.text = Profile.toTargetRangeString(tempTarget.lowTarget, tempTarget.highTarget, GlucoseUnit.MGDL, units) + " " + dateUtil.untilString(tempTarget.end, resourceHelper)
                 } else {
                     // If the target is not the same as set in the profile then oref has overridden it
-                    overviewData.profile?.let { profile ->
+                    profileFunction.getProfile()?.let { profile ->
                         val targetUsed = loopPlugin.lastRun?.constraintsProcessed?.targetBG ?: 0.0
 
                         if (targetUsed != 0.0 && abs(profile.getTargetMgdl() - targetUsed) > 0.01) {
                             aapsLogger.debug("Adjusted target. Profile: ${profile.getTargetMgdl()} APS: $targetUsed")
-                            binding.loopPumpStatusLayout.tempTarget.text = Profile.toTargetRangeString(targetUsed, targetUsed, GlucoseUnit.MGDL, units)
-                            binding.loopPumpStatusLayout.tempTarget.setTextColor(resourceHelper.gc(R.color.ribbonTextWarning))
-                            binding.loopPumpStatusLayout.tempTarget.setBackgroundColor(resourceHelper.gc(R.color.tempTargetBackground))
+                            binding.tempTarget.text = Profile.toTargetRangeString(targetUsed, targetUsed, GlucoseUnit.MGDL, units)
+                            binding.tempTarget.setTextColor(resourceHelper.gc(R.color.ribbonTextWarning))
+                            binding.tempTarget.setBackgroundColor(resourceHelper.gc(R.color.tempTargetBackground))
                         } else {
-                            binding.loopPumpStatusLayout.tempTarget.setTextColor(resourceHelper.gc(R.color.ribbonTextDefault))
-                            binding.loopPumpStatusLayout.tempTarget.setBackgroundColor(resourceHelper.gc(R.color.ribbonDefault))
-                            binding.loopPumpStatusLayout.tempTarget.text = Profile.toTargetRangeString(profile.getTargetLowMgdl(), profile.getTargetHighMgdl(), GlucoseUnit.MGDL, units)
+                            binding.tempTarget.setTextColor(resourceHelper.gc(R.color.ribbonTextDefault))
+                            binding.tempTarget.setBackgroundColor(resourceHelper.gc(R.color.ribbonDefault))
+                            binding.tempTarget.text = Profile.toTargetRangeString(profile.getTargetLowMgdl(), profile.getTargetHighMgdl(), GlucoseUnit.MGDL, units)
                         }
                     }
                 }
             }
 
             OverviewData.Property.GRAPH            -> {
-                val graphData = GraphData(injector, binding.graphsLayout.bgGraph)
+                val graphData = GraphData(injector, binding.graphsLayout.bgGraph, overviewData)
                 val menuChartSettings = overviewMenus.setting
                 graphData.addInRangeArea(overviewData.fromTime, overviewData.endTime, defaultValueHelper.determineLowLine(), defaultValueHelper.determineHighLine())
                 graphData.addBgReadings(menuChartSettings[0][OverviewMenus.CharType.PRE.ordinal])
@@ -738,7 +744,7 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
                 graphData.addTreatments()
                 if (menuChartSettings[0][OverviewMenus.CharType.ACT.ordinal])
                     graphData.addActivity(0.8)
-                if (pump.pumpDescription.isTempBasalCapable && menuChartSettings[0][OverviewMenus.CharType.BAS.ordinal])
+                if ((pump.pumpDescription.isTempBasalCapable || config.NSCLIENT) && menuChartSettings[0][OverviewMenus.CharType.BAS.ordinal])
                     graphData.addBasals()
                 graphData.addTargetLine()
                 graphData.addNowLine(dateUtil.now())
@@ -755,7 +761,7 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
 
                 val now = System.currentTimeMillis()
                 for (g in 0 until min(secondaryGraphs.size, menuChartSettings.size + 1)) {
-                    val secondGraphData = GraphData(injector, secondaryGraphs[g])
+                    val secondGraphData = GraphData(injector, secondaryGraphs[g], overviewData)
                     var useABSForScale = false
                     var useIobForScale = false
                     var useCobForScale = false
@@ -780,7 +786,7 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
                     if (menuChartSettings[g + 1][OverviewMenus.CharType.DEV.ordinal]) secondGraphData.addDeviations(useDevForScale, 1.0)
                     if (menuChartSettings[g + 1][OverviewMenus.CharType.BGI.ordinal]) secondGraphData.addMinusBGI(useBGIForScale, if (alignDevBgiScale) 1.0 else 0.8)
                     if (menuChartSettings[g + 1][OverviewMenus.CharType.SEN.ordinal]) secondGraphData.addRatio(useRatioForScale, if (useRatioForScale) 1.0 else 0.8)
-                    if (menuChartSettings[g + 1][OverviewMenus.CharType.DEVSLOPE.ordinal] && buildHelper.isDev()) secondGraphData.addDeviationSlope(useDSForScale, 1.0)
+                    if (menuChartSettings[g + 1][OverviewMenus.CharType.DEVSLOPE.ordinal] && buildHelper.isDev()) secondGraphData.addDeviationSlope(useDSForScale, if(useDSForScale) 1.0 else 0.8, useRatioForScale)
 
                     // set manual x bounds to have nice steps
                     secondGraphData.formatAxis(overviewData.fromTime, overviewData.endTime)
@@ -818,6 +824,12 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
                         String.format(Locale.ENGLISH, "%.0f%%", autosensData.autosensResult.ratio * 100)
                     } ?: ""
             }
+
+            OverviewData.Property.PUMPSTATUS      -> {
+                val status = overviewData.pumpStatus
+                binding.pumpStatus.text = status
+                binding.pumpStatusLayout.visibility = (status != "").toVisibility()
+            }
         }
     }
 }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewMenus.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewMenus.kt
index 70fa9ef620..6f7f464d5e 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewMenus.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewMenus.kt
@@ -113,6 +113,9 @@ class OverviewMenus @Inject constructor(
                     if (m == CharType.PRE) insert = predictionsAvailable
                     if (m == CharType.DEVSLOPE) insert = buildHelper.isDev()
                     if (used.contains(m.ordinal)) insert = false
+                    for (g2 in g + 1 until numOfGraphs) {
+                        if (settingsCopy[g2][m.ordinal]) insert = false
+                    }
                     if (insert) {
                         val item = popup.menu.add(Menu.NONE, m.ordinal + 100 * (g + 1), Menu.NONE, resourceHelper.gs(m.nameId))
                         val title = item.title
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewPlugin.kt
index 39c51ac5a2..3a56f7bcee 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewPlugin.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewPlugin.kt
@@ -1,85 +1,65 @@
 package info.nightscout.androidaps.plugins.general.overview
 
-import android.graphics.DashPathEffect
-import android.graphics.Paint
 import androidx.preference.PreferenceFragmentCompat
 import androidx.preference.SwitchPreference
-import com.jjoe64.graphview.series.BarGraphSeries
-import com.jjoe64.graphview.series.DataPoint
-import com.jjoe64.graphview.series.LineGraphSeries
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.R
-import info.nightscout.androidaps.data.IobTotal
 import info.nightscout.androidaps.database.AppRepository
 import info.nightscout.androidaps.database.ValueWrapper
-import info.nightscout.androidaps.database.entities.Bolus
 import info.nightscout.androidaps.events.*
 import info.nightscout.androidaps.extensions.*
 import info.nightscout.androidaps.interfaces.*
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.aps.events.EventLoopInvoked
-import info.nightscout.androidaps.plugins.aps.loop.LoopPlugin
-import info.nightscout.androidaps.plugins.aps.openAPSSMB.SMBDefaults
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
-import info.nightscout.androidaps.plugins.general.nsclient.data.NSDeviceStatus
 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.EventUpdateOverview
-import info.nightscout.androidaps.plugins.general.overview.graphExtensions.*
+import info.nightscout.androidaps.plugins.general.overview.graphExtensions.Scale
+import info.nightscout.androidaps.plugins.general.overview.graphExtensions.ScaledDataPoint
 import info.nightscout.androidaps.plugins.general.overview.notifications.NotificationStore
-import info.nightscout.androidaps.plugins.iob.iobCobCalculator.AutosensResult
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.events.EventBucketedDataCreated
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.events.EventIobCalculationProgress
-import info.nightscout.androidaps.utils.*
+import info.nightscout.androidaps.utils.DateUtil
+import info.nightscout.androidaps.utils.FabricPrivacy
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import info.nightscout.androidaps.utils.rx.AapsSchedulers
 import info.nightscout.androidaps.utils.sharedPreferences.SP
 import io.reactivex.disposables.CompositeDisposable
 import io.reactivex.rxkotlin.plusAssign
 import org.json.JSONObject
-import java.util.*
 import javax.inject.Inject
 import javax.inject.Singleton
-import kotlin.math.abs
-import kotlin.math.ceil
-import kotlin.math.max
-import kotlin.math.min
 
 @Singleton
 class OverviewPlugin @Inject constructor(
-    injector: HasAndroidInjector,
-    private val notificationStore: NotificationStore,
-    private val fabricPrivacy: FabricPrivacy,
-    private val rxBus: RxBusWrapper,
-    private val sp: SP,
-    aapsLogger: AAPSLogger,
-    private val aapsSchedulers: AapsSchedulers,
-    resourceHelper: ResourceHelper,
-    private val config: Config,
-    private val dateUtil: DateUtil,
-    private val translator: Translator,
-//    private val profiler: Profiler,
-    private val profileFunction: ProfileFunction,
-    private val iobCobCalculator: IobCobCalculator,
-    private val repository: AppRepository,
-    private val defaultValueHelper: DefaultValueHelper,
-    private val loopPlugin: LoopPlugin,
-    private val activePlugin: ActivePlugin,
-    private val nsDeviceStatus: NSDeviceStatus,
-    private val overviewData: OverviewData,
-    private val overviewMenus: OverviewMenus
+        injector: HasAndroidInjector,
+        private val notificationStore: NotificationStore,
+        private val fabricPrivacy: FabricPrivacy,
+        private val rxBus: RxBusWrapper,
+        private val sp: SP,
+        aapsLogger: AAPSLogger,
+        private val aapsSchedulers: AapsSchedulers,
+        resourceHelper: ResourceHelper,
+        private val config: Config,
+        private val dateUtil: DateUtil,
+        private val profileFunction: ProfileFunction,
+        private val iobCobCalculator: IobCobCalculator,
+        private val repository: AppRepository,
+        private val overviewData: OverviewData,
+        private val overviewMenus: OverviewMenus
 ) : PluginBase(PluginDescription()
-    .mainType(PluginType.GENERAL)
-    .fragmentClass(OverviewFragment::class.qualifiedName)
-    .alwaysVisible(true)
-    .alwaysEnabled(true)
-    .pluginIcon(R.drawable.ic_home)
-    .pluginName(R.string.overview)
-    .shortName(R.string.overview_shortname)
-    .preferencesId(R.xml.pref_overview)
-    .description(R.string.description_overview),
-    aapsLogger, resourceHelper, injector
+        .mainType(PluginType.GENERAL)
+        .fragmentClass(OverviewFragment::class.qualifiedName)
+        .alwaysVisible(true)
+        .alwaysEnabled(true)
+        .pluginIcon(R.drawable.ic_home)
+        .pluginName(R.string.overview)
+        .shortName(R.string.overview_shortname)
+        .preferencesId(R.xml.pref_overview)
+        .description(R.string.description_overview),
+        aapsLogger, resourceHelper, injector
 ), Overview {
 
     private var disposable: CompositeDisposable = CompositeDisposable()
@@ -95,74 +75,82 @@ class OverviewPlugin @Inject constructor(
 
         notificationStore.createNotificationChannel()
         disposable += rxBus
-            .toObservable(EventNewNotification::class.java)
-            .observeOn(aapsSchedulers.io)
-            .subscribe({ n ->
-                if (notificationStore.add(n.notification))
-                    rxBus.send(EventRefreshOverview("EventNewNotification"))
-            }, fabricPrivacy::logException)
+                .toObservable(EventNewNotification::class.java)
+                .observeOn(aapsSchedulers.io)
+                .subscribe({ n ->
+                    if (notificationStore.add(n.notification))
+                        rxBus.send(EventRefreshOverview("EventNewNotification"))
+                }, fabricPrivacy::logException)
         disposable += rxBus
-            .toObservable(EventDismissNotification::class.java)
-            .observeOn(aapsSchedulers.io)
-            .subscribe({ n ->
-                if (notificationStore.remove(n.id))
-                    rxBus.send(EventRefreshOverview("EventDismissNotification"))
-            }, fabricPrivacy::logException)
+                .toObservable(EventDismissNotification::class.java)
+                .observeOn(aapsSchedulers.io)
+                .subscribe({ n ->
+                    if (notificationStore.remove(n.id))
+                        rxBus.send(EventRefreshOverview("EventDismissNotification"))
+                }, fabricPrivacy::logException)
         disposable += rxBus
-            .toObservable(EventIobCalculationProgress::class.java)
-            .observeOn(aapsSchedulers.main)
-            .subscribe({ overviewData.calcProgress = it.progress; overviewBus.send(EventUpdateOverview("EventIobCalculationProgress", OverviewData.Property.CALC_PROGRESS)) }, fabricPrivacy::logException)
+                .toObservable(EventIobCalculationProgress::class.java)
+                .observeOn(aapsSchedulers.io)
+                .subscribe({ overviewData.calcProgress = it.progress; overviewBus.send(EventUpdateOverview("EventIobCalculationProgress", OverviewData.Property.CALC_PROGRESS)) }, fabricPrivacy::logException)
         disposable += rxBus
-            .toObservable(EventTempBasalChange::class.java)
-            .observeOn(aapsSchedulers.io)
-            .subscribe({ loadTemporaryBasal("EventTempBasalChange") }, fabricPrivacy::logException)
+                .toObservable(EventTempBasalChange::class.java)
+                .observeOn(aapsSchedulers.io)
+                .subscribe({ loadTemporaryBasal("EventTempBasalChange") }, fabricPrivacy::logException)
         disposable += rxBus
-            .toObservable(EventExtendedBolusChange::class.java)
-            .observeOn(aapsSchedulers.io)
-            .subscribe({ loadExtendedBolus("EventExtendedBolusChange") }, fabricPrivacy::logException)
+                .toObservable(EventExtendedBolusChange::class.java)
+                .observeOn(aapsSchedulers.io)
+                .subscribe({ loadExtendedBolus("EventExtendedBolusChange") }, fabricPrivacy::logException)
         disposable += rxBus
-            .toObservable(EventNewBG::class.java)
-            .observeOn(aapsSchedulers.io)
-            .subscribe({ loadBg("EventNewBG") }, fabricPrivacy::logException)
+                .toObservable(EventNewBG::class.java)
+                .observeOn(aapsSchedulers.io)
+                .subscribe({ loadBg("EventNewBG") }, fabricPrivacy::logException)
         disposable += rxBus
-            .toObservable(EventTempTargetChange::class.java)
-            .observeOn(aapsSchedulers.io)
-            .subscribe({ loadTemporaryTarget("EventTempTargetChange") }, fabricPrivacy::logException)
+                .toObservable(EventTempTargetChange::class.java)
+                .observeOn(aapsSchedulers.io)
+                .subscribe({ loadTemporaryTarget("EventTempTargetChange") }, fabricPrivacy::logException)
         disposable += rxBus
-            .toObservable(EventTreatmentChange::class.java)
-            .observeOn(aapsSchedulers.io)
-            .subscribe({
-                loadIobCobResults("EventTreatmentChange")
-                prepareTreatmentsData("EventTreatmentChange")
-                overviewBus.send(EventUpdateOverview("EventTreatmentChange", OverviewData.Property.GRAPH))
-            }, fabricPrivacy::logException)
+                .toObservable(EventTreatmentChange::class.java)
+                .observeOn(aapsSchedulers.io)
+                .subscribe({
+                    loadIobCobResults("EventTreatmentChange")
+                    overviewData.prepareTreatmentsData("EventTreatmentChange")
+                    overviewBus.send(EventUpdateOverview("EventTreatmentChange", OverviewData.Property.GRAPH))
+                }, fabricPrivacy::logException)
         disposable += rxBus
-            .toObservable(EventTherapyEventChange::class.java)
-            .observeOn(aapsSchedulers.io)
-            .subscribe({
-                prepareTreatmentsData("EventTherapyEventChange")
-                overviewBus.send(EventUpdateOverview("EventTherapyEventChange", OverviewData.Property.GRAPH))
-            }, fabricPrivacy::logException)
+                .toObservable(EventTherapyEventChange::class.java)
+                .observeOn(aapsSchedulers.io)
+                .subscribe({
+                    overviewData.prepareTreatmentsData("EventTherapyEventChange")
+                    overviewBus.send(EventUpdateOverview("EventTherapyEventChange", OverviewData.Property.GRAPH))
+                }, fabricPrivacy::logException)
         disposable += rxBus
-            .toObservable(EventBucketedDataCreated::class.java)
-            .observeOn(aapsSchedulers.io)
-            .subscribe({
-                prepareBucketedData("EventBucketedDataCreated")
-                prepareBgData("EventBucketedDataCreated")
-                overviewBus.send(EventUpdateOverview("EventBucketedDataCreated", OverviewData.Property.GRAPH))
-            }, fabricPrivacy::logException)
+                .toObservable(EventBucketedDataCreated::class.java)
+                .observeOn(aapsSchedulers.io)
+                .subscribe({
+                    overviewData.prepareBucketedData("EventBucketedDataCreated")
+                    overviewData.prepareBgData("EventBucketedDataCreated")
+                    overviewBus.send(EventUpdateOverview("EventBucketedDataCreated", OverviewData.Property.GRAPH))
+                }, fabricPrivacy::logException)
         disposable += rxBus
-            .toObservable(EventLoopInvoked::class.java)
-            .observeOn(aapsSchedulers.io)
-            .subscribe({ preparePredictions("EventLoopInvoked") }, fabricPrivacy::logException)
-        disposable.add(rxBus
-            .toObservable(EventProfileSwitchChanged::class.java)
-            .observeOn(aapsSchedulers.io)
-            .subscribe({ loadProfile("EventProfileSwitchChanged") }, fabricPrivacy::logException))
-        disposable.add(rxBus
-            .toObservable(EventAutosensCalculationFinished::class.java)
-            .observeOn(aapsSchedulers.io)
-            .subscribe({ refreshLoop("EventAutosensCalculationFinished") }, fabricPrivacy::logException))
+                .toObservable(EventLoopInvoked::class.java)
+                .observeOn(aapsSchedulers.io)
+                .subscribe({ overviewData.preparePredictions("EventLoopInvoked") }, fabricPrivacy::logException)
+        disposable += rxBus
+                .toObservable(EventNewBasalProfile::class.java)
+                .observeOn(aapsSchedulers.io)
+                .subscribe({ loadProfile("EventNewBasalProfile") }, fabricPrivacy::logException)
+        disposable += rxBus
+                .toObservable(EventAutosensCalculationFinished::class.java)
+                .observeOn(aapsSchedulers.io)
+                .subscribe({
+                    if (it.cause !is EventCustomCalculationFinished) refreshLoop("EventAutosensCalculationFinished")
+                }, fabricPrivacy::logException)
+        disposable += rxBus
+               .toObservable(EventPumpStatusChanged::class.java)
+               .observeOn(aapsSchedulers.io)
+               .subscribe({
+                    overviewData.pumpStatus = it.getStatus(resourceHelper)
+               }, fabricPrivacy::logException)
 
         Thread { loadAll("onResume") }.start()
     }
@@ -187,77 +175,81 @@ class OverviewPlugin @Inject constructor(
     }
 
     override fun configuration(): JSONObject =
-        JSONObject()
-            .putString(R.string.key_quickwizard, sp, resourceHelper)
-            .putInt(R.string.key_eatingsoon_duration, sp, resourceHelper)
-            .putDouble(R.string.key_eatingsoon_target, sp, resourceHelper)
-            .putInt(R.string.key_activity_duration, sp, resourceHelper)
-            .putDouble(R.string.key_activity_target, sp, resourceHelper)
-            .putInt(R.string.key_hypo_duration, sp, resourceHelper)
-            .putDouble(R.string.key_hypo_target, sp, resourceHelper)
-            .putDouble(R.string.key_low_mark, sp, resourceHelper)
-            .putDouble(R.string.key_high_mark, sp, resourceHelper)
-            .putDouble(R.string.key_statuslights_cage_warning, sp, resourceHelper)
-            .putDouble(R.string.key_statuslights_cage_critical, sp, resourceHelper)
-            .putDouble(R.string.key_statuslights_iage_warning, sp, resourceHelper)
-            .putDouble(R.string.key_statuslights_iage_critical, sp, resourceHelper)
-            .putDouble(R.string.key_statuslights_sage_warning, sp, resourceHelper)
-            .putDouble(R.string.key_statuslights_sage_critical, sp, resourceHelper)
-            .putDouble(R.string.key_statuslights_sbat_warning, sp, resourceHelper)
-            .putDouble(R.string.key_statuslights_sbat_critical, sp, resourceHelper)
-            .putDouble(R.string.key_statuslights_bage_warning, sp, resourceHelper)
-            .putDouble(R.string.key_statuslights_bage_critical, sp, resourceHelper)
-            .putDouble(R.string.key_statuslights_res_warning, sp, resourceHelper)
-            .putDouble(R.string.key_statuslights_res_critical, sp, resourceHelper)
-            .putDouble(R.string.key_statuslights_bat_warning, sp, resourceHelper)
-            .putDouble(R.string.key_statuslights_bat_critical, sp, resourceHelper)
+            JSONObject()
+                    .putInt(R.string.key_units, sp, resourceHelper)
+                    .putString(R.string.key_quickwizard, sp, resourceHelper)
+                    .putInt(R.string.key_eatingsoon_duration, sp, resourceHelper)
+                    .putDouble(R.string.key_eatingsoon_target, sp, resourceHelper)
+                    .putInt(R.string.key_activity_duration, sp, resourceHelper)
+                    .putDouble(R.string.key_activity_target, sp, resourceHelper)
+                    .putInt(R.string.key_hypo_duration, sp, resourceHelper)
+                    .putDouble(R.string.key_hypo_target, sp, resourceHelper)
+                    .putDouble(R.string.key_low_mark, sp, resourceHelper)
+                    .putDouble(R.string.key_high_mark, sp, resourceHelper)
+                    .putDouble(R.string.key_statuslights_cage_warning, sp, resourceHelper)
+                    .putDouble(R.string.key_statuslights_cage_critical, sp, resourceHelper)
+                    .putDouble(R.string.key_statuslights_iage_warning, sp, resourceHelper)
+                    .putDouble(R.string.key_statuslights_iage_critical, sp, resourceHelper)
+                    .putDouble(R.string.key_statuslights_sage_warning, sp, resourceHelper)
+                    .putDouble(R.string.key_statuslights_sage_critical, sp, resourceHelper)
+                    .putDouble(R.string.key_statuslights_sbat_warning, sp, resourceHelper)
+                    .putDouble(R.string.key_statuslights_sbat_critical, sp, resourceHelper)
+                    .putDouble(R.string.key_statuslights_bage_warning, sp, resourceHelper)
+                    .putDouble(R.string.key_statuslights_bage_critical, sp, resourceHelper)
+                    .putDouble(R.string.key_statuslights_res_warning, sp, resourceHelper)
+                    .putDouble(R.string.key_statuslights_res_critical, sp, resourceHelper)
+                    .putDouble(R.string.key_statuslights_bat_warning, sp, resourceHelper)
+                    .putDouble(R.string.key_statuslights_bat_critical, sp, resourceHelper)
 
     override fun applyConfiguration(configuration: JSONObject) {
         configuration
-            .storeString(R.string.key_quickwizard, sp, resourceHelper)
-            .storeInt(R.string.key_eatingsoon_duration, sp, resourceHelper)
-            .storeDouble(R.string.key_eatingsoon_target, sp, resourceHelper)
-            .storeInt(R.string.key_activity_duration, sp, resourceHelper)
-            .storeDouble(R.string.key_activity_target, sp, resourceHelper)
-            .storeInt(R.string.key_hypo_duration, sp, resourceHelper)
-            .storeDouble(R.string.key_hypo_target, sp, resourceHelper)
-            .storeDouble(R.string.key_low_mark, sp, resourceHelper)
-            .storeDouble(R.string.key_high_mark, sp, resourceHelper)
-            .storeDouble(R.string.key_statuslights_cage_warning, sp, resourceHelper)
-            .storeDouble(R.string.key_statuslights_cage_critical, sp, resourceHelper)
-            .storeDouble(R.string.key_statuslights_iage_warning, sp, resourceHelper)
-            .storeDouble(R.string.key_statuslights_iage_critical, sp, resourceHelper)
-            .storeDouble(R.string.key_statuslights_sage_warning, sp, resourceHelper)
-            .storeDouble(R.string.key_statuslights_sage_critical, sp, resourceHelper)
-            .storeDouble(R.string.key_statuslights_sbat_warning, sp, resourceHelper)
-            .storeDouble(R.string.key_statuslights_sbat_critical, sp, resourceHelper)
-            .storeDouble(R.string.key_statuslights_bage_warning, sp, resourceHelper)
-            .storeDouble(R.string.key_statuslights_bage_critical, sp, resourceHelper)
-            .storeDouble(R.string.key_statuslights_res_warning, sp, resourceHelper)
-            .storeDouble(R.string.key_statuslights_res_critical, sp, resourceHelper)
-            .storeDouble(R.string.key_statuslights_bat_warning, sp, resourceHelper)
-            .storeDouble(R.string.key_statuslights_bat_critical, sp, resourceHelper)
+                .storeInt(R.string.key_units, sp, resourceHelper)
+                .storeString(R.string.key_quickwizard, sp, resourceHelper)
+                .storeInt(R.string.key_eatingsoon_duration, sp, resourceHelper)
+                .storeDouble(R.string.key_eatingsoon_target, sp, resourceHelper)
+                .storeInt(R.string.key_activity_duration, sp, resourceHelper)
+                .storeDouble(R.string.key_activity_target, sp, resourceHelper)
+                .storeInt(R.string.key_hypo_duration, sp, resourceHelper)
+                .storeDouble(R.string.key_hypo_target, sp, resourceHelper)
+                .storeDouble(R.string.key_low_mark, sp, resourceHelper)
+                .storeDouble(R.string.key_high_mark, sp, resourceHelper)
+                .storeDouble(R.string.key_statuslights_cage_warning, sp, resourceHelper)
+                .storeDouble(R.string.key_statuslights_cage_critical, sp, resourceHelper)
+                .storeDouble(R.string.key_statuslights_iage_warning, sp, resourceHelper)
+                .storeDouble(R.string.key_statuslights_iage_critical, sp, resourceHelper)
+                .storeDouble(R.string.key_statuslights_sage_warning, sp, resourceHelper)
+                .storeDouble(R.string.key_statuslights_sage_critical, sp, resourceHelper)
+                .storeDouble(R.string.key_statuslights_sbat_warning, sp, resourceHelper)
+                .storeDouble(R.string.key_statuslights_sbat_critical, sp, resourceHelper)
+                .storeDouble(R.string.key_statuslights_bage_warning, sp, resourceHelper)
+                .storeDouble(R.string.key_statuslights_bage_critical, sp, resourceHelper)
+                .storeDouble(R.string.key_statuslights_res_warning, sp, resourceHelper)
+                .storeDouble(R.string.key_statuslights_res_critical, sp, resourceHelper)
+                .storeDouble(R.string.key_statuslights_bat_warning, sp, resourceHelper)
+                .storeDouble(R.string.key_statuslights_bat_critical, sp, resourceHelper)
     }
 
-    @Volatile var runningRefresh = false
+    @Volatile
+    var runningRefresh = false
     override fun refreshLoop(from: String) {
         if (runningRefresh) return
         runningRefresh = true
         loadIobCobResults(from)
+        overviewBus.send(EventUpdateOverview(from, OverviewData.Property.PROFILE))
         overviewBus.send(EventUpdateOverview(from, OverviewData.Property.BG))
         overviewBus.send(EventUpdateOverview(from, OverviewData.Property.TIME))
         overviewBus.send(EventUpdateOverview(from, OverviewData.Property.TEMPORARY_BASAL))
         overviewBus.send(EventUpdateOverview(from, OverviewData.Property.EXTENDED_BOLUS))
-        overviewBus.send(EventUpdateOverview(from, OverviewData.Property.IOB_COB))
         overviewBus.send(EventUpdateOverview(from, OverviewData.Property.TEMPORARY_TARGET))
         overviewBus.send(EventUpdateOverview(from, OverviewData.Property.SENSITIVITY))
         loadAsData(from)
-        preparePredictions(from)
-        prepareBasalData(from)
-        prepareTemporaryTargetData(from)
-        prepareTreatmentsData(from)
-        prepareIobAutosensData(from)
+        overviewData.preparePredictions(from)
+        overviewData.prepareBasalData(from)
+        overviewData.prepareTemporaryTargetData(from)
+        overviewData.prepareTreatmentsData(from)
+        overviewData.prepareIobAutosensData(from)
         overviewBus.send(EventUpdateOverview(from, OverviewData.Property.GRAPH))
+        overviewBus.send(EventUpdateOverview(from, OverviewData.Property.IOB_COB))
         aapsLogger.debug(LTag.UI, "refreshLoop finished")
         runningRefresh = false
     }
@@ -271,9 +263,9 @@ class OverviewPlugin @Inject constructor(
         loadTemporaryTarget(from)
         loadIobCobResults(from)
         loadAsData(from)
-        prepareBasalData(from)
-        prepareTemporaryTargetData(from)
-        prepareTreatmentsData(from)
+        overviewData.prepareBasalData(from)
+        overviewData.prepareTemporaryTargetData(from)
+        overviewData.prepareTreatmentsData(from)
 //        prepareIobAutosensData(from)
 //        preparePredictions(from)
         overviewBus.send(EventUpdateOverview(from, OverviewData.Property.GRAPH))
@@ -281,9 +273,6 @@ class OverviewPlugin @Inject constructor(
     }
 
     private fun loadProfile(from: String) {
-        overviewData.profile = profileFunction.getProfile()
-        overviewData.profileName = profileFunction.getProfileName()
-        overviewData.profileNameWithRemainingTime = profileFunction.getProfileNameWithRemainingTime()
         overviewBus.send(EventUpdateOverview(from, OverviewData.Property.PROFILE))
     }
 
@@ -299,8 +288,8 @@ class OverviewPlugin @Inject constructor(
 
     private fun loadTemporaryTarget(from: String) {
         val tempTarget = repository.getTemporaryTargetActiveAt(dateUtil.now()).blockingGet()
-        if (tempTarget is ValueWrapper.Existing) overviewData.temporarytarget = tempTarget.value
-        else overviewData.temporarytarget = null
+        if (tempTarget is ValueWrapper.Existing) overviewData.temporaryTarget = tempTarget.value
+        else overviewData.temporaryTarget = null
         overviewBus.send(EventUpdateOverview(from, OverviewData.Property.TEMPORARY_TARGET))
     }
 
@@ -319,521 +308,11 @@ class OverviewPlugin @Inject constructor(
     private fun loadIobCobResults(from: String) {
         overviewData.bolusIob = iobCobCalculator.calculateIobFromBolus().round()
         overviewData.basalIob = iobCobCalculator.calculateIobFromTempBasalsIncludingConvertedExtended().round()
-        overviewData.cobInfo = iobCobCalculator.getCobInfo(false, "Overview COB")
+        overviewData.cobInfo = iobCobCalculator.getCobInfo(true, "Overview COB")
         val lastCarbs = repository.getLastCarbsRecordWrapped().blockingGet()
         overviewData.lastCarbsTime = if (lastCarbs is ValueWrapper.Existing) lastCarbs.value.timestamp else 0L
 
         overviewBus.send(EventUpdateOverview(from, OverviewData.Property.IOB_COB))
     }
 
-    @Synchronized
-    @Suppress("SameParameterValue", "UNUSED_PARAMETER")
-    private fun prepareBgData(from: String) {
-//        val start = dateUtil.now()
-        var maxBgValue = Double.MIN_VALUE
-        overviewData.bgReadingsArray = repository.compatGetBgReadingsDataFromTime(overviewData.fromTime, overviewData.toTime, false).blockingGet()
-        val bgListArray: MutableList<DataPointWithLabelInterface> = ArrayList()
-        for (bg in overviewData.bgReadingsArray) {
-            if (bg.timestamp < overviewData.fromTime || bg.timestamp > overviewData.toTime) continue
-            if (bg.value > maxBgValue) maxBgValue = bg.value
-            bgListArray.add(GlucoseValueDataPoint(bg, defaultValueHelper, profileFunction, resourceHelper))
-        }
-        overviewData.bgReadingGraphSeries = PointsWithLabelGraphSeries(Array(bgListArray.size) { i -> bgListArray[i] })
-        overviewData.maxBgValue = Profile.fromMgdlToUnits(maxBgValue, profileFunction.getUnits())
-        if (defaultValueHelper.determineHighLine() > maxBgValue) overviewData.maxBgValue = defaultValueHelper.determineHighLine()
-        overviewData.maxBgValue = addUpperChartMargin(overviewData.maxBgValue)
-//        profiler.log(LTag.UI, "prepareBgData() $from", start)
-    }
-
-    @Suppress("UNUSED_PARAMETER")
-    @Synchronized
-    private fun preparePredictions(from: String) {
-//        val start = dateUtil.now()
-        val apsResult = if (config.APS) loopPlugin.lastRun?.constraintsProcessed else nsDeviceStatus.getAPSResult(injector)
-        val predictionsAvailable = if (config.APS) loopPlugin.lastRun?.request?.hasPredictions == true else config.NSCLIENT
-        val menuChartSettings = overviewMenus.setting
-        // align to hours
-        val calendar = Calendar.getInstance().also {
-            it.timeInMillis = System.currentTimeMillis()
-            it[Calendar.MILLISECOND] = 0
-            it[Calendar.SECOND] = 0
-            it[Calendar.MINUTE] = 0
-            it.add(Calendar.HOUR, 1)
-        }
-        if (predictionsAvailable && apsResult != null && menuChartSettings[0][OverviewMenus.CharType.PRE.ordinal]) {
-            var predictionHours = (ceil(apsResult.latestPredictionsTime - System.currentTimeMillis().toDouble()) / (60 * 60 * 1000)).toInt()
-            predictionHours = min(2, predictionHours)
-            predictionHours = max(0, predictionHours)
-            val hoursToFetch = overviewData.rangeToDisplay - predictionHours
-            overviewData.toTime = calendar.timeInMillis + 100000 // little bit more to avoid wrong rounding - GraphView specific
-            overviewData.fromTime = overviewData.toTime - T.hours(hoursToFetch.toLong()).msecs()
-            overviewData.endTime = overviewData.toTime + T.hours(predictionHours.toLong()).msecs()
-        } else {
-            overviewData.toTime = calendar.timeInMillis + 100000 // little bit more to avoid wrong rounding - GraphView specific
-            overviewData.fromTime = overviewData.toTime - T.hours(overviewData.rangeToDisplay.toLong()).msecs()
-            overviewData.endTime = overviewData.toTime
-        }
-
-        val bgListArray: MutableList<DataPointWithLabelInterface> = ArrayList()
-        val predictions: MutableList<GlucoseValueDataPoint>? = apsResult?.predictions
-            ?.map { bg -> GlucoseValueDataPoint(bg, defaultValueHelper, profileFunction, resourceHelper) }
-            ?.toMutableList()
-        if (predictions != null) {
-            predictions.sortWith { o1: GlucoseValueDataPoint, o2: GlucoseValueDataPoint -> o1.x.compareTo(o2.x) }
-            for (prediction in predictions) if (prediction.data.value >= 40) bgListArray.add(prediction)
-        }
-        overviewData.predictionsGraphSeries = PointsWithLabelGraphSeries(Array(bgListArray.size) { i -> bgListArray[i] })
-//        profiler.log(LTag.UI, "preparePredictions() $from", start)
-    }
-
-    @Synchronized
-    @Suppress("SameParameterValue", "UNUSED_PARAMETER")
-    private fun prepareBucketedData(from: String) {
-//        val start = dateUtil.now()
-        val bucketedData = iobCobCalculator.ads.getBucketedDataTableCopy() ?: return
-        if (bucketedData.isEmpty()) {
-            aapsLogger.debug("No bucketed data.")
-            return
-        }
-        val bucketedListArray: MutableList<DataPointWithLabelInterface> = ArrayList()
-        for (inMemoryGlucoseValue in bucketedData) {
-            if (inMemoryGlucoseValue.timestamp < overviewData.fromTime || inMemoryGlucoseValue.timestamp > overviewData.toTime) continue
-            bucketedListArray.add(InMemoryGlucoseValueDataPoint(inMemoryGlucoseValue, profileFunction, resourceHelper))
-        }
-        overviewData.bucketedGraphSeries = PointsWithLabelGraphSeries(Array(bucketedListArray.size) { i -> bucketedListArray[i] })
-//        profiler.log(LTag.UI, "prepareBucketedData() $from", start)
-    }
-
-    @Suppress("UNUSED_PARAMETER")
-    @Synchronized
-    private fun prepareBasalData(from: String) {
-//        val start = dateUtil.now()
-        overviewData.maxBasalValueFound = 0.0
-        val baseBasalArray: MutableList<ScaledDataPoint> = ArrayList()
-        val tempBasalArray: MutableList<ScaledDataPoint> = ArrayList()
-        val basalLineArray: MutableList<ScaledDataPoint> = ArrayList()
-        val absoluteBasalLineArray: MutableList<ScaledDataPoint> = ArrayList()
-        var lastLineBasal = 0.0
-        var lastAbsoluteLineBasal = -1.0
-        var lastBaseBasal = 0.0
-        var lastTempBasal = 0.0
-        var time = overviewData.fromTime
-        while (time < overviewData.toTime) {
-            val profile = profileFunction.getProfile(time)
-            if (profile == null) {
-                time += 60 * 1000L
-                continue
-            }
-            val basalData = iobCobCalculator.getBasalData(profile, time)
-            val baseBasalValue = basalData.basal
-            var absoluteLineValue = baseBasalValue
-            var tempBasalValue = 0.0
-            var basal = 0.0
-            if (basalData.isTempBasalRunning) {
-                tempBasalValue = basalData.tempBasalAbsolute
-                absoluteLineValue = tempBasalValue
-                if (tempBasalValue != lastTempBasal) {
-                    tempBasalArray.add(ScaledDataPoint(time, lastTempBasal, overviewData.basalScale))
-                    tempBasalArray.add(ScaledDataPoint(time, tempBasalValue.also { basal = it }, overviewData.basalScale))
-                }
-                if (lastBaseBasal != 0.0) {
-                    baseBasalArray.add(ScaledDataPoint(time, lastBaseBasal, overviewData.basalScale))
-                    baseBasalArray.add(ScaledDataPoint(time, 0.0, overviewData.basalScale))
-                    lastBaseBasal = 0.0
-                }
-            } else {
-                if (baseBasalValue != lastBaseBasal) {
-                    baseBasalArray.add(ScaledDataPoint(time, lastBaseBasal, overviewData.basalScale))
-                    baseBasalArray.add(ScaledDataPoint(time, baseBasalValue.also { basal = it }, overviewData.basalScale))
-                    lastBaseBasal = baseBasalValue
-                }
-                if (lastTempBasal != 0.0) {
-                    tempBasalArray.add(ScaledDataPoint(time, lastTempBasal, overviewData.basalScale))
-                    tempBasalArray.add(ScaledDataPoint(time, 0.0, overviewData.basalScale))
-                }
-            }
-            if (baseBasalValue != lastLineBasal) {
-                basalLineArray.add(ScaledDataPoint(time, lastLineBasal, overviewData.basalScale))
-                basalLineArray.add(ScaledDataPoint(time, baseBasalValue, overviewData.basalScale))
-            }
-            if (absoluteLineValue != lastAbsoluteLineBasal) {
-                absoluteBasalLineArray.add(ScaledDataPoint(time, lastAbsoluteLineBasal, overviewData.basalScale))
-                absoluteBasalLineArray.add(ScaledDataPoint(time, basal, overviewData.basalScale))
-            }
-            lastAbsoluteLineBasal = absoluteLineValue
-            lastLineBasal = baseBasalValue
-            lastTempBasal = tempBasalValue
-            overviewData.maxBasalValueFound = max(overviewData.maxBasalValueFound, max(tempBasalValue, baseBasalValue))
-            time += 60 * 1000L
-        }
-
-        // final points
-        basalLineArray.add(ScaledDataPoint(overviewData.toTime, lastLineBasal, overviewData.basalScale))
-        baseBasalArray.add(ScaledDataPoint(overviewData.toTime, lastBaseBasal, overviewData.basalScale))
-        tempBasalArray.add(ScaledDataPoint(overviewData.toTime, lastTempBasal, overviewData.basalScale))
-        absoluteBasalLineArray.add(ScaledDataPoint(overviewData.toTime, lastAbsoluteLineBasal, overviewData.basalScale))
-
-        // create series
-        overviewData.baseBasalGraphSeries = LineGraphSeries(Array(baseBasalArray.size) { i -> baseBasalArray[i] }).also {
-            it.isDrawBackground = true
-            it.backgroundColor = resourceHelper.gc(R.color.basebasal)
-            it.thickness = 0
-        }
-        overviewData.tempBasalGraphSeries = LineGraphSeries(Array(tempBasalArray.size) { i -> tempBasalArray[i] }).also {
-            it.isDrawBackground = true
-            it.backgroundColor = resourceHelper.gc(R.color.tempbasal)
-            it.thickness = 0
-        }
-        overviewData.basalLineGraphSeries = LineGraphSeries(Array(basalLineArray.size) { i -> basalLineArray[i] }).also {
-            it.setCustomPaint(Paint().also { paint ->
-                paint.style = Paint.Style.STROKE
-                paint.strokeWidth = resourceHelper.getDisplayMetrics().scaledDensity * 2
-                paint.pathEffect = DashPathEffect(floatArrayOf(2f, 4f), 0f)
-                paint.color = resourceHelper.gc(R.color.basal)
-            })
-        }
-        overviewData.absoluteBasalGraphSeries = LineGraphSeries(Array(absoluteBasalLineArray.size) { i -> absoluteBasalLineArray[i] }).also {
-            it.setCustomPaint(Paint().also { absolutePaint ->
-                absolutePaint.style = Paint.Style.STROKE
-                absolutePaint.strokeWidth = resourceHelper.getDisplayMetrics().scaledDensity * 2
-                absolutePaint.color = resourceHelper.gc(R.color.basal)
-            })
-        }
-//        profiler.log(LTag.UI, "prepareBasalData() $from", start)
-    }
-
-    @Suppress("UNUSED_PARAMETER")
-    @Synchronized
-    private fun prepareTemporaryTargetData(from: String) {
-//        val start = dateUtil.now()
-        val profile = overviewData.profile ?: return
-        val units = profileFunction.getUnits()
-        var toTime = overviewData.toTime
-        val targetsSeriesArray: MutableList<DataPoint> = ArrayList()
-        var lastTarget = -1.0
-        loopPlugin.lastRun?.constraintsProcessed?.let { toTime = max(it.latestPredictionsTime, toTime) }
-        var time = overviewData.fromTime
-        while (time < toTime) {
-            val tt = repository.getTemporaryTargetActiveAt(time).blockingGet()
-            val value: Double = if (tt is ValueWrapper.Existing) {
-                Profile.fromMgdlToUnits(tt.value.target(), units)
-            } else {
-                Profile.fromMgdlToUnits((profile.getTargetLowMgdl(time) + profile.getTargetHighMgdl(time)) / 2, units)
-            }
-            if (lastTarget != value) {
-                if (lastTarget != -1.0) targetsSeriesArray.add(DataPoint(time.toDouble(), lastTarget))
-                targetsSeriesArray.add(DataPoint(time.toDouble(), value))
-            }
-            lastTarget = value
-            time += 5 * 60 * 1000L
-        }
-        // final point
-        targetsSeriesArray.add(DataPoint(toTime.toDouble(), lastTarget))
-        // create series
-        overviewData.temporaryTargetSeries = LineGraphSeries(Array(targetsSeriesArray.size) { i -> targetsSeriesArray[i] }).also {
-            it.isDrawBackground = false
-            it.color = resourceHelper.gc(R.color.tempTargetBackground)
-            it.thickness = 2
-        }
-//        profiler.log(LTag.UI, "prepareTemporaryTargetData() $from", start)
-    }
-
-    @Suppress("UNUSED_PARAMETER")
-    @Synchronized
-    private fun prepareTreatmentsData(from: String) {
-//        val start = dateUtil.now()
-        overviewData.maxTreatmentsValue = 0.0
-        val filteredTreatments: MutableList<DataPointWithLabelInterface> = ArrayList()
-        repository.getBolusesIncludingInvalidFromTimeToTime(overviewData.fromTime, overviewData.endTime, true).blockingGet()
-            .map { BolusDataPoint(it, resourceHelper, activePlugin, defaultValueHelper) }
-            .filter { it.data.type != Bolus.Type.SMB || it.data.isValid }
-            .forEach {
-                it.y = getNearestBg(it.x.toLong())
-                filteredTreatments.add(it)
-            }
-        repository.getCarbsIncludingInvalidFromTimeToTimeExpanded(overviewData.fromTime, overviewData.endTime, true).blockingGet()
-            .map { CarbsDataPoint(it, resourceHelper) }
-            .forEach {
-                it.y = getNearestBg(it.x.toLong())
-                filteredTreatments.add(it)
-            }
-
-        // ProfileSwitch
-        repository.getEffectiveProfileSwitchDataFromTimeToTime(overviewData.fromTime, overviewData.endTime, true).blockingGet()
-            .map { EffectiveProfileSwitchDataPoint(it) }
-            .forEach(filteredTreatments::add)
-
-        // Extended bolus
-        if (!activePlugin.activePump.isFakingTempsByExtendedBoluses) {
-            repository.getExtendedBolusDataFromTimeToTime(overviewData.fromTime, overviewData.endTime, true).blockingGet()
-                .map { ExtendedBolusDataPoint(it) }
-                .filter { it.duration != 0L }
-                .forEach {
-                    it.y = getNearestBg(it.x.toLong())
-                    filteredTreatments.add(it)
-                }
-        }
-
-        // Careportal
-        repository.compatGetTherapyEventDataFromToTime(overviewData.fromTime - T.hours(6).msecs(), overviewData.endTime).blockingGet()
-            .map { TherapyEventDataPoint(it, resourceHelper, profileFunction, translator) }
-            .filterTimeframe(overviewData.fromTime, overviewData.endTime)
-            .forEach {
-                if (it.y == 0.0) it.y = getNearestBg(it.x.toLong())
-                filteredTreatments.add(it)
-            }
-
-        // increase maxY if a treatment forces it's own height that's higher than a BG value
-        filteredTreatments.map { it.y }
-            .maxOrNull()
-            ?.let(::addUpperChartMargin)
-            ?.let { overviewData.maxTreatmentsValue = maxOf(overviewData.maxTreatmentsValue, it) }
-
-        overviewData.treatmentsSeries = PointsWithLabelGraphSeries(filteredTreatments.toTypedArray())
-//        profiler.log(LTag.UI, "prepareTreatmentsData() $from", start)
-    }
-
-    @Suppress("UNUSED_PARAMETER")
-    @Synchronized
-    private fun prepareIobAutosensData(from: String) {
-//        val start = dateUtil.now()
-        val iobArray: MutableList<ScaledDataPoint> = ArrayList()
-        val absIobArray: MutableList<ScaledDataPoint> = ArrayList()
-        overviewData.maxIobValueFound = Double.MIN_VALUE
-        var lastIob = 0.0
-        var absLastIob = 0.0
-        var time = overviewData.fromTime
-
-        val minFailOverActiveList: MutableList<DataPointWithLabelInterface> = ArrayList()
-        val cobArray: MutableList<ScaledDataPoint> = ArrayList()
-        overviewData.maxCobValueFound = Double.MIN_VALUE
-        var lastCob = 0
-
-        val actArrayHist: MutableList<ScaledDataPoint> = ArrayList()
-        val actArrayPrediction: MutableList<ScaledDataPoint> = ArrayList()
-        val now = dateUtil.now().toDouble()
-        overviewData.maxIAValue = 0.0
-
-        val bgiArrayHist: MutableList<ScaledDataPoint> = ArrayList()
-        val bgiArrayPrediction: MutableList<ScaledDataPoint> = ArrayList()
-        overviewData.maxBGIValue = Double.MIN_VALUE
-
-        val devArray: MutableList<DeviationDataPoint> = ArrayList()
-        overviewData.maxDevValueFound = Double.MIN_VALUE
-
-        val ratioArray: MutableList<ScaledDataPoint> = ArrayList()
-        overviewData.maxRatioValueFound = 5.0                    //even if sens data equals 0 for all the period, minimum scale is between 95% and 105%
-        overviewData.minRatioValueFound = -5.0
-
-        val dsMaxArray: MutableList<ScaledDataPoint> = ArrayList()
-        val dsMinArray: MutableList<ScaledDataPoint> = ArrayList()
-        overviewData.maxFromMaxValueFound = Double.MIN_VALUE
-        overviewData.maxFromMinValueFound = Double.MIN_VALUE
-
-        val adsData = iobCobCalculator.ads.clone()
-
-        while (time <= overviewData.toTime) {
-            val profile = profileFunction.getProfile(time)
-            if (profile == null) {
-                time += 5 * 60 * 1000L
-                continue
-            }
-            // IOB
-            val iob = iobCobCalculator.calculateFromTreatmentsAndTemps(time, profile)
-            val baseBasalIob = iobCobCalculator.calculateAbsoluteIobFromBaseBasals(time)
-            val absIob = IobTotal.combine(iob, baseBasalIob)
-            val autosensData = adsData.getAutosensDataAtTime(time)
-            if (abs(lastIob - iob.iob) > 0.02) {
-                if (abs(lastIob - iob.iob) > 0.2) iobArray.add(ScaledDataPoint(time, lastIob, overviewData.iobScale))
-                iobArray.add(ScaledDataPoint(time, iob.iob, overviewData.iobScale))
-                overviewData.maxIobValueFound = maxOf(overviewData.maxIobValueFound, abs(iob.iob))
-                lastIob = iob.iob
-            }
-            if (abs(absLastIob - absIob.iob) > 0.02) {
-                if (abs(absLastIob - absIob.iob) > 0.2) absIobArray.add(ScaledDataPoint(time, absLastIob, overviewData.iobScale))
-                absIobArray.add(ScaledDataPoint(time, absIob.iob, overviewData.iobScale))
-                overviewData.maxIobValueFound = maxOf(overviewData.maxIobValueFound, abs(absIob.iob))
-                absLastIob = absIob.iob
-            }
-
-            // COB
-            if (autosensData != null) {
-                val cob = autosensData.cob.toInt()
-                if (cob != lastCob) {
-                    if (autosensData.carbsFromBolus > 0) cobArray.add(ScaledDataPoint(time, lastCob.toDouble(), overviewData.cobScale))
-                    cobArray.add(ScaledDataPoint(time, cob.toDouble(), overviewData.cobScale))
-                    overviewData.maxCobValueFound = max(overviewData.maxCobValueFound, cob.toDouble())
-                    lastCob = cob
-                }
-                if (autosensData.failoverToMinAbsorbtionRate) {
-                    autosensData.setScale(overviewData.cobScale)
-                    autosensData.setChartTime(time)
-                    minFailOverActiveList.add(autosensData)
-                }
-            }
-
-            // ACTIVITY
-            if (time <= now) actArrayHist.add(ScaledDataPoint(time, iob.activity, overviewData.actScale))
-            else actArrayPrediction.add(ScaledDataPoint(time, iob.activity, overviewData.actScale))
-            overviewData.maxIAValue = max(overviewData.maxIAValue, abs(iob.activity))
-
-            // BGI
-            val devBgiScale = overviewMenus.isEnabledIn(OverviewMenus.CharType.DEV) == overviewMenus.isEnabledIn(OverviewMenus.CharType.BGI)
-            val deviation = if (devBgiScale) autosensData?.deviation ?: 0.0 else 0.0
-            val bgi: Double = iob.activity * profile.getIsfMgdl(time) * 5.0
-            if (time <= now) bgiArrayHist.add(ScaledDataPoint(time, bgi, overviewData.bgiScale))
-            else bgiArrayPrediction.add(ScaledDataPoint(time, bgi, overviewData.bgiScale))
-            overviewData.maxBGIValue = max(overviewData.maxBGIValue, max(abs(bgi), deviation))
-
-            // DEVIATIONS
-            if (autosensData != null) {
-                var color = resourceHelper.gc(R.color.deviationblack) // "="
-                if (autosensData.type == "" || autosensData.type == "non-meal") {
-                    if (autosensData.pastSensitivity == "C") color = resourceHelper.gc(R.color.deviationgrey)
-                    if (autosensData.pastSensitivity == "+") color = resourceHelper.gc(R.color.deviationgreen)
-                    if (autosensData.pastSensitivity == "-") color = resourceHelper.gc(R.color.deviationred)
-                } else if (autosensData.type == "uam") {
-                    color = resourceHelper.gc(R.color.uam)
-                } else if (autosensData.type == "csf") {
-                    color = resourceHelper.gc(R.color.deviationgrey)
-                }
-                devArray.add(DeviationDataPoint(time.toDouble(), autosensData.deviation, color, overviewData.devScale))
-                overviewData.maxDevValueFound = maxOf(overviewData.maxDevValueFound, abs(autosensData.deviation), abs(bgi))
-            }
-
-            // RATIO
-            if (autosensData != null) {
-                ratioArray.add(ScaledDataPoint(time, 100.0 * (autosensData.autosensResult.ratio - 1), overviewData.ratioScale))
-                overviewData.maxRatioValueFound = max(overviewData.maxRatioValueFound, 100.0 * (autosensData.autosensResult.ratio - 1))
-                overviewData.minRatioValueFound = min(overviewData.minRatioValueFound, 100.0 * (autosensData.autosensResult.ratio - 1))
-            }
-
-            // DEV SLOPE
-            if (autosensData != null) {
-                dsMaxArray.add(ScaledDataPoint(time, autosensData.slopeFromMaxDeviation, overviewData.dsMaxScale))
-                dsMinArray.add(ScaledDataPoint(time, autosensData.slopeFromMinDeviation, overviewData.dsMinScale))
-                overviewData.maxFromMaxValueFound = max(overviewData.maxFromMaxValueFound, abs(autosensData.slopeFromMaxDeviation))
-                overviewData.maxFromMinValueFound = max(overviewData.maxFromMinValueFound, abs(autosensData.slopeFromMinDeviation))
-            }
-
-            time += 5 * 60 * 1000L
-        }
-        // IOB
-        overviewData.iobSeries = FixedLineGraphSeries(Array(iobArray.size) { i -> iobArray[i] }).also {
-            it.isDrawBackground = true
-            it.backgroundColor = -0x7f000001 and resourceHelper.gc(R.color.iob) //50%
-            it.color = resourceHelper.gc(R.color.iob)
-            it.thickness = 3
-        }
-        overviewData.absIobSeries = FixedLineGraphSeries(Array(absIobArray.size) { i -> absIobArray[i] }).also {
-            it.isDrawBackground = true
-            it.backgroundColor = -0x7f000001 and resourceHelper.gc(R.color.iob) //50%
-            it.color = resourceHelper.gc(R.color.iob)
-            it.thickness = 3
-        }
-
-        if (overviewMenus.setting[0][OverviewMenus.CharType.PRE.ordinal]) {
-            val autosensData = adsData.getLastAutosensData("GraphData", aapsLogger, dateUtil)
-            val lastAutosensResult = autosensData?.autosensResult ?: AutosensResult()
-            val isTempTarget = repository.getTemporaryTargetActiveAt(dateUtil.now()).blockingGet() is ValueWrapper.Existing
-            val iobPrediction: MutableList<DataPointWithLabelInterface> = ArrayList()
-            val iobPredictionArray = iobCobCalculator.calculateIobArrayForSMB(lastAutosensResult, SMBDefaults.exercise_mode, SMBDefaults.half_basal_exercise_target, isTempTarget)
-            for (i in iobPredictionArray) {
-                iobPrediction.add(i.setColor(resourceHelper.gc(R.color.iobPredAS)))
-                overviewData.maxIobValueFound = max(overviewData.maxIobValueFound, abs(i.iob))
-            }
-            overviewData.iobPredictions1Series = PointsWithLabelGraphSeries(Array(iobPrediction.size) { i -> iobPrediction[i] })
-            val iobPrediction2: MutableList<DataPointWithLabelInterface> = ArrayList()
-            val iobPredictionArray2 = iobCobCalculator.calculateIobArrayForSMB(AutosensResult(), SMBDefaults.exercise_mode, SMBDefaults.half_basal_exercise_target, isTempTarget)
-            for (i in iobPredictionArray2) {
-                iobPrediction2.add(i.setColor(resourceHelper.gc(R.color.iobPred)))
-                overviewData.maxIobValueFound = max(overviewData.maxIobValueFound, abs(i.iob))
-            }
-            overviewData.iobPredictions2Series = PointsWithLabelGraphSeries(Array(iobPrediction2.size) { i -> iobPrediction2[i] })
-            aapsLogger.debug(LTag.AUTOSENS, "IOB prediction for AS=" + DecimalFormatter.to2Decimal(lastAutosensResult.ratio) + ": " + iobCobCalculator.iobArrayToString(iobPredictionArray))
-            aapsLogger.debug(LTag.AUTOSENS, "IOB prediction for AS=" + DecimalFormatter.to2Decimal(1.0) + ": " + iobCobCalculator.iobArrayToString(iobPredictionArray2))
-        } else {
-            overviewData.iobPredictions1Series = PointsWithLabelGraphSeries()
-            overviewData.iobPredictions2Series = PointsWithLabelGraphSeries()
-        }
-
-        // COB
-        overviewData.cobSeries = FixedLineGraphSeries(Array(cobArray.size) { i -> cobArray[i] }).also {
-            it.isDrawBackground = true
-            it.backgroundColor = -0x7f000001 and resourceHelper.gc(R.color.cob) //50%
-            it.color = resourceHelper.gc(R.color.cob)
-            it.thickness = 3
-        }
-        overviewData.cobMinFailOverSeries = PointsWithLabelGraphSeries(Array(minFailOverActiveList.size) { i -> minFailOverActiveList[i] })
-
-        // ACTIVITY
-        overviewData.activitySeries = FixedLineGraphSeries(Array(actArrayHist.size) { i -> actArrayHist[i] }).also {
-            it.isDrawBackground = false
-            it.color = resourceHelper.gc(R.color.activity)
-            it.thickness = 3
-        }
-        overviewData.activityPredictionSeries = FixedLineGraphSeries(Array(actArrayPrediction.size) { i -> actArrayPrediction[i] }).also {
-            it.setCustomPaint(Paint().also { paint ->
-                paint.style = Paint.Style.STROKE
-                paint.strokeWidth = 3f
-                paint.pathEffect = DashPathEffect(floatArrayOf(4f, 4f), 0f)
-                paint.color = resourceHelper.gc(R.color.activity)
-            })
-        }
-
-        // BGI
-        overviewData.minusBgiSeries = FixedLineGraphSeries(Array(bgiArrayHist.size) { i -> bgiArrayHist[i] }).also {
-            it.isDrawBackground = false
-            it.color = resourceHelper.gc(R.color.bgi)
-            it.thickness = 3
-        }
-        overviewData.minusBgiHistSeries = FixedLineGraphSeries(Array(bgiArrayPrediction.size) { i -> bgiArrayPrediction[i] }).also {
-            it.setCustomPaint(Paint().also { paint ->
-                paint.style = Paint.Style.STROKE
-                paint.strokeWidth = 3f
-                paint.pathEffect = DashPathEffect(floatArrayOf(4f, 4f), 0f)
-                paint.color = resourceHelper.gc(R.color.bgi)
-            })
-        }
-
-        // DEVIATIONS
-        overviewData.deviationsSeries = BarGraphSeries(Array(devArray.size) { i -> devArray[i] }).also {
-            it.setValueDependentColor { data: DeviationDataPoint -> data.color }
-        }
-
-        // RATIO
-        overviewData.ratioSeries = LineGraphSeries(Array(ratioArray.size) { i -> ratioArray[i] }).also {
-            it.color = resourceHelper.gc(R.color.ratio)
-            it.thickness = 3
-        }
-
-        // DEV SLOPE
-        overviewData.dsMaxSeries = LineGraphSeries(Array(dsMaxArray.size) { i -> dsMaxArray[i] }).also {
-            it.color = resourceHelper.gc(R.color.devslopepos)
-            it.thickness = 3
-        }
-        overviewData.dsMinSeries = LineGraphSeries(Array(dsMinArray.size) { i -> dsMinArray[i] }).also {
-            it.color = resourceHelper.gc(R.color.devslopeneg)
-            it.thickness = 3
-        }
-
-//        profiler.log(LTag.UI, "prepareIobAutosensData() $from", start)
-    }
-
-    private fun addUpperChartMargin(maxBgValue: Double) =
-        if (profileFunction.getUnits() == GlucoseUnit.MGDL) Round.roundTo(maxBgValue, 40.0) + 80 else Round.roundTo(maxBgValue, 2.0) + 4
-
-    private fun getNearestBg(date: Long): Double {
-        overviewData.bgReadingsArray.let { bgReadingsArray ->
-            for (reading in bgReadingsArray) {
-                if (reading.timestamp > date) continue
-                return Profile.fromMgdlToUnits(reading.value, profileFunction.getUnits())
-            }
-            return if (bgReadingsArray.isNotEmpty()) Profile.fromMgdlToUnits(bgReadingsArray[0].value, profileFunction.getUnits())
-            else Profile.fromMgdlToUnits(100.0, profileFunction.getUnits())
-        }
-    }
-
-    private fun <E : DataPointWithLabelInterface> List<E>.filterTimeframe(fromTime: Long, endTime: Long): List<E> =
-        filter { it.x + it.duration >= fromTime && it.x <= endTime }
 }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/StatusLightHandler.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/StatusLightHandler.kt
index 917ff84630..2fd42278d5 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/StatusLightHandler.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/StatusLightHandler.kt
@@ -74,7 +74,7 @@ class StatusLightHandler @Inject constructor(
     private fun handleAge(view: TextView?, type: TherapyEvent.Type, @StringRes warnSettings: Int, defaultWarnThreshold: Double, @StringRes urgentSettings: Int, defaultUrgentThreshold: Double) {
         val warn = sp.getDouble(warnSettings, defaultWarnThreshold)
         val urgent = sp.getDouble(urgentSettings, defaultUrgentThreshold)
-        val therapyEvent = repository.getLastTherapyRecord(type).blockingGet()
+        val therapyEvent = repository.getLastTherapyRecordUpToNow(type).blockingGet()
         if (therapyEvent is ValueWrapper.Existing) {
             warnColors.setColorByAge(view, therapyEvent.value, warn, urgent)
             view?.text = therapyEvent.value.age(resourceHelper.shortTextMode(), resourceHelper, dateUtil)
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/activities/QuickWizardListActivity.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/activities/QuickWizardListActivity.kt
index d79d3f51f4..ebc3770488 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/activities/QuickWizardListActivity.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/activities/QuickWizardListActivity.kt
@@ -64,12 +64,12 @@ class QuickWizardListActivity : NoSplashAppCompatActivity() {
                     val manager = fragmentManager
                     val editQuickWizardDialog = EditQuickWizardDialog()
                     val bundle = Bundle()
-                    bundle.putInt("position", adapterPosition)
+                    bundle.putInt("position", bindingAdapterPosition)
                     editQuickWizardDialog.arguments = bundle
                     editQuickWizardDialog.show(manager, "EditQuickWizardDialog")
                 }
                 removeButton.setOnClickListener {
-                    quickWizard.remove(adapterPosition)
+                    quickWizard.remove(bindingAdapterPosition)
                     rxBus.send(EventQuickWizardChange())
                 }
             }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphData/GraphData.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphData/GraphData.kt
index c2055e61e8..3fcc046cbd 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphData/GraphData.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphData/GraphData.kt
@@ -26,16 +26,16 @@ import kotlin.math.max
 
 class GraphData(
     injector: HasAndroidInjector,
-    private val graph: GraphView
+    private val graph: GraphView,
+    private val overviewData: OverviewData
 ) {
 
     @Inject lateinit var aapsLogger: AAPSLogger
     @Inject lateinit var profileFunction: ProfileFunction
     @Inject lateinit var resourceHelper: ResourceHelper
     @Inject lateinit var defaultValueHelper: DefaultValueHelper
-    @Inject lateinit var overviewData: OverviewData
 
-    var maxY = Double.MIN_VALUE
+    private var maxY = Double.MIN_VALUE
     private var minY = Double.MAX_VALUE
     private val units: GlucoseUnit
     private val series: MutableList<Series<*>> = ArrayList()
@@ -76,7 +76,7 @@ class GraphData(
         addSeries(overviewData.tempBasalGraphSeries)
         addSeries(overviewData.basalLineGraphSeries)
         addSeries(overviewData.absoluteBasalGraphSeries)
-        overviewData.basalScale.setMultiplier(maxY * scale / overviewData.maxBasalValueFound)
+        overviewData.basalScale.multiplier = maxY * scale / overviewData.maxBasalValueFound
     }
 
     fun addTargetLine() {
@@ -91,7 +91,7 @@ class GraphData(
     fun addActivity(scale: Double) {
         addSeries(overviewData.activitySeries)
         addSeries(overviewData.activityPredictionSeries)
-        overviewData.actScale.setMultiplier(maxY * scale / overviewData.maxIAValue)
+        overviewData.actScale.multiplier = maxY * scale / overviewData.maxIAValue
     }
 
     //Function below show -BGI to be able to compare curves with deviations
@@ -100,7 +100,7 @@ class GraphData(
             maxY = overviewData.maxBGIValue
             minY = -overviewData.maxBGIValue
         }
-        overviewData.bgiScale.setMultiplier(maxY * scale / overviewData.maxBGIValue)
+        overviewData.bgiScale.multiplier = maxY * scale / overviewData.maxBGIValue
         addSeries(overviewData.minusBgiSeries)
         addSeries(overviewData.minusBgiHistSeries)
     }
@@ -111,7 +111,7 @@ class GraphData(
             maxY = overviewData.maxIobValueFound
             minY = -overviewData.maxIobValueFound
         }
-        overviewData.iobScale.setMultiplier(maxY * scale / overviewData.maxIobValueFound)
+        overviewData.iobScale.multiplier = maxY * scale / overviewData.maxIobValueFound
         addSeries(overviewData.iobSeries)
         addSeries(overviewData.iobPredictions1Series)
         addSeries(overviewData.iobPredictions2Series)
@@ -123,7 +123,7 @@ class GraphData(
             maxY = overviewData.maxIobValueFound
             minY = -overviewData.maxIobValueFound
         }
-        overviewData.iobScale.setMultiplier(maxY * scale / overviewData.maxIobValueFound)
+        overviewData.iobScale.multiplier = maxY * scale / overviewData.maxIobValueFound
         addSeries(overviewData.absIobSeries)
     }
 
@@ -133,7 +133,7 @@ class GraphData(
             maxY = overviewData.maxCobValueFound
             minY = 0.0
         }
-        overviewData.cobScale.setMultiplier(maxY * scale / overviewData.maxCobValueFound)
+        overviewData.cobScale.multiplier = maxY * scale / overviewData.maxCobValueFound
         addSeries(overviewData.cobSeries)
         addSeries(overviewData.cobMinFailOverSeries)
     }
@@ -144,7 +144,7 @@ class GraphData(
             maxY = overviewData.maxDevValueFound
             minY = -maxY
         }
-        overviewData.devScale.setMultiplier(maxY * scale / overviewData.maxDevValueFound)
+        overviewData.devScale.multiplier = maxY * scale / overviewData.maxDevValueFound
         addSeries(overviewData.deviationsSeries)
     }
 
@@ -153,20 +153,32 @@ class GraphData(
         if (useForScale) {
             maxY = 100.0 + max(overviewData.maxRatioValueFound, abs(overviewData.minRatioValueFound))
             minY = 100.0 - max(overviewData.maxRatioValueFound, abs(overviewData.minRatioValueFound))
-            overviewData.ratioScale.setMultiplier(1.0)
-        } else
-            overviewData.ratioScale.setMultiplier(maxY * scale / max(overviewData.maxRatioValueFound, abs(overviewData.minRatioValueFound)))
+            overviewData.ratioScale.multiplier = 1.0
+            overviewData.ratioScale.shift = 100.0
+        } else {
+            overviewData.ratioScale.multiplier = maxY * scale / max(overviewData.maxRatioValueFound, abs(overviewData.minRatioValueFound))
+            overviewData.ratioScale.shift = 0.0
+        }
         addSeries(overviewData.ratioSeries)
     }
 
     // scale in % of vertical size (like 0.3)
-    fun addDeviationSlope(useForScale: Boolean, scale: Double) {
+    fun addDeviationSlope(useForScale: Boolean, scale: Double, isRatioScale: Boolean = false) {
         if (useForScale) {
             maxY = max(overviewData.maxFromMaxValueFound, overviewData.maxFromMinValueFound)
             minY = -maxY
         }
-        overviewData.dsMaxScale.setMultiplier(maxY * scale / overviewData.maxFromMaxValueFound)
-        overviewData.dsMinScale.setMultiplier(maxY * scale / overviewData.maxFromMinValueFound)
+        var graphMaxY = maxY
+        if (isRatioScale) {
+            graphMaxY = maxY - 100.0
+            overviewData.dsMinScale.shift = 100.0
+            overviewData.dsMaxScale.shift = 100.0
+        } else {
+            overviewData.dsMinScale.shift = 0.0
+            overviewData.dsMaxScale.shift = 0.0
+        }
+        overviewData.dsMaxScale.multiplier = graphMaxY * scale / overviewData.maxFromMaxValueFound
+        overviewData.dsMinScale.multiplier = graphMaxY * scale / overviewData.maxFromMinValueFound
         addSeries(overviewData.dsMaxSeries)
         addSeries(overviewData.dsMinSeries)
     }
@@ -201,7 +213,7 @@ class GraphData(
         graph.gridLabelRenderer.numHorizontalLabels = 7 // only 7 because of the space
     }
 
-    internal fun addSeries(s: Series<*>) = series.add(s)
+    private fun addSeries(s: Series<*>) = series.add(s)
 
     fun performUpdate() {
         // clear old data
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphExtensions/TherapyEventDataPoint.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphExtensions/TherapyEventDataPoint.kt
index 0467839741..7f88e33cd1 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphExtensions/TherapyEventDataPoint.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphExtensions/TherapyEventDataPoint.kt
@@ -3,10 +3,8 @@ package info.nightscout.androidaps.plugins.general.overview.graphExtensions
 import android.graphics.Color
 import info.nightscout.androidaps.Constants
 import info.nightscout.androidaps.core.R
-import info.nightscout.androidaps.interfaces.Profile
 import info.nightscout.androidaps.database.entities.TherapyEvent
-import info.nightscout.androidaps.interfaces.GlucoseUnit
-import info.nightscout.androidaps.interfaces.Interval
+import info.nightscout.androidaps.interfaces.Profile
 import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.utils.Translator
 import info.nightscout.androidaps.utils.resources.ResourceHelper
@@ -17,7 +15,7 @@ class TherapyEventDataPoint @Inject constructor(
     private val resourceHelper: ResourceHelper,
     private val profileFunction: ProfileFunction,
     private val translator: Translator
-) : DataPointWithLabelInterface, Interval {
+) : DataPointWithLabelInterface {
 
     private var yValue = 0.0
 
@@ -49,10 +47,10 @@ class TherapyEventDataPoint @Inject constructor(
     }
 
     override fun getLabel(): String? =
-        if (data.note != null) data.note
+        if (data.note.isNullOrBlank().not()) data.note
         else translator.translate(data.type)
 
-    override fun getDuration(): Long = end() - start()
+    override fun getDuration(): Long = data.duration
     override fun getShape(): PointsWithLabelGraphSeries.Shape =
         when {
             data.type == TherapyEvent.Type.NS_MBG                -> PointsWithLabelGraphSeries.Shape.MBG
@@ -74,22 +72,4 @@ class TherapyEventDataPoint @Inject constructor(
             TherapyEvent.Type.APS_OFFLINE           -> Color.GRAY and -0x7f000001
             else                                    -> Color.GRAY
         }
-
-    // Interval interface
-    private var cutEnd: Long? = null
-
-    override fun durationInMsec(): Long = data.duration
-    override fun start(): Long = data.timestamp
-    override fun originalEnd(): Long = data.timestamp + durationInMsec()
-    override fun end(): Long = cutEnd ?: originalEnd()
-    override fun cutEndTo(end: Long) {
-        cutEnd = end
-    }
-
-    override fun match(time: Long): Boolean = start() <= time && end() >= time
-    override fun before(time: Long): Boolean = end() < time
-    override fun after(time: Long): Boolean = start() > time
-    override val isInProgress: Boolean get() = match(System.currentTimeMillis())
-    override val isEndingEvent: Boolean get() = durationInMsec() == 0L
-    override val isValid: Boolean get() = data.type == TherapyEvent.Type.APS_OFFLINE
 }
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/notifications/NotificationStore.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/notifications/NotificationStore.kt
index 2ac420ade8..b273ac952e 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/notifications/NotificationStore.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/notifications/NotificationStore.kt
@@ -128,7 +128,7 @@ class NotificationStore @Inject constructor(
     private fun deleteIntent(id: Int): PendingIntent {
         val intent = Intent(context, DismissNotificationService::class.java)
         intent.putExtra("alertID", id)
-        return PendingIntent.getService(context, id, intent, PendingIntent.FLAG_UPDATE_CURRENT)
+        return PendingIntent.getService(context, id, intent, PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_UPDATE_CURRENT)
     }
 
     fun createNotificationChannel() {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/persistentNotification/PersistentNotificationPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/persistentNotification/PersistentNotificationPlugin.kt
index 7a7edb678b..ceac37b723 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/persistentNotification/PersistentNotificationPlugin.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/persistentNotification/PersistentNotificationPlugin.kt
@@ -171,7 +171,7 @@ class PersistentNotificationPlugin @Inject constructor(
             val msgReadPendingIntent = PendingIntent.getBroadcast(context,
                 notificationHolder.notificationID,
                 msgReadIntent,
-                PendingIntent.FLAG_UPDATE_CURRENT)
+                PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_UPDATE_CURRENT)
             val msgReplyIntent = Intent()
                 .addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES)
                 .setAction(REPLY_ACTION)
@@ -181,7 +181,7 @@ class PersistentNotificationPlugin @Inject constructor(
                 context,
                 notificationHolder.notificationID,
                 msgReplyIntent,
-                PendingIntent.FLAG_UPDATE_CURRENT)
+                PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_UPDATE_CURRENT)
             // Build a RemoteInput for receiving voice input from devices
             val remoteInput = RemoteInput.Builder(EXTRA_VOICE_REPLY).build()
             // Create the UnreadConversation
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/AuthRequest.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/AuthRequest.kt
index 7d19bed23d..a8e22abdf2 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/AuthRequest.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/AuthRequest.kt
@@ -1,13 +1,16 @@
 package info.nightscout.androidaps.plugins.general.smsCommunicator
 
+import android.os.SystemClock
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.Constants
 import info.nightscout.androidaps.R
+import info.nightscout.androidaps.interfaces.CommandQueueProvider
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.plugins.general.smsCommunicator.otp.OneTimePassword
 import info.nightscout.androidaps.plugins.general.smsCommunicator.otp.OneTimePasswordValidationResult
+import info.nightscout.androidaps.utils.DateUtil
+import info.nightscout.androidaps.utils.T
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import javax.inject.Inject
 
@@ -23,6 +26,7 @@ class AuthRequest internal constructor(
     @Inject lateinit var resourceHelper: ResourceHelper
     @Inject lateinit var otp: OneTimePassword
     @Inject lateinit var dateUtil: DateUtil
+    @Inject lateinit var commandQueue: CommandQueueProvider
 
     private var date = 0L
     private var processed = false
@@ -49,6 +53,19 @@ class AuthRequest internal constructor(
         }
         if (dateUtil.now() - date < Constants.SMS_CONFIRM_TIMEOUT) {
             processed = true
+            if (action.pumpCommand) {
+                val start = dateUtil.now()
+                //wait for empty queue
+                while (start + T.mins(3).msecs() > dateUtil.now()) {
+                    if (commandQueue.size() == 0) break
+                    SystemClock.sleep(100)
+                }
+                if (commandQueue.size() != 0) {
+                    aapsLogger.debug(LTag.SMS, "Command timed out: " + requester.text)
+                    smsCommunicatorPlugin.sendSMS(Sms(requester.phoneNumber, resourceHelper.gs(R.string.sms_timeout_while_wating)))
+                    return
+                }
+            }
             aapsLogger.debug(LTag.SMS, "Processing confirmed SMS: " + requester.text)
             action.run()
             return
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsAction.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsAction.kt
index 98c892d918..a38d9858c1 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsAction.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsAction.kt
@@ -1,37 +1,37 @@
 package info.nightscout.androidaps.plugins.general.smsCommunicator
 
-abstract class SmsAction : Runnable {
+abstract class SmsAction(val pumpCommand: Boolean) : Runnable {
+
     var aDouble: Double? = null
     var anInteger: Int? = null
     var secondInteger: Int? = null
     var secondLong: Long? = null
     var aString: String? = null
 
-    internal constructor()
-    internal constructor(aDouble: Double) {
+    internal constructor(pumpCommand: Boolean, aDouble: Double) : this(pumpCommand) {
         this.aDouble = aDouble
     }
 
-    internal constructor(aDouble: Double, secondInteger: Int) {
+    internal constructor(pumpCommand: Boolean, aDouble: Double, secondInteger: Int) : this(pumpCommand) {
         this.aDouble = aDouble
         this.secondInteger = secondInteger
     }
 
-    internal constructor(aString: String, secondInteger: Int) {
+    internal constructor(pumpCommand: Boolean, aString: String, secondInteger: Int) : this(pumpCommand) {
         this.aString = aString
         this.secondInteger = secondInteger
     }
 
-    internal constructor(anInteger: Int) {
+    internal constructor(pumpCommand: Boolean, anInteger: Int) : this(pumpCommand) {
         this.anInteger = anInteger
     }
 
-    internal constructor(anInteger: Int, secondInteger: Int) {
+    internal constructor(pumpCommand: Boolean, anInteger: Int, secondInteger: Int) : this(pumpCommand) {
         this.anInteger = anInteger
         this.secondInteger = secondInteger
     }
 
-    internal constructor(anInteger: Int, secondLong: Long) {
+    internal constructor(pumpCommand: Boolean, anInteger: Int, secondLong: Long) : this(pumpCommand) {
         this.anInteger = anInteger
         this.secondLong = secondLong
     }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsCommunicatorPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsCommunicatorPlugin.kt
index 801f98fa91..4b9890d491 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsCommunicatorPlugin.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsCommunicatorPlugin.kt
@@ -11,25 +11,27 @@ import androidx.work.Worker
 import androidx.work.WorkerParameters
 import androidx.work.workDataOf
 import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.interfaces.Config
 import info.nightscout.androidaps.Constants
 import info.nightscout.androidaps.R
+import info.nightscout.androidaps.annotations.OpenForTesting
 import info.nightscout.androidaps.data.DetailedBolusInfo
-import info.nightscout.androidaps.interfaces.Profile
 import info.nightscout.androidaps.database.AppRepository
-import info.nightscout.androidaps.database.entities.ValueWithUnit
+import info.nightscout.androidaps.database.entities.OfflineEvent
 import info.nightscout.androidaps.database.entities.TemporaryTarget
 import info.nightscout.androidaps.database.entities.UserEntry.Action
 import info.nightscout.androidaps.database.entities.UserEntry.Sources
+import info.nightscout.androidaps.database.entities.ValueWithUnit
+import info.nightscout.androidaps.database.transactions.CancelCurrentOfflineEventIfAnyTransaction
 import info.nightscout.androidaps.database.transactions.CancelCurrentTemporaryTargetIfAnyTransaction
-import info.nightscout.androidaps.database.transactions.InsertTemporaryTargetAndCancelCurrentTransaction
+import info.nightscout.androidaps.database.transactions.InsertAndCancelCurrentOfflineEventTransaction
+import info.nightscout.androidaps.database.transactions.InsertAndCancelCurrentTemporaryTargetTransaction
 import info.nightscout.androidaps.events.EventPreferenceChange
 import info.nightscout.androidaps.events.EventRefreshOverview
+import info.nightscout.androidaps.extensions.valueToUnitsString
 import info.nightscout.androidaps.interfaces.*
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.logging.UserEntryLogger
-import info.nightscout.androidaps.plugins.aps.loop.LoopPlugin
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
 import info.nightscout.androidaps.plugins.general.nsclient.events.EventNSClientRestart
@@ -41,7 +43,6 @@ import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatusProv
 import info.nightscout.androidaps.queue.Callback
 import info.nightscout.androidaps.receivers.DataWorker
 import info.nightscout.androidaps.utils.*
-import info.nightscout.androidaps.extensions.valueToUnitsString
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import info.nightscout.androidaps.utils.rx.AapsSchedulers
 import info.nightscout.androidaps.utils.sharedPreferences.SP
@@ -59,11 +60,13 @@ import javax.inject.Singleton
 import kotlin.math.max
 import kotlin.math.min
 
+@OpenForTesting
 @Singleton
 class SmsCommunicatorPlugin @Inject constructor(
     injector: HasAndroidInjector,
     aapsLogger: AAPSLogger,
     resourceHelper: ResourceHelper,
+    private val smsManager: SmsManager,
     private val aapsSchedulers: AapsSchedulers,
     private val sp: SP,
     private val constraintChecker: ConstraintChecker,
@@ -72,7 +75,7 @@ class SmsCommunicatorPlugin @Inject constructor(
     private val fabricPrivacy: FabricPrivacy,
     private val activePlugin: ActivePlugin,
     private val commandQueue: CommandQueueProvider,
-    private val loopPlugin: LoopPlugin,
+    private val loop: Loop,
     private val iobCobCalculator: IobCobCalculator,
     private val xdripCalibrations: XdripCalibrations,
     private var otp: OneTimePassword,
@@ -94,8 +97,8 @@ class SmsCommunicatorPlugin @Inject constructor(
 
     private val disposable = CompositeDisposable()
     var allowedNumbers: MutableList<String> = ArrayList()
-    var messageToConfirm: AuthRequest? = null
-    var lastRemoteBolusTime: Long = 0
+    @Volatile var messageToConfirm: AuthRequest? = null
+    @Volatile var lastRemoteBolusTime: Long = 0
     var messages = ArrayList<Sms>()
 
     val commands = mapOf(
@@ -181,7 +184,6 @@ class SmsCommunicatorPlugin @Inject constructor(
         }
 
         @Suppress("SpellCheckingInspection")
-        @kotlin.ExperimentalStdlibApi
         override fun doWork(): Result {
             val bundle = dataWorker.pickupBundle(inputData.getLong(DataWorker.STORE_KEY, -1))
                 ?: return Result.failure(workDataOf("Error" to "missing input data"))
@@ -224,7 +226,6 @@ class SmsCommunicatorPlugin @Inject constructor(
         return false
     }
 
-    @kotlin.ExperimentalStdlibApi
     fun processSms(receivedSms: Sms) {
         if (!isEnabled(PluginType.GENERAL)) {
             aapsLogger.debug(LTag.SMS, "Ignoring SMS. Plugin disabled.")
@@ -278,6 +279,7 @@ class SmsCommunicatorPlugin @Inject constructor(
                     else sendSMS(Sms(receivedSms.phoneNumber, resourceHelper.gs(R.string.wrongformat)))
                 "BOLUS"    ->
                     if (!remoteCommandsAllowed) sendSMS(Sms(receivedSms.phoneNumber, resourceHelper.gs(R.string.smscommunicator_remotecommandnotallowed)))
+                    else if (commandQueue.bolusInQueue()) sendSMS(Sms(receivedSms.phoneNumber, resourceHelper.gs(R.string.smscommunicator_another_bolus_in_queue)))
                     else if (divided.size == 2 && dateUtil.now() - lastRemoteBolusTime < minDistance) sendSMS(Sms(receivedSms.phoneNumber, resourceHelper.gs(R.string.smscommunicator_remotebolusnotallowed)))
                     else if (divided.size == 2 && pump.isSuspended()) sendSMS(Sms(receivedSms.phoneNumber, resourceHelper.gs(R.string.pumpsuspended)))
                     else if (divided.size == 2 || divided.size == 3) processBOLUS(divided, receivedSms)
@@ -303,9 +305,13 @@ class SmsCommunicatorPlugin @Inject constructor(
                     else sendSMS(Sms(receivedSms.phoneNumber, resourceHelper.gs(R.string.wrongformat)))
                 else       ->
                     if (messageToConfirm?.requester?.phoneNumber == receivedSms.phoneNumber) {
-                        messageToConfirm?.action(divided[0])
+                        val execute = messageToConfirm
                         messageToConfirm = null
-                    } else sendSMS(Sms(receivedSms.phoneNumber, resourceHelper.gs(R.string.smscommunicator_unknowncommand)))
+                        execute?.action(divided[0])
+                    } else {
+                        messageToConfirm = null
+                        sendSMS(Sms(receivedSms.phoneNumber, resourceHelper.gs(R.string.smscommunicator_unknowncommand)))
+                    }
             }
         }
         rxBus.send(EventSmsCommunicatorUpdateGui())
@@ -336,18 +342,17 @@ class SmsCommunicatorPlugin @Inject constructor(
         receivedSms.processed = true
     }
 
-    @kotlin.ExperimentalStdlibApi
     private fun processLOOP(divided: Array<String>, receivedSms: Sms) {
         when (divided[1].uppercase(Locale.getDefault())) {
             "DISABLE", "STOP" -> {
-                if (loopPlugin.isEnabled(PluginType.LOOP)) {
+                if (loop.enabled) {
                     val passCode = generatePassCode()
                     val reply = String.format(resourceHelper.gs(R.string.smscommunicator_loopdisablereplywithcode), passCode)
                     receivedSms.processed = true
-                    messageToConfirm = AuthRequest(injector, receivedSms, reply, passCode, object : SmsAction() {
+                    messageToConfirm = AuthRequest(injector, receivedSms, reply, passCode, object : SmsAction(pumpCommand = false) {
                         override fun run() {
                             uel.log(Action.LOOP_DISABLED, Sources.SMS)
-                            loopPlugin.setPluginEnabled(PluginType.LOOP, false)
+                            loop.enabled = false
                             commandQueue.cancelTempBasal(true, object : Callback() {
                                 override fun run() {
                                     rxBus.send(EventRefreshOverview("SMS_LOOP_STOP"))
@@ -364,14 +369,14 @@ class SmsCommunicatorPlugin @Inject constructor(
             }
 
             "ENABLE", "START" -> {
-                if (!loopPlugin.isEnabled(PluginType.LOOP)) {
+                if (!loop.enabled) {
                     val passCode = generatePassCode()
                     val reply = String.format(resourceHelper.gs(R.string.smscommunicator_loopenablereplywithcode), passCode)
                     receivedSms.processed = true
-                    messageToConfirm = AuthRequest(injector, receivedSms, reply, passCode, object : SmsAction() {
+                    messageToConfirm = AuthRequest(injector, receivedSms, reply, passCode, object : SmsAction(pumpCommand = false) {
                         override fun run() {
                             uel.log(Action.LOOP_ENABLED, Sources.SMS)
-                            loopPlugin.setPluginEnabled(PluginType.LOOP, true)
+                            loop.enabled = true
                             sendSMS(Sms(receivedSms.phoneNumber, resourceHelper.gs(R.string.smscommunicator_loophasbeenenabled)))
                             rxBus.send(EventRefreshOverview("SMS_LOOP_START"))
                         }
@@ -382,8 +387,8 @@ class SmsCommunicatorPlugin @Inject constructor(
             }
 
             "STATUS"          -> {
-                val reply = if (loopPlugin.isEnabled(PluginType.LOOP)) {
-                    if (loopPlugin.isSuspended) String.format(resourceHelper.gs(R.string.loopsuspendedfor), loopPlugin.minutesToEndOfSuspend())
+                val reply = if (loop.enabled) {
+                    if (loop.isSuspended) String.format(resourceHelper.gs(R.string.loopsuspendedfor), loop.minutesToEndOfSuspend())
                     else resourceHelper.gs(R.string.smscommunicator_loopisenabled)
                 } else
                     resourceHelper.gs(R.string.loopisdisabled)
@@ -395,10 +400,15 @@ class SmsCommunicatorPlugin @Inject constructor(
                 val passCode = generatePassCode()
                 val reply = String.format(resourceHelper.gs(R.string.smscommunicator_loopresumereplywithcode), passCode)
                 receivedSms.processed = true
-                messageToConfirm = AuthRequest(injector, receivedSms, reply, passCode, object : SmsAction() {
+                messageToConfirm = AuthRequest(injector, receivedSms, reply, passCode, object : SmsAction(pumpCommand = true) {
                     override fun run() {
                         uel.log(Action.RESUME, Sources.SMS)
-                        loopPlugin.suspendTo(0L)
+                        disposable += repository.runTransactionForResult(CancelCurrentOfflineEventIfAnyTransaction(dateUtil.now()))
+                            .subscribe({ result ->
+                                result.updated.forEach { aapsLogger.debug(LTag.DATABASE, "Updated OfflineEvent $it") }
+                            }, {
+                                aapsLogger.error(LTag.DATABASE, "Error while saving OfflineEvent", it)
+                            })
                         rxBus.send(EventRefreshOverview("SMS_LOOP_RESUME"))
                         commandQueue.cancelTempBasal(true, object : Callback() {
                             override fun run() {
@@ -409,7 +419,6 @@ class SmsCommunicatorPlugin @Inject constructor(
                                 }
                             }
                         })
-                        loopPlugin.createOfflineEvent(0)
                         sendSMSToAllNumbers(Sms(receivedSms.phoneNumber, resourceHelper.gs(R.string.smscommunicator_loopresumed)))
                     }
                 })
@@ -428,14 +437,19 @@ class SmsCommunicatorPlugin @Inject constructor(
                     val passCode = generatePassCode()
                     val reply = String.format(resourceHelper.gs(R.string.smscommunicator_suspendreplywithcode), duration, passCode)
                     receivedSms.processed = true
-                    messageToConfirm = AuthRequest(injector, receivedSms, reply, passCode, object : SmsAction(duration) {
+                    messageToConfirm = AuthRequest(injector, receivedSms, reply, passCode, object : SmsAction(pumpCommand = true, duration) {
                         override fun run() {
                             uel.log(Action.SUSPEND, Sources.SMS)
                             commandQueue.cancelTempBasal(true, object : Callback() {
                                 override fun run() {
                                     if (result.success) {
-                                        loopPlugin.suspendTo(dateUtil.now() + anInteger() * 60L * 1000)
-                                        loopPlugin.createOfflineEvent(anInteger() * 60)
+                                        disposable += repository.runTransactionForResult(InsertAndCancelCurrentOfflineEventTransaction(dateUtil.now(), T.mins(anInteger().toLong()).msecs(), OfflineEvent.Reason.SUSPEND))
+                                            .subscribe({ result ->
+                                                result.updated.forEach { aapsLogger.debug(LTag.DATABASE, "Updated OfflineEvent $it") }
+                                                result.inserted.forEach { aapsLogger.debug(LTag.DATABASE, "Inserted OfflineEvent $it") }
+                                            }, {
+                                                aapsLogger.error(LTag.DATABASE, "Error while saving OfflineEvent", it)
+                                            })
                                         rxBus.send(EventRefreshOverview("SMS_LOOP_SUSPENDED"))
                                         val replyText = resourceHelper.gs(R.string.smscommunicator_loopsuspended) + " " +
                                             resourceHelper.gs(if (result.success) R.string.smscommunicator_tempbasalcanceled else R.string.smscommunicator_tempbasalcancelfailed)
@@ -456,7 +470,6 @@ class SmsCommunicatorPlugin @Inject constructor(
         }
     }
 
-    @kotlin.ExperimentalStdlibApi
     private fun processNSCLIENT(divided: Array<String>, receivedSms: Sms) {
         if (divided[1].uppercase(Locale.getDefault()) == "RESTART") {
             rxBus.send(EventNSClientRestart())
@@ -466,10 +479,9 @@ class SmsCommunicatorPlugin @Inject constructor(
             sendSMS(Sms(receivedSms.phoneNumber, resourceHelper.gs(R.string.wrongformat)))
     }
 
-    @kotlin.ExperimentalStdlibApi
     private fun processHELP(divided: Array<String>, receivedSms: Sms) {
         when {
-            divided.size == 1                                                               -> {
+            divided.size == 1                                                             -> {
                 sendSMS(Sms(receivedSms.phoneNumber, commands.keys.toString().replace("[", "").replace("]", "")))
                 receivedSms.processed = true
             }
@@ -481,7 +493,7 @@ class SmsCommunicatorPlugin @Inject constructor(
                 }
             }
 
-            else                                                                            -> sendSMS(Sms(receivedSms.phoneNumber, resourceHelper.gs(R.string.wrongformat)))
+            else                                                                          -> sendSMS(Sms(receivedSms.phoneNumber, resourceHelper.gs(R.string.wrongformat)))
         }
     }
 
@@ -504,7 +516,7 @@ class SmsCommunicatorPlugin @Inject constructor(
             val passCode = generatePassCode()
             val reply = String.format(resourceHelper.gs(R.string.smscommunicator_pumpconnectwithcode), passCode)
             receivedSms.processed = true
-            messageToConfirm = AuthRequest(injector, receivedSms, reply, passCode, object : SmsAction() {
+            messageToConfirm = AuthRequest(injector, receivedSms, reply, passCode, object : SmsAction(pumpCommand = true) {
                 override fun run() {
                     uel.log(Action.RECONNECT, Sources.SMS)
                     commandQueue.cancelTempBasal(true, object : Callback() {
@@ -512,10 +524,14 @@ class SmsCommunicatorPlugin @Inject constructor(
                             if (!result.success) {
                                 sendSMS(Sms(receivedSms.phoneNumber, resourceHelper.gs(R.string.smscommunicator_pumpconnectfail)))
                             } else {
-                                loopPlugin.suspendTo(0L)
+                                disposable += repository.runTransactionForResult(CancelCurrentOfflineEventIfAnyTransaction(dateUtil.now()))
+                                    .subscribe({ result ->
+                                        result.updated.forEach { aapsLogger.debug(LTag.DATABASE, "Updated OfflineEvent $it") }
+                                    }, {
+                                        aapsLogger.error(LTag.DATABASE, "Error while saving OfflineEvent", it)
+                                    })
                                 sendSMS(Sms(receivedSms.phoneNumber, resourceHelper.gs(R.string.smscommunicator_reconnect)))
                                 rxBus.send(EventRefreshOverview("SMS_PUMP_START"))
-                                loopPlugin.createOfflineEvent(0)
                             }
                         }
                     })
@@ -533,11 +549,11 @@ class SmsCommunicatorPlugin @Inject constructor(
                 val passCode = generatePassCode()
                 val reply = String.format(resourceHelper.gs(R.string.smscommunicator_pumpdisconnectwithcode), duration, passCode)
                 receivedSms.processed = true
-                messageToConfirm = AuthRequest(injector, receivedSms, reply, passCode, object : SmsAction() {
+                messageToConfirm = AuthRequest(injector, receivedSms, reply, passCode, object : SmsAction(pumpCommand = true) {
                     override fun run() {
                         uel.log(Action.DISCONNECT, Sources.SMS)
-                        val profile = profileFunction.getProfile()
-                        loopPlugin.disconnectPump(duration, profile)
+                        val profile = profileFunction.getProfile() ?: return
+                        loop.goToZeroTemp(duration, profile, OfflineEvent.Reason.DISCONNECT_PUMP)
                         rxBus.send(EventRefreshOverview("SMS_PUMP_DISCONNECT"))
                         sendSMS(Sms(receivedSms.phoneNumber, resourceHelper.gs(R.string.smscommunicator_pumpdisconnected)))
                     }
@@ -549,7 +565,6 @@ class SmsCommunicatorPlugin @Inject constructor(
         }
     }
 
-    @kotlin.ExperimentalStdlibApi
     private fun processPROFILE(divided: Array<String>, receivedSms: Sms) { // load profiles
         val anInterface = activePlugin.activeProfileSource
         val store = anInterface.profile
@@ -588,7 +603,7 @@ class SmsCommunicatorPlugin @Inject constructor(
                     val reply = String.format(resourceHelper.gs(R.string.smscommunicator_profilereplywithcode), list[pIndex - 1], percentage, passCode)
                     receivedSms.processed = true
                     val finalPercentage = percentage
-                    messageToConfirm = AuthRequest(injector, receivedSms, reply, passCode, object : SmsAction(list[pIndex - 1] as String, finalPercentage) {
+                    messageToConfirm = AuthRequest(injector, receivedSms, reply, passCode, object : SmsAction(pumpCommand = true, list[pIndex - 1] as String, finalPercentage) {
                         override fun run() {
                             profileFunction.createProfileSwitch(store, list[pIndex - 1] as String, 0, finalPercentage, 0, dateUtil.now())
                             val replyText = resourceHelper.gs(R.string.profileswitchcreated)
@@ -603,13 +618,12 @@ class SmsCommunicatorPlugin @Inject constructor(
         receivedSms.processed = true
     }
 
-    @kotlin.ExperimentalStdlibApi
     private fun processBASAL(divided: Array<String>, receivedSms: Sms) {
         if (divided[1].uppercase(Locale.getDefault()) == "CANCEL" || divided[1].uppercase(Locale.getDefault()) == "STOP") {
             val passCode = generatePassCode()
             val reply = String.format(resourceHelper.gs(R.string.smscommunicator_basalstopreplywithcode), passCode)
             receivedSms.processed = true
-            messageToConfirm = AuthRequest(injector, receivedSms, reply, passCode, object : SmsAction() {
+            messageToConfirm = AuthRequest(injector, receivedSms, reply, passCode, object : SmsAction(pumpCommand = true) {
                 override fun run() {
                     commandQueue.cancelTempBasal(true, object : Callback() {
                         override fun run() {
@@ -644,7 +658,7 @@ class SmsCommunicatorPlugin @Inject constructor(
                 val passCode = generatePassCode()
                 val reply = String.format(resourceHelper.gs(R.string.smscommunicator_basalpctreplywithcode), tempBasalPct, duration, passCode)
                 receivedSms.processed = true
-                messageToConfirm = AuthRequest(injector, receivedSms, reply, passCode, object : SmsAction(tempBasalPct, duration) {
+                messageToConfirm = AuthRequest(injector, receivedSms, reply, passCode, object : SmsAction(pumpCommand = true, tempBasalPct, duration) {
                     override fun run() {
                         commandQueue.tempBasalPercent(anInteger(), secondInteger(), true, profile, PumpSync.TemporaryBasalType.NORMAL, object : Callback() {
                             override fun run() {
@@ -688,7 +702,7 @@ class SmsCommunicatorPlugin @Inject constructor(
                 val passCode = generatePassCode()
                 val reply = String.format(resourceHelper.gs(R.string.smscommunicator_basalreplywithcode), tempBasal, duration, passCode)
                 receivedSms.processed = true
-                messageToConfirm = AuthRequest(injector, receivedSms, reply, passCode, object : SmsAction(tempBasal, duration) {
+                messageToConfirm = AuthRequest(injector, receivedSms, reply, passCode, object : SmsAction(pumpCommand = true, tempBasal, duration) {
                     override fun run() {
                         commandQueue.tempBasalAbsolute(aDouble(), secondInteger(), true, profile, PumpSync.TemporaryBasalType.NORMAL, object : Callback() {
                             override fun run() {
@@ -720,13 +734,12 @@ class SmsCommunicatorPlugin @Inject constructor(
         }
     }
 
-    @kotlin.ExperimentalStdlibApi
     private fun processEXTENDED(divided: Array<String>, receivedSms: Sms) {
         if (divided[1].uppercase(Locale.getDefault()) == "CANCEL" || divided[1].uppercase(Locale.getDefault()) == "STOP") {
             val passCode = generatePassCode()
             val reply = String.format(resourceHelper.gs(R.string.smscommunicator_extendedstopreplywithcode), passCode)
             receivedSms.processed = true
-            messageToConfirm = AuthRequest(injector, receivedSms, reply, passCode, object : SmsAction() {
+            messageToConfirm = AuthRequest(injector, receivedSms, reply, passCode, object : SmsAction(pumpCommand = true) {
                 override fun run() {
                     commandQueue.cancelExtended(object : Callback() {
                         override fun run() {
@@ -756,7 +769,7 @@ class SmsCommunicatorPlugin @Inject constructor(
                 val passCode = generatePassCode()
                 val reply = String.format(resourceHelper.gs(R.string.smscommunicator_extendedreplywithcode), extended, duration, passCode)
                 receivedSms.processed = true
-                messageToConfirm = AuthRequest(injector, receivedSms, reply, passCode, object : SmsAction(extended, duration) {
+                messageToConfirm = AuthRequest(injector, receivedSms, reply, passCode, object : SmsAction(pumpCommand = true, extended, duration) {
                     override fun run() {
                         commandQueue.extendedBolus(aDouble(), secondInteger(), object : Callback() {
                             override fun run() {
@@ -802,7 +815,7 @@ class SmsCommunicatorPlugin @Inject constructor(
             else
                 String.format(resourceHelper.gs(R.string.smscommunicator_bolusreplywithcode), bolus, passCode)
             receivedSms.processed = true
-            messageToConfirm = AuthRequest(injector, receivedSms, reply, passCode, object : SmsAction(bolus) {
+            messageToConfirm = AuthRequest(injector, receivedSms, reply, passCode, object : SmsAction(pumpCommand = true, bolus) {
                 override fun run() {
                     val detailedBolusInfo = DetailedBolusInfo()
                     detailedBolusInfo.insulin = aDouble()
@@ -832,7 +845,7 @@ class SmsCommunicatorPlugin @Inject constructor(
                                                         currentProfile.units == GlucoseUnit.MMOL -> Constants.defaultEatingSoonTTmmol
                                                         else                                     -> Constants.defaultEatingSoonTTmgdl
                                                     }
-                                                disposable += repository.runTransactionForResult(InsertTemporaryTargetAndCancelCurrentTransaction(
+                                                disposable += repository.runTransactionForResult(InsertAndCancelCurrentTemporaryTargetTransaction(
                                                     timestamp = dateUtil.now(),
                                                     duration = TimeUnit.MINUTES.toMillis(eatingSoonTTDuration.toLong()),
                                                     reason = TemporaryTarget.Reason.EATING_SOON,
@@ -887,7 +900,6 @@ class SmsCommunicatorPlugin @Inject constructor(
         return retVal
     }
 
-    @kotlin.ExperimentalStdlibApi
     private fun processCARBS(divided: Array<String>, receivedSms: Sms) {
         var grams = SafeParse.stringToInt(divided[1])
         var time = dateUtil.now()
@@ -904,7 +916,7 @@ class SmsCommunicatorPlugin @Inject constructor(
             val passCode = generatePassCode()
             val reply = String.format(resourceHelper.gs(R.string.smscommunicator_carbsreplywithcode), grams, dateUtil.timeString(time), passCode)
             receivedSms.processed = true
-            messageToConfirm = AuthRequest(injector, receivedSms, reply, passCode, object : SmsAction(grams, time) {
+            messageToConfirm = AuthRequest(injector, receivedSms, reply, passCode, object : SmsAction(pumpCommand = true, grams, time) {
                 override fun run() {
                     val detailedBolusInfo = DetailedBolusInfo()
                     detailedBolusInfo.carbs = anInteger().toDouble()
@@ -931,7 +943,6 @@ class SmsCommunicatorPlugin @Inject constructor(
         }
     }
 
-    @kotlin.ExperimentalStdlibApi
     private fun processTARGET(divided: Array<String>, receivedSms: Sms) {
         val isMeal = divided[1].equals("MEAL", ignoreCase = true)
         val isActivity = divided[1].equals("ACTIVITY", ignoreCase = true)
@@ -941,7 +952,7 @@ class SmsCommunicatorPlugin @Inject constructor(
             val passCode = generatePassCode()
             val reply = String.format(resourceHelper.gs(R.string.smscommunicator_temptargetwithcode), divided[1].uppercase(Locale.getDefault()), passCode)
             receivedSms.processed = true
-            messageToConfirm = AuthRequest(injector, receivedSms, reply, passCode, object : SmsAction() {
+            messageToConfirm = AuthRequest(injector, receivedSms, reply, passCode, object : SmsAction(pumpCommand = false) {
                 override fun run() {
                     val units = profileFunction.getUnits()
                     var keyDuration = 0
@@ -979,7 +990,7 @@ class SmsCommunicatorPlugin @Inject constructor(
                     var tt = sp.getDouble(keyTarget, if (units == GlucoseUnit.MMOL) defaultTargetMMOL else defaultTargetMGDL)
                     tt = Profile.toCurrentUnits(profileFunction, tt)
                     tt = if (tt > 0) tt else if (units == GlucoseUnit.MMOL) defaultTargetMMOL else defaultTargetMGDL
-                    disposable += repository.runTransactionForResult(InsertTemporaryTargetAndCancelCurrentTransaction(
+                    disposable += repository.runTransactionForResult(InsertAndCancelCurrentTemporaryTargetTransaction(
                         timestamp = dateUtil.now(),
                         duration = TimeUnit.MINUTES.toMillis(ttDuration.toLong()),
                         reason = TemporaryTarget.Reason.EATING_SOON,
@@ -1003,7 +1014,7 @@ class SmsCommunicatorPlugin @Inject constructor(
             val passCode = generatePassCode()
             val reply = String.format(resourceHelper.gs(R.string.smscommunicator_temptargetcancel), passCode)
             receivedSms.processed = true
-            messageToConfirm = AuthRequest(injector, receivedSms, reply, passCode, object : SmsAction() {
+            messageToConfirm = AuthRequest(injector, receivedSms, reply, passCode, object : SmsAction(pumpCommand = false) {
                 override fun run() {
                     disposable += repository.runTransactionForResult(CancelCurrentTemporaryTargetIfAnyTransaction(dateUtil.now()))
                         .subscribe({ result ->
@@ -1028,7 +1039,7 @@ class SmsCommunicatorPlugin @Inject constructor(
             val passCode = generatePassCode()
             val reply = String.format(resourceHelper.gs(R.string.smscommunicator_stopsmswithcode), passCode)
             receivedSms.processed = true
-            messageToConfirm = AuthRequest(injector, receivedSms, reply, passCode, object : SmsAction() {
+            messageToConfirm = AuthRequest(injector, receivedSms, reply, passCode, object : SmsAction(pumpCommand = false) {
                 override fun run() {
                     sp.putBoolean(R.string.key_smscommunicator_remotecommandsallowed, false)
                     val replyText = String.format(resourceHelper.gs(R.string.smscommunicator_stoppedsms))
@@ -1046,7 +1057,7 @@ class SmsCommunicatorPlugin @Inject constructor(
             val passCode = generatePassCode()
             val reply = String.format(resourceHelper.gs(R.string.smscommunicator_calibrationreplywithcode), cal, passCode)
             receivedSms.processed = true
-            messageToConfirm = AuthRequest(injector, receivedSms, reply, passCode, object : SmsAction(cal) {
+            messageToConfirm = AuthRequest(injector, receivedSms, reply, passCode, object : SmsAction(pumpCommand = false, cal) {
                 override fun run() {
                     val result = xdripCalibrations.sendIntent(aDouble!!)
                     val replyText =
@@ -1080,7 +1091,6 @@ class SmsCommunicatorPlugin @Inject constructor(
     }
 
     fun sendSMS(sms: Sms): Boolean {
-        val smsManager = SmsManager.getDefault()
         sms.text = stripAccents(sms.text)
         try {
             aapsLogger.debug(LTag.SMS, "Sending SMS to " + sms.phoneNumber + ": " + sms.text)
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/activities/SmsCommunicatorOtpActivity.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/activities/SmsCommunicatorOtpActivity.kt
index bc81bc1f7d..f227a205db 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/activities/SmsCommunicatorOtpActivity.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/activities/SmsCommunicatorOtpActivity.kt
@@ -88,7 +88,7 @@ class SmsCommunicatorOtpActivity : NoSplashAppCompatActivity() {
                 Runnable {
                     val clipboard = getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager
                     val clip = ClipData.newPlainText("OTP Secret", otp.provisioningSecret())
-                    clipboard.primaryClip = clip
+                    clipboard.setPrimaryClip(clip)
                     ToastUtils.Long.infoToast(this, resourceHelper.gs(R.string.smscommunicator_otp_export_successful))
                     uel.log(Action.OTP_EXPORT, Sources.SMS)
                 })
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/otp/OneTimePassword.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/otp/OneTimePassword.kt
index 77470340a1..75235ca487 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/otp/OneTimePassword.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/otp/OneTimePassword.kt
@@ -5,6 +5,7 @@ import com.eatthepath.otp.HmacOneTimePasswordGenerator
 import com.google.common.io.BaseEncoding
 import info.nightscout.androidaps.Constants
 import info.nightscout.androidaps.R
+import info.nightscout.androidaps.annotations.OpenForTesting
 import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import info.nightscout.androidaps.utils.sharedPreferences.SP
@@ -15,6 +16,7 @@ import javax.crypto.spec.SecretKeySpec
 import javax.inject.Inject
 import javax.inject.Singleton
 
+@OpenForTesting
 @Singleton
 class OneTimePassword @Inject constructor(
     private val sp: SP,
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/ActionStringHandler.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/ActionStringHandler.kt
index 0385823728..df0881d908 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/ActionStringHandler.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/ActionStringHandler.kt
@@ -20,7 +20,7 @@ import info.nightscout.androidaps.database.entities.UserEntry.Sources
 import info.nightscout.androidaps.database.entities.ValueWithUnit
 import info.nightscout.androidaps.database.interfaces.end
 import info.nightscout.androidaps.database.transactions.CancelCurrentTemporaryTargetIfAnyTransaction
-import info.nightscout.androidaps.database.transactions.InsertTemporaryTargetAndCancelCurrentTransaction
+import info.nightscout.androidaps.database.transactions.InsertAndCancelCurrentTemporaryTargetTransaction
 import info.nightscout.androidaps.extensions.total
 import info.nightscout.androidaps.extensions.valueToUnits
 import info.nightscout.androidaps.interfaces.*
@@ -572,7 +572,7 @@ class ActionStringHandler @Inject constructor(
 
     private fun generateTempTarget(duration: Int, low: Double, high: Double) {
         if (duration != 0) {
-            disposable += repository.runTransactionForResult(InsertTemporaryTargetAndCancelCurrentTransaction(
+            disposable += repository.runTransactionForResult(InsertAndCancelCurrentTemporaryTargetTransaction(
                 timestamp = System.currentTimeMillis(),
                 duration = TimeUnit.MINUTES.toMillis(duration.toLong()),
                 reason = TemporaryTarget.Reason.WEAR,
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/wearintegration/WatchUpdaterService.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/wearintegration/WatchUpdaterService.java
index d18d9e96bb..1e5c4364e6 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/wearintegration/WatchUpdaterService.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/wearintegration/WatchUpdaterService.java
@@ -29,12 +29,9 @@ import java.util.stream.Collectors;
 import javax.inject.Inject;
 
 import dagger.android.AndroidInjection;
-import info.nightscout.androidaps.interfaces.Config;
 import info.nightscout.androidaps.Constants;
 import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.data.IobTotal;
-import info.nightscout.androidaps.interfaces.GlucoseUnit;
-import info.nightscout.androidaps.interfaces.Profile;
 import info.nightscout.androidaps.database.AppRepository;
 import info.nightscout.androidaps.database.entities.Bolus;
 import info.nightscout.androidaps.database.entities.GlucoseValue;
@@ -42,8 +39,11 @@ import info.nightscout.androidaps.database.entities.TemporaryBasal;
 import info.nightscout.androidaps.extensions.GlucoseValueExtensionKt;
 import info.nightscout.androidaps.extensions.TemporaryBasalExtensionKt;
 import info.nightscout.androidaps.interfaces.ActivePlugin;
+import info.nightscout.androidaps.interfaces.Config;
+import info.nightscout.androidaps.interfaces.GlucoseUnit;
 import info.nightscout.androidaps.interfaces.IobCobCalculator;
 import info.nightscout.androidaps.interfaces.PluginType;
+import info.nightscout.androidaps.interfaces.Profile;
 import info.nightscout.androidaps.interfaces.ProfileFunction;
 import info.nightscout.androidaps.logging.AAPSLogger;
 import info.nightscout.androidaps.logging.LTag;
@@ -59,7 +59,7 @@ import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatusProv
 import info.nightscout.androidaps.receivers.ReceiverStatusStore;
 import info.nightscout.androidaps.utils.DecimalFormatter;
 import info.nightscout.androidaps.utils.DefaultValueHelper;
-import info.nightscout.androidaps.utils.ToastUtils;
+import info.nightscout.androidaps.utils.TrendCalculator;
 import info.nightscout.androidaps.utils.resources.ResourceHelper;
 import info.nightscout.androidaps.utils.sharedPreferences.SP;
 
@@ -79,6 +79,7 @@ public class WatchUpdaterService extends WearableListenerService implements Goog
     @Inject public AppRepository repository;
     @Inject ReceiverStatusStore receiverStatusStore;
     @Inject Config config;
+    @Inject public TrendCalculator trendCalculator;
 
     public static final String ACTION_RESEND = WatchUpdaterService.class.getName().concat(".Resend");
     public static final String ACTION_OPEN_SETTINGS = WatchUpdaterService.class.getName().concat(".OpenSettings");
@@ -322,7 +323,7 @@ public class WatchUpdaterService extends WearableListenerService implements Goog
             dataMap.putString("delta", "--");
             dataMap.putString("avgDelta", "--");
         } else {
-            dataMap.putString("slopeArrow", slopeArrow(glucoseStatus.getDelta()));
+            dataMap.putString("slopeArrow", trendCalculator.getTrendArrow(lastBG).getSymbol());
             dataMap.putString("delta", deltastring(glucoseStatus.getDelta(), glucoseStatus.getDelta() * Constants.MGDL_TO_MMOLL, units));
             dataMap.putString("avgDelta", deltastring(glucoseStatus.getShortAvgDelta(), glucoseStatus.getShortAvgDelta() * Constants.MGDL_TO_MMOLL, units));
         }
@@ -358,25 +359,6 @@ public class WatchUpdaterService extends WearableListenerService implements Goog
         return deltastring;
     }
 
-    private String slopeArrow(double delta) {
-        if (delta <= (-3.5 * 5)) {
-            return "\u21ca";
-        } else if (delta <= (-2 * 5)) {
-            return "\u2193";
-        } else if (delta <= (-1 * 5)) {
-            return "\u2198";
-        } else if (delta <= (1 * 5)) {
-            return "\u2192";
-        } else if (delta <= (2 * 5)) {
-            return "\u2197";
-        } else if (delta <= (3.5 * 5)) {
-            return "\u2191";
-        } else {
-            return "\u21c8";
-        }
-    }
-
-
     private void resendData() {
         if (googleApiClient != null && !googleApiClient.isConnected() && !googleApiClient.isConnecting()) {
             googleApiConnect();
@@ -391,16 +373,10 @@ public class WatchUpdaterService extends WearableListenerService implements Goog
 
         if (!graph_bgs.isEmpty()) {
             DataMap entries = dataMapSingleBG(last_bg, glucoseStatus);
-            if (entries == null) {
-                ToastUtils.showToastInUiThread(this, resourceHelper.gs(R.string.noprofile));
-                return;
-            }
             final ArrayList<DataMap> dataMaps = new ArrayList<>(graph_bgs.size());
             for (GlucoseValue bg : graph_bgs) {
                 DataMap dataMap = dataMapSingleBG(bg, glucoseStatus);
-                if (dataMap != null) {
-                    dataMaps.add(dataMap);
-                }
+                dataMaps.add(dataMap);
             }
             entries.putDataMapArrayList("entries", dataMaps);
             (new SendToDataLayerThread(WEARABLE_DATA_PATH, googleApiClient)).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, entries);
@@ -505,7 +481,7 @@ public class WatchUpdaterService extends WearableListenerService implements Goog
             tb2 = iobCobCalculator.getTempBasalIncludingConvertedExtended(now); //use "now" to express current situation
             if (tb2 == null) {
                 //express the cancelled temp by painting it down one minute early
-                temps.add(tempDatamap(tb_start, tb_before, now - 1 * 60 * 1000, endBasalValue, tb_amount));
+                temps.add(tempDatamap(tb_start, tb_before, now - 60 * 1000, endBasalValue, tb_amount));
             } else {
                 //express currently running temp by painting it a bit into the future
                 Profile profileNow = profileFunction.getProfile(now);
@@ -523,7 +499,7 @@ public class WatchUpdaterService extends WearableListenerService implements Goog
                 //onset at the end
                 Profile profileTB = profileFunction.getProfile(runningTime);
                 double currentAmount = TemporaryBasalExtensionKt.convertedToAbsolute(tb2, runningTime, profileTB);
-                temps.add(tempDatamap(now - 1 * 60 * 1000, endBasalValue, runningTime + 5 * 60 * 1000, currentAmount, currentAmount));
+                temps.add(tempDatamap(now - 60 * 1000, endBasalValue, runningTime + 5 * 60 * 1000, currentAmount, currentAmount));
             }
         }
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobCalculatorPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobCalculatorPlugin.kt
index 6a0d5bb2de..3ecfbc1f86 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobCalculatorPlugin.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobCalculatorPlugin.kt
@@ -5,6 +5,7 @@ import androidx.collection.LongSparseArray
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.Constants
 import info.nightscout.androidaps.R
+import info.nightscout.androidaps.annotations.OpenForTesting
 import info.nightscout.androidaps.data.IobTotal
 import info.nightscout.androidaps.data.MealData
 import info.nightscout.androidaps.database.AppRepository
@@ -42,8 +43,9 @@ import kotlin.math.floor
 import kotlin.math.max
 import kotlin.math.min
 
+@OpenForTesting
 @Singleton
-open class IobCobCalculatorPlugin @Inject constructor(
+class IobCobCalculatorPlugin @Inject constructor(
     injector: HasAndroidInjector,
     aapsLogger: AAPSLogger,
     private val aapsSchedulers: AapsSchedulers,
@@ -130,7 +132,7 @@ open class IobCobCalculatorPlugin @Inject constructor(
         runCalculation(reason, System.currentTimeMillis(), bgDataReload = false, limitDataToOldestAvailable = true, cause = event)
     }
 
-    fun clearCache() {
+    override fun clearCache() {
         synchronized(dataLock) {
             aapsLogger.debug(LTag.AUTOSENS, "Clearing cached data.")
             iobTable = LongSparseArray()
@@ -268,18 +270,19 @@ open class IobCobCalculatorPlugin @Inject constructor(
         var displayCob: Double? = null
         var futureCarbs = 0.0
         val now = dateUtil.now()
-        val carbs = repository.getCarbsDataFromTimeExpanded(now, true).blockingGet()
+        var timestamp = now
+        val carbs = repository.getCarbsDataFromTimeExpanded(autosensData?.time ?: now, true).blockingGet()
         if (autosensData != null) {
             displayCob = autosensData.cob
             carbs.forEach { carb ->
-                if (ads.roundUpTime(carb.timestamp) > ads.roundUpTime(autosensData.time) && carb.timestamp <= now) {
+                if (carb.timestamp > autosensData.time && carb.timestamp <= now)
                     displayCob += carb.amount
-                }
             }
+            timestamp = autosensData.time
         }
         // Future carbs
         carbs.forEach { carb -> if (carb.timestamp > now) futureCarbs += carb.amount }
-        return CobInfo(displayCob, futureCarbs)
+        return CobInfo(timestamp, displayCob, futureCarbs)
     }
 
     override fun getMealDataWithWaitingForCalculationFinish(): MealData {
@@ -482,7 +485,7 @@ open class IobCobCalculatorPlugin @Inject constructor(
             for (pos in extendedBoluses.indices) {
                 val e = extendedBoluses[pos]
                 if (e.timestamp > toTime) continue
-                if (e.end > now) e.end = now
+                if (e.end > now) e.duration = now - e.timestamp
                 val profile = profileFunction.getProfile(e.timestamp) ?: return total
                 val calc = e.iobCalc(toTime, profile, activePlugin.activeInsulin)
                 total.plus(calc)
@@ -507,10 +510,11 @@ open class IobCobCalculatorPlugin @Inject constructor(
 
         val tb = repository.getTemporaryBasalActiveAt(timestamp).blockingGet()
         if (tb is ValueWrapper.Existing) return tb.value
-        val eb = repository.getExtendedBolusActiveAt(timestamp).blockingGet()
-        val profile = profileFunction.getProfile(timestamp) ?: return null
-        if (eb is ValueWrapper.Existing && activePlugin.activePump.isFakingTempsByExtendedBoluses)
-            return eb.value.toTemporaryBasal(profile)
+        if (activePlugin.activePump.isFakingTempsByExtendedBoluses) {
+            val eb = repository.getExtendedBolusActiveAt(timestamp).blockingGet()
+            val profile = profileFunction.getProfile(timestamp) ?: return null
+            if (eb is ValueWrapper.Existing) return eb.value.toTemporaryBasal(profile)
+        }
         return null
     }
 
@@ -551,7 +555,7 @@ open class IobCobCalculatorPlugin @Inject constructor(
             val t = temporaryBasals[pos]
             if (t.timestamp > toTime) continue
             val profile = profileFunction.getProfile(t.timestamp) ?: continue
-            if (t.end > now) t.end = now
+            if (t.end > now) t.duration = now - t.timestamp
             val calc = t.iobCalc(toTime, profile, activePlugin.activeInsulin)
             //log.debug("BasalIOB " + new Date(time) + " >>> " + calc.basalIob);
             total.plus(calc)
@@ -563,7 +567,7 @@ open class IobCobCalculatorPlugin @Inject constructor(
                 val e = extendedBoluses[pos]
                 if (e.timestamp > toTime) continue
                 val profile = profileFunction.getProfile(e.timestamp) ?: continue
-                if (e.end > now) e.end = now
+                if (e.end > now) e.duration = now - e.timestamp
                 val calc = e.iobCalc(toTime, profile, activePlugin.activeInsulin)
                 totalExt.plus(calc)
             }
@@ -577,7 +581,7 @@ open class IobCobCalculatorPlugin @Inject constructor(
         return total
     }
 
-    open fun getCalculationToTimeTempBasals(toTime: Long, lastAutosensResult: AutosensResult, exercise_mode: Boolean, half_basal_exercise_target: Int, isTempTarget: Boolean): IobTotal {
+    fun getCalculationToTimeTempBasals(toTime: Long, lastAutosensResult: AutosensResult, exercise_mode: Boolean, half_basal_exercise_target: Int, isTempTarget: Boolean): IobTotal {
         val total = IobTotal(toTime)
         val pumpInterface = activePlugin.activePump
         val now = dateUtil.now()
@@ -586,7 +590,7 @@ open class IobCobCalculatorPlugin @Inject constructor(
             val t = temporaryBasals[pos]
             if (t.timestamp > toTime) continue
             val profile = profileFunction.getProfile(t.timestamp) ?: continue
-            if (t.end > now) t.end = now
+            if (t.end > now) t.duration = now - t.timestamp
             val calc = t.iobCalc(toTime, profile, lastAutosensResult, exercise_mode, half_basal_exercise_target, isTempTarget, activePlugin.activeInsulin)
             //log.debug("BasalIOB " + new Date(time) + " >>> " + calc.basalIob);
             total.plus(calc)
@@ -598,7 +602,7 @@ open class IobCobCalculatorPlugin @Inject constructor(
                 val e = extendedBoluses[pos]
                 if (e.timestamp > toTime) continue
                 val profile = profileFunction.getProfile(e.timestamp) ?: continue
-                if (e.end > now) e.end = now
+                if (e.end > now) e.duration = now - e.timestamp
                 val calc = e.iobCalc(toTime, profile, lastAutosensResult, exercise_mode, half_basal_exercise_target, isTempTarget, activePlugin.activeInsulin)
                 totalExt.plus(calc)
             }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobOref1Thread.kt b/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobOref1Thread.kt
index d577666d27..51ef6da52f 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobOref1Thread.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobOref1Thread.kt
@@ -99,7 +99,7 @@ class IobCobOref1Thread internal constructor(
             // start from oldest to be able sub cob
             for (i in bucketedData.size - 4 downTo 0) {
                 val progress = i.toString() + if (buildHelper.isDev()) " ($from)" else ""
-                rxBus.send(EventIobCalculationProgress(progress))
+                rxBus.send(EventIobCalculationProgress(progress, cause))
                 if (iobCobCalculatorPlugin.stopCalculationTrigger) {
                     iobCobCalculatorPlugin.stopCalculationTrigger = false
                     aapsLogger.debug(LTag.AUTOSENS, "Aborting calculation thread (trigger): $from")
@@ -325,7 +325,7 @@ class IobCobOref1Thread internal constructor(
             }.start()
         } finally {
             mWakeLock?.release()
-            rxBus.send(EventIobCalculationProgress(""))
+            rxBus.send(EventIobCalculationProgress("", cause))
             aapsLogger.debug(LTag.AUTOSENS, "AUTOSENSDATA thread ended: $from")
             profiler.log(LTag.AUTOSENS, "IobCobOref1Thread", start)
         }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobThread.kt b/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobThread.kt
index e6fa48cca2..cd3c12c438 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobThread.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobThread.kt
@@ -98,7 +98,7 @@ class IobCobThread @Inject internal constructor(
             // start from oldest to be able sub cob
             for (i in bucketedData.size - 4 downTo 0) {
                 val progress = i.toString() + if (buildHelper.isDev()) " ($from)" else ""
-                rxBus.send(EventIobCalculationProgress(progress))
+                rxBus.send(EventIobCalculationProgress(progress, cause))
                 if (iobCobCalculatorPlugin.stopCalculationTrigger) {
                     iobCobCalculatorPlugin.stopCalculationTrigger = false
                     aapsLogger.debug(LTag.AUTOSENS, "Aborting calculation thread (trigger): $from")
@@ -272,7 +272,7 @@ class IobCobThread @Inject internal constructor(
             }.start()
         } finally {
             mWakeLock?.release()
-            rxBus.send(EventIobCalculationProgress(""))
+            rxBus.send(EventIobCalculationProgress("", cause))
             aapsLogger.debug(LTag.AUTOSENS, "AUTOSENSDATA thread ended: $from")
             profiler.log(LTag.AUTOSENS, "IobCobThread", start)
         }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/events/EventIobCalculationProgress.kt b/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/events/EventIobCalculationProgress.kt
index f2e8059b10..a5326e4ad3 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/events/EventIobCalculationProgress.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/events/EventIobCalculationProgress.kt
@@ -2,4 +2,4 @@ package info.nightscout.androidaps.plugins.iob.iobCobCalculator.events
 
 import info.nightscout.androidaps.events.Event
 
-class EventIobCalculationProgress(var progress: String) : Event()
\ No newline at end of file
+class EventIobCalculationProgress(val progress: String, val cause: Event?) : Event()
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/profile/local/LocalProfileFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/profile/local/LocalProfileFragment.kt
index 31f01df6c1..989ef9dbdb 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/profile/local/LocalProfileFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/profile/local/LocalProfileFragment.kt
@@ -28,6 +28,8 @@ import info.nightscout.androidaps.utils.*
 import info.nightscout.androidaps.utils.alertDialogs.OKDialog
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import info.nightscout.androidaps.utils.rx.AapsSchedulers
+import info.nightscout.androidaps.utils.ui.SpinnerHelper
+import info.nightscout.androidaps.utils.ui.TimeListEdit
 import io.reactivex.disposables.CompositeDisposable
 import io.reactivex.rxkotlin.plusAssign
 import java.text.DecimalFormat
@@ -70,7 +72,7 @@ class LocalProfileFragment : DaggerFragment() {
     }
 
     private fun sumLabel(): String {
-        val profile = localProfilePlugin.createProfileStore().getDefaultProfile()
+        val profile = localProfilePlugin.getEditProfile()
         val sum = profile?.let { ProfileSealed.Pure(profile).baseBasalSum() } ?: 0.0
         return " ∑" + DecimalFormatter.to2Decimal(sum) + resourceHelper.gs(R.string.insulin_unit_shortname)
     }
@@ -127,7 +129,7 @@ class LocalProfileFragment : DaggerFragment() {
         binding.dia.setParams(currentProfile.dia, hardLimits.minDia(), hardLimits.maxDia(), 0.1, DecimalFormat("0.0"), false, binding.save, textWatch)
         binding.dia.tag = "LP_DIA"
         TimeListEdit(context, aapsLogger, dateUtil, view, R.id.ic, "IC", resourceHelper.gs(R.string.ic_label), currentProfile.ic, null, hardLimits.minIC(), hardLimits.maxIC(), 0.1, DecimalFormat("0.0"), save)
-        basalView = TimeListEdit(context, aapsLogger, dateUtil, view, R.id.basal_holder, "BASAL", resourceHelper.gs(R.string.basal_label) + ": " + sumLabel(), currentProfile.basal, null, pumpDescription.basalMinimumRate, 10.0, 0.01, DecimalFormat("0.00"), save)
+        basalView = TimeListEdit(context, aapsLogger, dateUtil, view, R.id.basal_holder, "BASAL", resourceHelper.gs(R.string.basal_label) + ": " + sumLabel(), currentProfile.basal, null, pumpDescription.basalMinimumRate, pumpDescription.basalMaximumRate, 0.01, DecimalFormat("0.00"), save)
         if (units == Constants.MGDL) {
             TimeListEdit(context, aapsLogger, dateUtil, view, R.id.isf, "ISF", resourceHelper.gs(R.string.isf_label), currentProfile.isf, null, HardLimits.MIN_ISF, HardLimits.MAX_ISF, 1.0, DecimalFormat("0"), save)
             TimeListEdit(context, aapsLogger, dateUtil, view, R.id.target, "TARGET", resourceHelper.gs(R.string.target_label), currentProfile.targetLow, currentProfile.targetHigh, HardLimits.VERY_HARD_LIMIT_TARGET_BG[0].toDouble(), HardLimits.VERY_HARD_LIMIT_TARGET_BG[1].toDouble(), 1.0, DecimalFormat("0"), save)
@@ -210,7 +212,7 @@ class LocalProfileFragment : DaggerFragment() {
         binding.profileswitch.setOnClickListener {
             ProfileSwitchDialog()
                 .also { it.arguments = Bundle().also { bundle -> bundle.putInt("profileIndex", localProfilePlugin.currentProfileIndex) } }
-                .show(childFragmentManager, "NewNSTreatmentDialog")
+                .show(childFragmentManager, "ProfileSwitchDialog")
         }
 
         binding.reset.setOnClickListener {
@@ -257,7 +259,7 @@ class LocalProfileFragment : DaggerFragment() {
         updateGUI()
     }
 
-    fun updateGUI() {
+    private fun updateGUI() {
         if (_binding == null) return
         val isValid = localProfilePlugin.isValidEditState()
         val isEdited = localProfilePlugin.isEdited
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 42afbb4c5c..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
@@ -8,10 +8,12 @@ import androidx.work.workDataOf
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.Constants
 import info.nightscout.androidaps.R
+import info.nightscout.androidaps.annotations.OpenForTesting
 import info.nightscout.androidaps.data.ProfileSealed
 import info.nightscout.androidaps.data.PureProfile
 import info.nightscout.androidaps.events.EventProfileStoreChanged
 import info.nightscout.androidaps.extensions.blockFromJsonArray
+import info.nightscout.androidaps.extensions.pureProfileFromJson
 import info.nightscout.androidaps.interfaces.*
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
@@ -21,6 +23,7 @@ import info.nightscout.androidaps.receivers.DataWorker
 import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.utils.DecimalFormatter
 import info.nightscout.androidaps.utils.HardLimits
+import info.nightscout.androidaps.utils.JsonHelper
 import info.nightscout.androidaps.utils.alertDialogs.OKDialog
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import info.nightscout.androidaps.utils.sharedPreferences.SP
@@ -33,6 +36,7 @@ import javax.inject.Inject
 import javax.inject.Singleton
 import kotlin.collections.ArrayList
 
+@OpenForTesting
 @Singleton
 class LocalProfilePlugin @Inject constructor(
     injector: HasAndroidInjector,
@@ -97,7 +101,7 @@ class LocalProfilePlugin @Inject constructor(
     var numOfProfiles = 0
     internal var currentProfileIndex = 0
 
-    fun currentProfile(): SingleProfile? = if (numOfProfiles > 0) profiles[currentProfileIndex] else null
+    fun currentProfile(): SingleProfile? = if (numOfProfiles > 0 && currentProfileIndex < numOfProfiles) profiles[currentProfileIndex] else null
 
     @Synchronized
     fun isValidEditState(): Boolean {
@@ -106,39 +110,60 @@ class LocalProfilePlugin @Inject constructor(
             if (dia < hardLimits.minDia() || dia > hardLimits.maxDia()) return false
             if (name.isNullOrEmpty()) return false
             if (blockFromJsonArray(ic, dateUtil)?.any { it.amount < hardLimits.minIC() || it.amount > hardLimits.maxIC() } != false) return false
-            if (blockFromJsonArray(isf, dateUtil)?.any { it.amount < HardLimits.MIN_ISF || it.amount > HardLimits.MAX_ISF } != false) return false
             if (blockFromJsonArray(basal, dateUtil)?.any { it.amount < pumpDescription.basalMinimumRate || it.amount > 10.0 } != false) return false
             val low = blockFromJsonArray(targetLow, dateUtil)
             val high = blockFromJsonArray(targetHigh, dateUtil)
             if (profileFunction.getUnits() == GlucoseUnit.MGDL) {
                 if (low?.any { it.amount < HardLimits.VERY_HARD_LIMIT_TARGET_BG[0].toDouble() || it.amount > HardLimits.VERY_HARD_LIMIT_TARGET_BG[1].toDouble() } != false) return false
                 if (high?.any { it.amount < HardLimits.VERY_HARD_LIMIT_TARGET_BG[0].toDouble() || it.amount > HardLimits.VERY_HARD_LIMIT_TARGET_BG[1].toDouble() } != false) return false
+                if (blockFromJsonArray(isf, dateUtil)?.any { it.amount < HardLimits.MIN_ISF || it.amount > HardLimits.MAX_ISF } != false) return false
             } else {
                 if (low?.any { it.amount < Profile.fromMgdlToUnits(HardLimits.VERY_HARD_LIMIT_TARGET_BG[0].toDouble(), GlucoseUnit.MMOL) || it.amount > Profile.fromMgdlToUnits(HardLimits.VERY_HARD_LIMIT_TARGET_BG[1].toDouble(), GlucoseUnit.MMOL) } != false) return false
                 if (high?.any { it.amount < Profile.fromMgdlToUnits(HardLimits.VERY_HARD_LIMIT_TARGET_BG[0].toDouble(), GlucoseUnit.MMOL) || it.amount > Profile.fromMgdlToUnits(HardLimits.VERY_HARD_LIMIT_TARGET_BG[1].toDouble(), GlucoseUnit.MMOL) } != false) return false
+                if (blockFromJsonArray(isf, dateUtil)?.any { it.amount < Profile.fromMgdlToUnits(HardLimits.MIN_ISF, GlucoseUnit.MMOL) || it.amount > Profile.fromMgdlToUnits(HardLimits.MAX_ISF, GlucoseUnit.MMOL) } != false) return false
             }
             for (i in low.indices) if (low[i].amount > high[i].amount) return false
         }
         return true
     }
 
+    @Synchronized
+    fun getEditProfile(): PureProfile? {
+        val profile = JSONObject()
+        with(profiles[currentProfileIndex]) {
+            profile.put("dia", dia)
+            profile.put("carbratio", ic)
+            profile.put("sens", isf)
+            profile.put("basal", basal)
+            profile.put("target_low", targetLow)
+            profile.put("target_high", targetHigh)
+            profile.put("units", if (mgdl) Constants.MGDL else Constants.MMOL)
+            profile.put("timezone", TimeZone.getDefault().id)
+        }
+        val defaultUnits = JsonHelper.safeGetStringAllowNull(profile, "units", null)
+        return pureProfileFromJson(profile, dateUtil, defaultUnits)
+    }
+
     @Synchronized
     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)
 
+        sp.putLong(R.string.key_local_profile_last_change, dateUtil.now())
         createAndStoreConvertedProfile()
         isEdited = false
         aapsLogger.debug(LTag.PROFILE, "Storing settings: " + rawProfile?.data.toString())
@@ -148,12 +173,9 @@ class LocalProfilePlugin @Inject constructor(
             val name = it.name ?: "."
             if (name.contains(".")) namesOK = false
         }
-        if (namesOK)
-            sp.putLong(R.string.key_local_profile_last_change, dateUtil.now())
-        else
-            activity?.let {
-                OKDialog.show(it, "", resourceHelper.gs(R.string.profilenamecontainsdot))
-            }
+        if (!namesOK) activity?.let {
+            OKDialog.show(it, "", resourceHelper.gs(R.string.profilenamecontainsdot))
+        }
     }
 
     @Synchronized
@@ -359,20 +381,23 @@ class LocalProfilePlugin @Inject constructor(
         try {
             for (i in 0 until numOfProfiles) {
                 profiles[i].run {
-                    val profile = JSONObject()
-                    profile.put("dia", dia)
-                    profile.put("carbratio", ic)
-                    profile.put("sens", isf)
-                    profile.put("basal", basal)
-                    profile.put("target_low", targetLow)
-                    profile.put("target_high", targetHigh)
-                    profile.put("units", if (mgdl) Constants.MGDL else Constants.MMOL)
-                    profile.put("timezone", TimeZone.getDefault().id)
-                    store.put(name, profile)
+                    name?.let { name ->
+                        val profile = JSONObject()
+                        profile.put("dia", dia)
+                        profile.put("carbratio", ic)
+                        profile.put("sens", isf)
+                        profile.put("basal", basal)
+                        profile.put("target_low", targetLow)
+                        profile.put("target_high", targetHigh)
+                        profile.put("units", if (mgdl) Constants.MGDL else Constants.MMOL)
+                        profile.put("timezone", TimeZone.getDefault().id)
+                        store.put(name, profile)
+                    }
                 }
             }
             if (numOfProfiles > 0) json.put("defaultProfile", currentProfile()?.name)
-            json.put("startDate", dateUtil.toISOAsUTC(dateUtil.now()))
+            val startDate = sp.getLong(R.string.key_local_profile_last_change, dateUtil.now())
+            json.put("startDate", dateUtil.toISOAsUTC(startDate))
             json.put("store", store)
         } catch (e: JSONException) {
             aapsLogger.error("Unhandled exception", e)
@@ -411,12 +436,20 @@ class LocalProfilePlugin @Inject constructor(
         override fun doWork(): Result {
             val profileJson = dataWorker.pickupJSONObject(inputData.getLong(DataWorker.STORE_KEY, -1))
                 ?: return Result.failure(workDataOf("Error" to "missing input data"))
-            if (sp.getBoolean(R.string.key_ns_receive_profile_store, false) || config.NSCLIENT) {
-                localProfilePlugin.loadFromStore(ProfileStore(injector, profileJson, dateUtil))
-                aapsLogger.debug(LTag.PROFILE, "Received profileStore: $profileJson")
-                return Result.success(workDataOf("Data" to profileJson.toString().substring(0..min(5000, profileJson.length()))))
+            if (sp.getBoolean(R.string.key_ns_receive_profile_store, true) || config.NSCLIENT) {
+                val store = ProfileStore(injector, profileJson, dateUtil)
+                val startDate = store.getStartDate()
+                val lastLocalChange = sp.getLong(R.string.key_local_profile_last_change, 0)
+                aapsLogger.debug(LTag.PROFILE, "Received profileStore: StartDate: $startDate Local last modification: $lastLocalChange")
+                @Suppress("LiftReturnOrAssignment")
+                if (startDate > lastLocalChange || startDate % 1000 == 0L) {// whole second means edited in NS
+                    localProfilePlugin.loadFromStore(store)
+                    aapsLogger.debug(LTag.PROFILE, "Received profileStore: $profileJson")
+                    return Result.success(workDataOf("Data" to profileJson.toString().substring(0..min(5000, profileJson.length()))))
+                } else
+                    return Result.success(workDataOf("Result" to "Unchanged. Ignoring"))
             }
-            return Result.success()
+            return Result.success(workDataOf("Result" to "Sync not enabled"))
         }
     }
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/virtual/VirtualPumpFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/virtual/VirtualPumpFragment.kt
index f2eb4bb5e1..951a9db839 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/virtual/VirtualPumpFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/virtual/VirtualPumpFragment.kt
@@ -2,6 +2,7 @@ package info.nightscout.androidaps.plugins.pump.virtual
 
 import android.os.Bundle
 import android.os.Handler
+import android.os.HandlerThread
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -10,6 +11,7 @@ import info.nightscout.androidaps.R
 import info.nightscout.androidaps.databinding.VirtualpumpFragmentBinding
 import info.nightscout.androidaps.events.EventExtendedBolusChange
 import info.nightscout.androidaps.events.EventTempBasalChange
+import info.nightscout.androidaps.extensions.toStringFull
 import info.nightscout.androidaps.interfaces.IobCobCalculator
 import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
@@ -17,7 +19,6 @@ import info.nightscout.androidaps.plugins.pump.virtual.events.EventVirtualPumpUp
 import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.utils.FabricPrivacy
 import info.nightscout.androidaps.utils.T
-import info.nightscout.androidaps.extensions.toStringFull
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import info.nightscout.androidaps.utils.rx.AapsSchedulers
 import io.reactivex.disposables.CompositeDisposable
@@ -37,15 +38,8 @@ class VirtualPumpFragment : DaggerFragment() {
 
     private val disposable = CompositeDisposable()
 
-    private val loopHandler = Handler()
     private lateinit var refreshLoop: Runnable
-
-    init {
-        refreshLoop = Runnable {
-            activity?.runOnUiThread { updateGui() }
-            loopHandler.postDelayed(refreshLoop, T.mins(1).msecs())
-        }
-    }
+    private lateinit var handler: Handler
 
     private var _binding: VirtualpumpFragmentBinding? = null
 
@@ -58,7 +52,11 @@ class VirtualPumpFragment : DaggerFragment() {
         return binding.root
     }
 
-    @Synchronized
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        handler = Handler(HandlerThread(this::class.simpleName + "Handler").also { it.start() }.looper)
+    }
+        @Synchronized
     override fun onResume() {
         super.onResume()
         disposable += rxBus
@@ -73,7 +71,11 @@ class VirtualPumpFragment : DaggerFragment() {
             .toObservable(EventExtendedBolusChange::class.java)
             .observeOn(aapsSchedulers.main)
             .subscribe({ updateGui() }, fabricPrivacy::logException)
-        loopHandler.postDelayed(refreshLoop, T.mins(1).msecs())
+        refreshLoop = Runnable {
+            activity?.runOnUiThread { updateGui() }
+            handler.postDelayed(refreshLoop, T.mins(1).msecs())
+        }
+        handler.postDelayed(refreshLoop, T.mins(1).msecs())
         updateGui()
     }
 
@@ -81,7 +83,7 @@ class VirtualPumpFragment : DaggerFragment() {
     override fun onPause() {
         super.onPause()
         disposable.clear()
-        loopHandler.removeCallbacks(refreshLoop)
+        handler.removeCallbacksAndMessages(null)
     }
 
     @Synchronized
@@ -107,5 +109,6 @@ class VirtualPumpFragment : DaggerFragment() {
 
         binding.type.text = pumpType?.description
         binding.typeDef.text = pumpType?.getFullDescription(resourceHelper.gs(R.string.virtualpump_pump_def), pumpType.hasExtendedBasals(), resourceHelper)
+        binding.serialNumber.text = virtualPumpPlugin.serialNumber()
     }
 }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/sensitivity/SensitivityAAPSPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/sensitivity/SensitivityAAPSPlugin.kt
index d29659738c..b07b2375ab 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/sensitivity/SensitivityAAPSPlugin.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/sensitivity/SensitivityAAPSPlugin.kt
@@ -3,6 +3,7 @@ package info.nightscout.androidaps.plugins.sensitivity
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.Constants
 import info.nightscout.androidaps.R
+import info.nightscout.androidaps.annotations.OpenForTesting
 import info.nightscout.androidaps.database.AppRepository
 import info.nightscout.androidaps.database.entities.TherapyEvent
 import info.nightscout.androidaps.extensions.isEPSEvent5minBack
@@ -27,8 +28,9 @@ import javax.inject.Inject
 import javax.inject.Singleton
 import kotlin.math.roundToInt
 
+@OpenForTesting
 @Singleton
-open class SensitivityAAPSPlugin @Inject constructor(
+class SensitivityAAPSPlugin @Inject constructor(
     injector: HasAndroidInjector,
     aapsLogger: AAPSLogger,
     resourceHelper: ResourceHelper,
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/sensitivity/SensitivityOref1Plugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/sensitivity/SensitivityOref1Plugin.kt
index 06a704137c..d93cd05745 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/sensitivity/SensitivityOref1Plugin.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/sensitivity/SensitivityOref1Plugin.kt
@@ -3,6 +3,7 @@ package info.nightscout.androidaps.plugins.sensitivity
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.Constants
 import info.nightscout.androidaps.R
+import info.nightscout.androidaps.annotations.OpenForTesting
 import info.nightscout.androidaps.database.AppRepository
 import info.nightscout.androidaps.database.entities.TherapyEvent
 import info.nightscout.androidaps.extensions.isEPSEvent5minBack
@@ -28,8 +29,9 @@ import javax.inject.Inject
 import javax.inject.Singleton
 import kotlin.math.roundToInt
 
+@OpenForTesting
 @Singleton
-open class SensitivityOref1Plugin @Inject constructor(
+class SensitivityOref1Plugin @Inject constructor(
     injector: HasAndroidInjector,
     aapsLogger: AAPSLogger,
     resourceHelper: ResourceHelper,
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/sensitivity/SensitivityWeightedAveragePlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/sensitivity/SensitivityWeightedAveragePlugin.kt
index 755dece81f..df1b743f6f 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/sensitivity/SensitivityWeightedAveragePlugin.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/sensitivity/SensitivityWeightedAveragePlugin.kt
@@ -4,6 +4,7 @@ import androidx.collection.LongSparseArray
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.Constants
 import info.nightscout.androidaps.R
+import info.nightscout.androidaps.annotations.OpenForTesting
 import info.nightscout.androidaps.database.AppRepository
 import info.nightscout.androidaps.database.entities.TherapyEvent
 import info.nightscout.androidaps.extensions.isEPSEvent5minBack
@@ -26,8 +27,9 @@ import javax.inject.Inject
 import javax.inject.Singleton
 import kotlin.math.roundToInt
 
+@OpenForTesting
 @Singleton
-open class SensitivityWeightedAveragePlugin @Inject constructor(
+class SensitivityWeightedAveragePlugin @Inject constructor(
     injector: HasAndroidInjector,
     aapsLogger: AAPSLogger,
     resourceHelper: ResourceHelper,
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/source/DexcomPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/source/DexcomPlugin.kt
index 6b6cb588e8..d744d81340 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/source/DexcomPlugin.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/source/DexcomPlugin.kt
@@ -94,7 +94,7 @@ class DexcomPlugin @Inject constructor(
         override fun doWork(): Result {
             var ret = Result.success()
 
-            if (!dexcomPlugin.isEnabled(PluginType.BGSOURCE)) return Result.success()
+            if (!dexcomPlugin.isEnabled(PluginType.BGSOURCE)) return Result.success(workDataOf("Result" to "Plugin not enabled"))
             val bundle = dataWorker.pickupBundle(inputData.getLong(DataWorker.STORE_KEY, -1))
                 ?: return Result.failure(workDataOf("Error" to "missing input data"))
             try {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/source/EversensePlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/source/EversensePlugin.kt
index 434e5eb873..a6c51cf5de 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/source/EversensePlugin.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/source/EversensePlugin.kt
@@ -69,7 +69,7 @@ class EversensePlugin @Inject constructor(
         override fun doWork(): Result {
             var ret = Result.success()
 
-            if (!eversensePlugin.isEnabled(PluginType.BGSOURCE)) return Result.success()
+            if (!eversensePlugin.isEnabled(PluginType.BGSOURCE)) return Result.success(workDataOf("Result" to "Plugin not enabled"))
             val bundle = dataWorker.pickupBundle(inputData.getLong(DataWorker.STORE_KEY, -1))
                 ?: return Result.failure(workDataOf("Error" to "missing input data"))
             if (bundle.containsKey("currentCalibrationPhase")) aapsLogger.debug(LTag.BGSOURCE, "currentCalibrationPhase: " + bundle.getString("currentCalibrationPhase"))
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/source/GlimpPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/source/GlimpPlugin.kt
index 36724eb4b5..a6e0f24821 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/source/GlimpPlugin.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/source/GlimpPlugin.kt
@@ -6,6 +6,7 @@ import androidx.work.WorkerParameters
 import androidx.work.workDataOf
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.R
+import info.nightscout.androidaps.annotations.OpenForTesting
 import info.nightscout.androidaps.database.AppRepository
 import info.nightscout.androidaps.database.entities.GlucoseValue
 import info.nightscout.androidaps.database.transactions.CgmSourceTransaction
@@ -21,6 +22,7 @@ import info.nightscout.androidaps.utils.sharedPreferences.SP
 import javax.inject.Inject
 import javax.inject.Singleton
 
+@OpenForTesting
 @Singleton
 class GlimpPlugin @Inject constructor(
     injector: HasAndroidInjector,
@@ -56,7 +58,7 @@ class GlimpPlugin @Inject constructor(
         override fun doWork(): Result {
             var ret = Result.success()
 
-            if (!glimpPlugin.isEnabled(PluginType.BGSOURCE)) return Result.success()
+            if (!glimpPlugin.isEnabled(PluginType.BGSOURCE)) return Result.success(workDataOf("Result" to "Plugin not enabled"))
             aapsLogger.debug(LTag.BGSOURCE, "Received Glimp Data: $inputData}")
             val glucoseValues = mutableListOf<CgmSourceTransaction.TransactionGlucoseValue>()
             glucoseValues += CgmSourceTransaction.TransactionGlucoseValue(
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/source/NSClientSourcePlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/source/NSClientSourcePlugin.kt
index 52874bb335..e9181c6abd 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/source/NSClientSourcePlugin.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/source/NSClientSourcePlugin.kt
@@ -42,6 +42,7 @@ class NSClientSourcePlugin @Inject constructor(
     .fragmentClass(BGSourceFragment::class.java.name)
     .pluginIcon(R.drawable.ic_nsclient_bg)
     .pluginName(R.string.nsclientbg)
+    .shortName(R.string.nsclientbgshort)
     .description(R.string.description_source_ns_client),
     aapsLogger, resourceHelper, injector
 ), BgSource {
@@ -115,7 +116,7 @@ class NSClientSourcePlugin @Inject constructor(
         override fun doWork(): Result {
             var ret = Result.success()
 
-            if (!nsClientSourcePlugin.isEnabled() && !sp.getBoolean(R.string.key_ns_receive_cgm, true) && !dexcomPlugin.isEnabled()) return Result.success()
+            if (!nsClientSourcePlugin.isEnabled() && !sp.getBoolean(R.string.key_ns_receive_cgm, true) && !dexcomPlugin.isEnabled()) return Result.success(workDataOf("Result" to "Sync not enabled"))
 
             val sgvs = dataWorker.pickupJSONArray(inputData.getLong(DataWorker.STORE_KEY, -1))
                 ?: return Result.failure(workDataOf("Error" to "missing input data"))
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/source/PoctechPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/source/PoctechPlugin.kt
index 17aefac5b5..fa7e0a278a 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/source/PoctechPlugin.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/source/PoctechPlugin.kt
@@ -60,7 +60,7 @@ class PoctechPlugin @Inject constructor(
         override fun doWork(): Result {
             var ret = Result.success()
 
-            if (!poctechPlugin.isEnabled(PluginType.BGSOURCE)) return Result.success()
+            if (!poctechPlugin.isEnabled(PluginType.BGSOURCE)) return Result.success(workDataOf("Result" to "Plugin not enabled"))
             aapsLogger.debug(LTag.BGSOURCE, "Received Poctech Data $inputData")
             try {
                 val glucoseValues = mutableListOf<CgmSourceTransaction.TransactionGlucoseValue>()
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/source/TomatoPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/source/TomatoPlugin.kt
index cf6fce3da5..52773e1d76 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/source/TomatoPlugin.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/source/TomatoPlugin.kt
@@ -59,7 +59,7 @@ class TomatoPlugin @Inject constructor(
         override fun doWork(): Result {
             var ret = Result.success()
 
-            if (!tomatoPlugin.isEnabled(PluginType.BGSOURCE)) return Result.success()
+            if (!tomatoPlugin.isEnabled(PluginType.BGSOURCE)) return Result.success(workDataOf("Result" to "Plugin not enabled"))
             val glucoseValues = mutableListOf<CgmSourceTransaction.TransactionGlucoseValue>()
             glucoseValues += CgmSourceTransaction.TransactionGlucoseValue(
                 timestamp = inputData.getLong("com.fanqies.tomatofn.Extras.Time", 0),
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/source/XdripPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/source/XdripPlugin.kt
index 622d69c284..bbb8b2c7e1 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/source/XdripPlugin.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/source/XdripPlugin.kt
@@ -73,7 +73,7 @@ class XdripPlugin @Inject constructor(
         override fun doWork(): Result {
             var ret = Result.success()
 
-            if (!xdripPlugin.isEnabled(PluginType.BGSOURCE)) return Result.success()
+            if (!xdripPlugin.isEnabled(PluginType.BGSOURCE)) return Result.success(workDataOf("Result" to "Plugin not enabled"))
             val bundle = dataWorker.pickupBundle(inputData.getLong(DataWorker.STORE_KEY, -1))
                 ?: return Result.failure(workDataOf("Error" to "missing input data"))
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/treatments/TreatmentService.java b/app/src/main/java/info/nightscout/androidaps/plugins/treatments/TreatmentService.java
deleted file mode 100644
index a8293002f8..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/treatments/TreatmentService.java
+++ /dev/null
@@ -1,540 +0,0 @@
-package info.nightscout.androidaps.plugins.treatments;
-
-import android.content.Intent;
-import android.os.IBinder;
-
-import androidx.annotation.Nullable;
-
-import com.j256.ormlite.android.apptools.OpenHelperManager;
-import com.j256.ormlite.android.apptools.OrmLiteBaseService;
-import com.j256.ormlite.dao.Dao;
-import com.j256.ormlite.dao.DaoManager;
-import com.j256.ormlite.stmt.PreparedQuery;
-import com.j256.ormlite.stmt.QueryBuilder;
-import com.j256.ormlite.stmt.Where;
-import com.j256.ormlite.support.ConnectionSource;
-import com.j256.ormlite.table.TableUtils;
-
-import org.apache.commons.lang3.StringUtils;
-import org.jetbrains.annotations.NotNull;
-
-import java.sql.SQLException;
-import java.util.List;
-import java.util.concurrent.Executors;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.ScheduledFuture;
-
-import javax.inject.Inject;
-
-import dagger.android.HasAndroidInjector;
-import info.nightscout.androidaps.db.DatabaseHelper;
-import info.nightscout.androidaps.db.Source;
-import info.nightscout.androidaps.db.Treatment;
-import info.nightscout.androidaps.interfaces.DatabaseHelperInterface;
-import info.nightscout.androidaps.interfaces.TreatmentServiceInterface;
-import info.nightscout.androidaps.interfaces.UpdateReturn;
-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.openhumans.OpenHumansUploader;
-import info.nightscout.androidaps.plugins.pump.medtronic.MedtronicPumpPlugin;
-import info.nightscout.androidaps.utils.FabricPrivacy;
-import info.nightscout.androidaps.utils.rx.AapsSchedulers;
-
-
-/**
- * Created by mike on 24.09.2017.
- */
-
-public class TreatmentService extends OrmLiteBaseService<DatabaseHelper> implements TreatmentServiceInterface {
-
-    @Inject AAPSLogger aapsLogger;
-    @Inject FabricPrivacy fabricPrivacy;
-    @Inject RxBusWrapper rxBus;
-    @Inject MedtronicPumpPlugin medtronicPumpPlugin;
-    @Inject DatabaseHelperInterface databaseHelper;
-    @Inject OpenHumansUploader openHumansUploader;
-    @Inject AapsSchedulers aapsSchedulers;
-
-    public TreatmentService(HasAndroidInjector injector) {
-        injector.androidInjector().inject(this);
-        onCreate();
-        dbInitialize();
-    }
-
-    /**
-     * This method is a simple re-implementation of the database create and up/downgrade functionality
-     * in SQLiteOpenHelper#getDatabaseLocked method.
-     * <p>
-     * It is implemented to be able to late initialize separate plugins of the application.
-     */
-    protected void dbInitialize() {
-        DatabaseHelper helper = OpenHelperManager.getHelper(this, DatabaseHelper.class);
-        int newVersion = helper.getNewVersion();
-        int oldVersion = helper.getOldVersion();
-
-        if (oldVersion > newVersion) {
-            onDowngrade(this.getConnectionSource(), oldVersion, newVersion);
-        } else {
-            onUpgrade(this.getConnectionSource(), oldVersion, newVersion);
-        }
-    }
-
-    public TreatmentDaoWrapper getDao() {
-        try {
-            return new TreatmentDaoWrapper(DaoManager.createDao(this.getConnectionSource(), Treatment.class));
-        } catch (SQLException e) {
-            aapsLogger.error("Cannot create Dao for Treatment.class");
-        }
-
-        return null;
-    }
-
-    class TreatmentDaoWrapper {
-        private final Dao<Treatment, Long> wrapped;
-
-        TreatmentDaoWrapper(Dao<Treatment, Long> wrapped) {
-            this.wrapped = wrapped;
-        }
-
-        public void executeRaw(String statement, String... arguments) throws SQLException {
-            wrapped.executeRaw(statement, arguments);
-        }
-
-        public List<Treatment> queryForAll() throws SQLException {
-            return wrapped.queryForAll();
-        }
-
-        public Treatment queryForId(long id) throws SQLException {
-            return wrapped.queryForId(id);
-        }
-
-        public QueryBuilder<Treatment, Long> queryBuilder() {
-            return wrapped.queryBuilder();
-        }
-
-        public List<Treatment> query(PreparedQuery<Treatment> data) throws SQLException {
-            return wrapped.query(data);
-        }
-
-        public long countOf() throws SQLException {
-            return wrapped.countOf();
-        }
-    }
-
-    @Override
-    public void onCreate() {
-        super.onCreate();
-        try {
-            aapsLogger.info(LTag.DATATREATMENTS, "onCreate");
-            TableUtils.createTableIfNotExists(this.getConnectionSource(), Treatment.class);
-        } catch (SQLException e) {
-            aapsLogger.error("Can't create database", e);
-            throw new RuntimeException(e);
-        }
-    }
-
-    public void onUpgrade(ConnectionSource connectionSource, int oldVersion, int newVersion) {
-        if (oldVersion == 7 && newVersion == 8) {
-            aapsLogger.debug("Upgrading database from v7 to v8");
-            try {
-                TableUtils.dropTable(connectionSource, Treatment.class, true);
-                TableUtils.createTableIfNotExists(connectionSource, Treatment.class);
-            } catch (SQLException e) {
-                aapsLogger.error("Can't create database", e);
-                throw new RuntimeException(e);
-            }
-        } else if (oldVersion == 8 && newVersion == 9) {
-            aapsLogger.debug("Upgrading database from v8 to v9");
-            try {
-                getDao().executeRaw("ALTER TABLE `" + Treatment.TABLE_TREATMENTS + "` ADD COLUMN boluscalc STRING;");
-            } catch (SQLException e) {
-                aapsLogger.error("Unhandled exception", e);
-            }
-        } else {
-            aapsLogger.info(LTag.DATATREATMENTS, "onUpgrade");
-//            this.resetFood();
-        }
-    }
-
-    public void onDowngrade(ConnectionSource connectionSource, int oldVersion, int newVersion) {
-        if (oldVersion == 9 && newVersion == 8) {
-            try {
-                getDao().executeRaw("ALTER TABLE `" + Treatment.TABLE_TREATMENTS + "` DROP COLUMN boluscalc STRING;");
-            } catch (SQLException e) {
-                aapsLogger.error("Unhandled exception", e);
-            }
-        }
-    }
-
-    public long count() {
-        try {
-            return this.getDao().countOf();
-        } catch (SQLException e) {
-            aapsLogger.error("Unhandled exception", e);
-        }
-        return 0L;
-    }
-
-    /*
-    {
-        "_id": "551ee3ad368e06e80856e6a9",
-        "type": "food",
-        "category": "Zakladni",
-        "subcategory": "Napoje",
-        "name": "Mleko",
-        "portion": 250,
-        "carbs": 12,
-        "gi": 1,
-        "created_at": "2015-04-14T06:59:16.500Z",
-        "unit": "ml"
-    }
-     */
-    // return true if new record is created
-    public UpdateReturn createOrUpdate(Treatment treatment) {
-        /*
-        if (treatment != null && treatment.source == Source.NONE) {
-            aapsLogger.error("Coder error: source is not set for treatment: " + treatment, new Exception());
-            //FabricPrivacy.logException(new Exception("Coder error: source is not set for treatment: " + treatment));
-        }
-        try {
-            Treatment old;
-            treatment.date = databaseHelper.roundDateToSec(treatment.date);
-
-            if (treatment.source == Source.PUMP) {
-                // check for changed from pump change in NS
-                Treatment existingTreatment = getPumpRecordById(treatment.pumpId);
-                if (existingTreatment != null) {
-                    boolean equalRePumpHistory = existingTreatment.equalsRePumpHistory(treatment);
-                    boolean sameSource = existingTreatment.source == treatment.source;
-                    if (!equalRePumpHistory) {
-                        // another treatment exists. Update it with the treatment coming from the pump
-                        aapsLogger.debug(LTag.DATATREATMENTS, "Pump record already found in database: " + existingTreatment.toString() + " wanting to add " + treatment.toString());
-                        long oldDate = existingTreatment.date;
-
-                        //preserve carbs
-                        if (existingTreatment.isValid && existingTreatment.carbs > 0 && treatment.carbs == 0) {
-                            treatment.carbs = existingTreatment.carbs;
-                            // preserve insulin
-                        } else if (existingTreatment.isValid && existingTreatment.insulin > 0 && treatment.insulin == 0) {
-                            treatment.insulin = existingTreatment.insulin;
-                        }
-
-                        getDao().delete(existingTreatment); // need to delete/create because date may change too
-                        existingTreatment.copyBasics(treatment);
-                        getDao().create(existingTreatment);
-                        DatabaseHelper.updateEarliestDataChange(oldDate);
-                        DatabaseHelper.updateEarliestDataChange(existingTreatment.date);
-                        scheduleTreatmentChange(treatment, true);
-                        return new UpdateReturn(sameSource, false); //updating a pump treatment with another one from the pump is not counted as clash
-                    }
-                    return new UpdateReturn(equalRePumpHistory, false);
-                }
-                existingTreatment = getDao().queryForId(treatment.date);
-                if (existingTreatment != null) {
-                    // another treatment exists with different pumpID. Update it with the treatment coming from the pump
-                    boolean equalRePumpHistory = existingTreatment.equalsRePumpHistory(treatment);
-                    boolean sameSource = existingTreatment.source == treatment.source;
-                    long oldDate = existingTreatment.date;
-                    aapsLogger.debug(LTag.DATATREATMENTS, "Pump record already found in database: " + existingTreatment.toString() + " wanting to add " + treatment.toString());
-
-                    //preserve carbs
-                    if (existingTreatment.isValid && existingTreatment.carbs > 0 && treatment.carbs == 0) {
-                        treatment.carbs = existingTreatment.carbs;
-                    }
-
-                    getDao().delete(existingTreatment); // need to delete/create because date may change too
-                    existingTreatment.copyFrom(treatment);
-                    getDao().create(existingTreatment);
-                    DatabaseHelper.updateEarliestDataChange(oldDate);
-                    DatabaseHelper.updateEarliestDataChange(existingTreatment.date);
-                    scheduleTreatmentChange(treatment, true);
-                    return new UpdateReturn(equalRePumpHistory || sameSource, false);
-                }
-                getDao().create(treatment);
-                aapsLogger.debug(LTag.DATATREATMENTS, "New record from: " + Source.getString(treatment.source) + " " + treatment.toString());
-                DatabaseHelper.updateEarliestDataChange(treatment.date);
-                scheduleTreatmentChange(treatment, true);
-                return new UpdateReturn(true, true);
-            }
-            if (treatment.source == Source.NIGHTSCOUT) {
-                old = getDao().queryForId(treatment.date);
-                if (old != null) {
-                    if (!old.isEqual(treatment)) {
-                        boolean historyChange = old.isDataChanging(treatment);
-                        long oldDate = old.date;
-                        getDao().delete(old); // need to delete/create because date may change too
-                        old.copyFrom(treatment);
-                        getDao().create(old);
-                        aapsLogger.debug(LTag.DATATREATMENTS, "Updating record by date from: " + Source.getString(treatment.source) + " " + old.toString());
-                        if (historyChange) {
-                            DatabaseHelper.updateEarliestDataChange(oldDate);
-                            DatabaseHelper.updateEarliestDataChange(old.date);
-                        }
-                        scheduleTreatmentChange(treatment, false);
-                        return new UpdateReturn(true, true);
-                    }
-                    aapsLogger.debug(LTag.DATATREATMENTS, "Equal record by date from: " + Source.getString(treatment.source) + " " + old.toString());
-                    return new UpdateReturn(true, false);
-                }
-                // find by NS _id
-                if (treatment._id != null) {
-                    old = findByNSId(treatment._id);
-                    if (old != null) {
-                        if (!old.isEqual(treatment)) {
-                            boolean historyChange = old.isDataChanging(treatment);
-                            long oldDate = old.date;
-                            getDao().delete(old); // need to delete/create because date may change too
-                            old.copyFrom(treatment);
-                            getDao().create(old);
-                            aapsLogger.debug(LTag.DATATREATMENTS, "Updating record by _id from: " + Source.getString(treatment.source) + " " + old.toString());
-                            if (historyChange) {
-                                DatabaseHelper.updateEarliestDataChange(oldDate);
-                                DatabaseHelper.updateEarliestDataChange(old.date);
-                            }
-                            scheduleTreatmentChange(treatment, false);
-                            return new UpdateReturn(true, true);
-                        }
-                        aapsLogger.debug(LTag.DATATREATMENTS, "Equal record by _id from: " + Source.getString(treatment.source) + " " + old.toString());
-                        return new UpdateReturn(true, false);
-                    }
-                }
-                getDao().create(treatment);
-                aapsLogger.debug(LTag.DATATREATMENTS, "New record from: " + Source.getString(treatment.source) + " " + treatment.toString());
-                DatabaseHelper.updateEarliestDataChange(treatment.date);
-                scheduleTreatmentChange(treatment, false);
-                return new UpdateReturn(true, true);
-            }
-            if (treatment.source == Source.USER) {
-                getDao().create(treatment);
-                aapsLogger.debug(LTag.DATATREATMENTS, "New record from: " + Source.getString(treatment.source) + " " + treatment.toString());
-                DatabaseHelper.updateEarliestDataChange(treatment.date);
-                scheduleTreatmentChange(treatment, true);
-                return new UpdateReturn(true, true);
-            }
-        } catch (SQLException e) {
-            aapsLogger.error("Unhandled exception", e);
-        }
-         */
-        return new UpdateReturn(false, false);
-    }
-
-
-    @NotNull public UpdateReturn createOrUpdateMedtronic(@NotNull Treatment treatment, boolean fromNightScout) {
-/*
-        if (MedtronicHistoryData.doubleBolusDebug)
-            aapsLogger.debug(LTag.DATATREATMENTS, "DoubleBolusDebug: createOrUpdateMedtronic:: originalTreatment={}, fromNightScout={}", treatment, fromNightScout);
-
-        try {
-            treatment.date = databaseHelper.roundDateToSec(treatment.date);
-
-            Treatment existingTreatment = getRecord(treatment.pumpId, treatment.date);
-
-            if (MedtronicHistoryData.doubleBolusDebug)
-                aapsLogger.debug(LTag.DATATREATMENTS, "DoubleBolusDebug: createOrUpdateMedtronic:: existingTreatment={}", treatment);
-
-            if (existingTreatment == null) {
-                getDao().create(treatment);
-                aapsLogger.debug(LTag.DATATREATMENTS, "New record from: " + Source.getString(treatment.source) + " " + treatment.toString());
-                DatabaseHelper.updateEarliestDataChange(treatment.date);
-                scheduleTreatmentChange(treatment, true);
-                return new UpdateReturn(true, true);
-            } else {
-
-                if (existingTreatment.date == treatment.date) {
-                    if (MedtronicHistoryData.doubleBolusDebug)
-                        aapsLogger.debug(LTag.DATATREATMENTS, "DoubleBolusDebug: createOrUpdateMedtronic::(existingTreatment.date==treatment.date)");
-
-                    // we will do update only, if entry changed
-                    if (!optionalTreatmentCopy(existingTreatment, treatment, fromNightScout)) {
-                        return new UpdateReturn(true, false);
-                    }
-                    getDao().update(existingTreatment);
-                    DatabaseHelper.updateEarliestDataChange(existingTreatment.date);
-                    scheduleTreatmentChange(treatment, true);
-                    return new UpdateReturn(true, false);
-                } else {
-                    if (MedtronicHistoryData.doubleBolusDebug)
-                        aapsLogger.debug(LTag.DATATREATMENTS, "DoubleBolusDebug: createOrUpdateMedtronic::(existingTreatment.date != treatment.date)");
-
-                    // date is different, we need to remove entry
-                    getDao().delete(existingTreatment);
-                    optionalTreatmentCopy(existingTreatment, treatment, fromNightScout);
-                    getDao().create(existingTreatment);
-                    DatabaseHelper.updateEarliestDataChange(existingTreatment.date);
-                    scheduleTreatmentChange(treatment, true);
-                    return new UpdateReturn(true, false); //updating a pump treatment with another one from the pump is not counted as clash
-                }
-            }
-
-        } catch (SQLException e) {
-            aapsLogger.error("Unhandled SQL exception: {}", e.getMessage(), e);
-        }
-
- */
-        return new UpdateReturn(false, false);
-    }
-
-
-    private boolean optionalTreatmentCopy(Treatment oldTreatment, Treatment newTreatment, boolean fromNightScout) {
-
-        aapsLogger.debug(LTag.DATATREATMENTS, "optionalTreatmentCopy [old={}, new={}]", oldTreatment.toString(), newTreatment.toString());
-
-        boolean changed = false;
-
-        if (oldTreatment.date != newTreatment.date) {
-            oldTreatment.date = newTreatment.date;
-            changed = true;
-        }
-
-        if (oldTreatment.isSMB != newTreatment.isSMB) {
-            if (!oldTreatment.isSMB) {
-                oldTreatment.isSMB = newTreatment.isSMB;
-                changed = true;
-            }
-        }
-
-        if (!isSame(oldTreatment.carbs, newTreatment.carbs)) {
-            if (isSame(oldTreatment.carbs, 0.0d)) {
-                oldTreatment.carbs = newTreatment.carbs;
-                changed = true;
-            }
-        }
-
-        if (oldTreatment.mealBolus != (oldTreatment.carbs > 0)) {
-            oldTreatment.mealBolus = (oldTreatment.carbs > 0);
-            changed = true;
-        }
-
-        if (!isSame(oldTreatment.insulin, newTreatment.insulin)) {
-            if (!fromNightScout) {
-                oldTreatment.insulin = newTreatment.insulin;
-                changed = true;
-            }
-        }
-
-        if (!StringUtils.equals(oldTreatment._id, newTreatment._id)) {
-            if (StringUtils.isBlank(oldTreatment._id)) {
-                oldTreatment._id = newTreatment._id;
-                changed = true;
-            }
-        }
-
-        int source = Source.NONE;
-
-        if (oldTreatment.pumpId == 0) {
-            if (newTreatment.pumpId > 0) {
-                oldTreatment.pumpId = newTreatment.pumpId;
-                source = Source.PUMP;
-                changed = true;
-            }
-        }
-
-        if (source == Source.NONE) {
-
-            if (oldTreatment.source == newTreatment.source) {
-                source = oldTreatment.source;
-            } else {
-                source = (oldTreatment.source == Source.NIGHTSCOUT || newTreatment.source == Source.NIGHTSCOUT) ? Source.NIGHTSCOUT : Source.USER;
-            }
-        }
-
-        if (oldTreatment.source != source) {
-            oldTreatment.source = source;
-            changed = true;
-        }
-
-        aapsLogger.debug(LTag.DATATREATMENTS, "optionalTreatmentCopy [changed={}, newAfterChange={}]", changed, oldTreatment.toString());
-        return changed;
-    }
-
-
-    public static boolean isSame(Double d1, Double d2) {
-        double diff = d1 - d2;
-
-        return (Math.abs(diff) <= 0.00001);
-    }
-
-    public Treatment getRecord(long pumpId, long date) {
-
-        Treatment record = null;
-
-        if (pumpId > 0) {
-
-            record = getPumpRecordById(pumpId);
-
-            if (record != null) {
-                return record;
-            }
-        }
-
-        try {
-            record = getDao().queryForId(date);
-        } catch (SQLException ex) {
-            aapsLogger.error("Error getting entry by id ({}", date);
-        }
-
-        return record;
-
-    }
-
-
-    /**
-     * Returns the record for the given id, null if none, throws RuntimeException
-     * if multiple records with the same pump id exist.
-     */
-    @Nullable
-    public Treatment getPumpRecordById(long pumpId) {
-        try {
-            QueryBuilder<Treatment, Long> queryBuilder = getDao().queryBuilder();
-            Where where = queryBuilder.where();
-            where.eq("pumpId", pumpId);
-            queryBuilder.orderBy("date", true);
-
-            List<Treatment> result = getDao().query(queryBuilder.prepare());
-            if (result.isEmpty())
-                return null;
-            if (result.size() > 1)
-                aapsLogger.warn(LTag.DATATREATMENTS, "Multiple records with the same pump id found (returning first one): " + result.toString());
-            return result.get(0);
-        } catch (SQLException e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    /**
-     * finds treatment by its NS Id.
-     *
-     * @param _id
-     * @return
-     */
-    @Nullable
-    public Treatment findByNSId(String _id) {
-        try {
-            TreatmentDaoWrapper daoTreatments = getDao();
-            QueryBuilder<Treatment, Long> queryBuilder = daoTreatments.queryBuilder();
-            Where where = queryBuilder.where();
-            where.eq("_id", _id);
-            queryBuilder.limit(10L);
-            PreparedQuery<Treatment> preparedQuery = queryBuilder.prepare();
-            List<Treatment> trList = daoTreatments.query(preparedQuery);
-            if (trList.size() != 1) {
-                //log.debug("Treatment findTreatmentById query size: " + trList.size());
-                return null;
-            } else {
-                //log.debug("Treatment findTreatmentById found: " + trList.get(0).log());
-                return trList.get(0);
-            }
-        } catch (SQLException e) {
-            aapsLogger.error("Unhandled exception", e);
-        }
-        return null;
-    }
-
-    @Nullable
-    @Override
-    public IBinder onBind(Intent intent) {
-        return null;
-    }
-
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/treatments/TreatmentsPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/treatments/TreatmentsPlugin.java
deleted file mode 100644
index 04345c3c6d..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/treatments/TreatmentsPlugin.java
+++ /dev/null
@@ -1,306 +0,0 @@
-package info.nightscout.androidaps.plugins.treatments;
-
-import android.content.Context;
-
-import java.util.List;
-import java.util.stream.Collectors;
-
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
-import dagger.android.HasAndroidInjector;
-import info.nightscout.androidaps.Constants;
-import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.data.DetailedBolusInfo;
-import info.nightscout.androidaps.database.AppRepository;
-import info.nightscout.androidaps.db.ExtendedBolus;
-import info.nightscout.androidaps.db.TemporaryBasal;
-import info.nightscout.androidaps.db.Treatment;
-import info.nightscout.androidaps.interfaces.ActivePlugin;
-import info.nightscout.androidaps.interfaces.DatabaseHelperInterface;
-import info.nightscout.androidaps.interfaces.PluginBase;
-import info.nightscout.androidaps.interfaces.PluginDescription;
-import info.nightscout.androidaps.interfaces.PluginType;
-import info.nightscout.androidaps.interfaces.ProfileFunction;
-import info.nightscout.androidaps.interfaces.TreatmentServiceInterface;
-import info.nightscout.androidaps.interfaces.TreatmentsInterface;
-import info.nightscout.androidaps.logging.AAPSLogger;
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper;
-import info.nightscout.androidaps.utils.DateUtil;
-import info.nightscout.androidaps.utils.FabricPrivacy;
-import info.nightscout.androidaps.utils.resources.ResourceHelper;
-import info.nightscout.androidaps.utils.rx.AapsSchedulers;
-import info.nightscout.androidaps.utils.sharedPreferences.SP;
-import io.reactivex.disposables.CompositeDisposable;
-
-@Singleton
-public class TreatmentsPlugin extends PluginBase implements TreatmentsInterface {
-
-    private final SP sp;
-    private final RxBusWrapper rxBus;
-    private final ProfileFunction profileFunction;
-    private final ActivePlugin activePlugin;
-    private final FabricPrivacy fabricPrivacy;
-    private final DateUtil dateUtil;
-    private final DatabaseHelperInterface databaseHelper;
-    private final AppRepository repository;
-
-    private final CompositeDisposable disposable = new CompositeDisposable();
-
-    protected TreatmentServiceInterface service;
-
-    @Inject
-    public TreatmentsPlugin(
-            HasAndroidInjector injector,
-            AAPSLogger aapsLogger,
-            RxBusWrapper rxBus,
-            AapsSchedulers aapsSchedulers,
-            ResourceHelper resourceHelper,
-            Context context,
-            SP sp,
-            ProfileFunction profileFunction,
-            ActivePlugin activePlugin,
-            FabricPrivacy fabricPrivacy,
-            DateUtil dateUtil,
-            DatabaseHelperInterface databaseHelper,
-            AppRepository repository
-    ) {
-        super(new PluginDescription()
-                        .mainType(PluginType.TREATMENT)
-                        .pluginIcon(R.drawable.ic_treatments)
-                        .pluginName(R.string.treatments)
-                        .shortName(R.string.treatments_shortname)
-                        .alwaysEnabled(true)
-                        .description(R.string.description_treatments)
-                        .setDefault(),
-                aapsLogger, resourceHelper, injector
-        );
-        this.rxBus = rxBus;
-        this.sp = sp;
-        this.profileFunction = profileFunction;
-        this.activePlugin = activePlugin;
-        this.fabricPrivacy = fabricPrivacy;
-        this.dateUtil = dateUtil;
-        this.databaseHelper = databaseHelper;
-        this.repository = repository;
-    }
-
-    @Override
-    protected void onStart() {
-        this.service = new TreatmentService(getInjector());
-        super.onStart();
-//        disposable.add(rxBus
-//                .toObservable(EventReloadProfileSwitchData.class)
-//                .observeOn(aapsSchedulers.getIo())
-//                .subscribe(event -> initializeProfileSwitchData(range()),
-//                        fabricPrivacy::logException
-//                ));
-    }
-
-    @Override
-    protected void onStop() {
-        disposable.clear();
-        super.onStop();
-    }
-
-    @Override
-    public TreatmentServiceInterface getService() {
-        return this.service;
-    }
-
-    protected long range() {
-        double dia = Constants.defaultDIA;
-        if (profileFunction.getProfile() != null)
-            dia = profileFunction.getProfile().getDia();
-        return (long) (60 * 60 * 1000L * (24 + dia));
-    }
-
-    /**
-     * Returns all Treatments after specified timestamp. Also returns invalid entries (required to
-     * map "Fill Cannula" entries to history (and not to add double bolus for it)
-     *
-     * @param fromTimestamp
-     * @return
-     */
-    @Deprecated
-    @Override
-    public List<Treatment> getTreatmentsFromHistoryAfterTimestamp(long fromTimestamp) {
-        return repository.getBolusesIncludingInvalidFromTimeToTime(fromTimestamp, dateUtil.now(), true)
-                .blockingGet()
-                .stream()
-                .map(bolus -> new Treatment(getInjector(), bolus))
-                .collect(Collectors.toList());
-/*
-        List<Treatment> in5minback = new ArrayList<>();
-
-        long time = System.currentTimeMillis();
-        synchronized (treatments) {
-//            getAapsLogger().debug(MedtronicHistoryData.doubleBolusDebug, LTag.DATATREATMENTS, "DoubleBolusDebug: AllTreatmentsInDb: " + new GsonBuilder().excludeFieldsWithoutExposeAnnotation().create().toJson(treatments));
-
-            for (Treatment t : treatments) {
-                if (t.date >= fromTimestamp && t.date <= time)
-                    in5minback.add(t);
-            }
-//            getAapsLogger().debug(MedtronicHistoryData.doubleBolusDebug, LTag.DATATREATMENTS, "DoubleBolusDebug: FilteredTreatments: AfterTime={}, Items={} " + fromTimestamp + " " + new GsonBuilder().excludeFieldsWithoutExposeAnnotation().create().toJson(in5minback));
-            return in5minback;
-        }
-*/
-    }
-/*
-    @Override
-    public long getLastBolusTime() {
-        Treatment last = getService().getLastBolus(false);
-        if (last == null) {
-            getAapsLogger().debug(LTag.DATATREATMENTS, "Last bolus time: NOTHING FOUND");
-            return 0;
-        } else {
-            getAapsLogger().debug(LTag.DATATREATMENTS, "Last bolus time: " + dateUtil.dateAndTimeString(last.date));
-            return last.date;
-        }
-    }
-
-    public long getLastBolusTime(boolean excludeSMB) {
-        Treatment last = getService().getLastBolus(excludeSMB);
-        if (last == null) {
-            getAapsLogger().debug(LTag.DATATREATMENTS, "Last manual bolus time: NOTHING FOUND");
-            return 0;
-        } else {
-            getAapsLogger().debug(LTag.DATATREATMENTS, "Last manual bolus time: " + dateUtil.dateAndTimeString(last.date));
-            return last.date;
-        }
-    }
-
-    public long getLastCarbTime() {
-        Treatment last = getService().getLastCarb();
-        if (last == null) {
-            getAapsLogger().debug(LTag.DATATREATMENTS, "Last Carb time: NOTHING FOUND");
-            return 0;
-        } else {
-            getAapsLogger().debug(LTag.DATATREATMENTS, "Last Carb time: " + dateUtil.dateAndTimeString(last.date));
-            return last.date;
-        }
-    }
-
-
- */
-
-    @Deprecated
-    @Override
-    public boolean addToHistoryExtendedBolus(ExtendedBolus extendedBolus) {
-        throw new IllegalStateException("Migrate to new DB");
-        //log.debug("Adding new ExtentedBolus record" + extendedBolus.log());
-        /*
-        boolean newRecordCreated = databaseHelper.createOrUpdate(extendedBolus);
-        if (newRecordCreated) {
-            if (extendedBolus.durationInMinutes == 0) {
-                if (activePlugin.getActivePump().isFakingTempsByExtendedBoluses())
-                    nsUpload.uploadTempBasalEnd(extendedBolus.date, true, extendedBolus.pumpId);
-                else
-                    nsUpload.uploadExtendedBolusEnd(extendedBolus.date, extendedBolus.pumpId);
-            } else if (activePlugin.getActivePump().isFakingTempsByExtendedBoluses())
-                nsUpload.uploadTempBasalStartAbsolute(new TemporaryBasal(extendedBolus), extendedBolus.insulin);
-            else
-                nsUpload.uploadExtendedBolus(extendedBolus);
-        }
-        return newRecordCreated;
-         */
-    }
-
-    @Deprecated
-    @Override
-    public boolean addToHistoryTempBasal(TemporaryBasal tempBasal) {
-        throw new IllegalStateException("Migrate to new DB");
-/*
-        //log.debug("Adding new TemporaryBasal record" + tempBasal.toString());
-        boolean newRecordCreated = databaseHelper.createOrUpdate(tempBasal);
-        if (newRecordCreated) {
-            if (tempBasal.durationInMinutes == 0)
-                nsUpload.uploadTempBasalEnd(tempBasal.date, false, tempBasal.pumpId);
-            else if (tempBasal.isAbsolute)
-                nsUpload.uploadTempBasalStartAbsolute(tempBasal, null);
-            else
-                nsUpload.uploadTempBasalStartPercent(tempBasal, profileFunction.getProfile(tempBasal.date));
-        }
-        return newRecordCreated;
- */
-    }
-
-    @Deprecated
-    public TreatmentUpdateReturn createOrUpdateMedtronic(Treatment treatment, boolean fromNightScout) {
-        throw new IllegalStateException("Migrate to new DB");
-/*
-        UpdateReturn resultRecord = getService().createOrUpdateMedtronic(treatment, fromNightScout);
-
-        return new TreatmentUpdateReturn(resultRecord.getSuccess(), resultRecord.getNewRecord());
- */
-    }
-
-    // return true if new record is created
-    @Deprecated
-    @Override
-    public boolean addToHistoryTreatment(DetailedBolusInfo detailedBolusInfo, boolean allowUpdate) {
-        throw new IllegalStateException("Migrate to new DB");
-/*
-        boolean medtronicPump = activePlugin.getActivePump() instanceof MedtronicPumpPlugin;
-
-        getAapsLogger().debug(MedtronicHistoryData.doubleBolusDebug, LTag.DATATREATMENTS, "DoubleBolusDebug: addToHistoryTreatment::isMedtronicPump={} " + medtronicPump);
-
-        Treatment treatment = new Treatment();
-        treatment.date = detailedBolusInfo.timestamp;
-        treatment.source = (detailedBolusInfo.getPumpType() == PumpType.USER) ? Source.USER : Source.PUMP;
-        treatment.pumpId = detailedBolusInfo.getBolusPumpId() != null ? detailedBolusInfo.getBolusPumpId() : 0;
-        treatment.insulin = detailedBolusInfo.insulin;
-        treatment.isValid = detailedBolusInfo.getBolusType() != DetailedBolusInfo.BolusType.PRIMING;
-        treatment.isSMB = detailedBolusInfo.getBolusType() == DetailedBolusInfo.BolusType.SMB;
-        if (detailedBolusInfo.carbTime == 0)
-            treatment.carbs = detailedBolusInfo.carbs;
-        treatment.mealBolus = treatment.carbs > 0;
-        // treatment.boluscalc = detailedBolusInfo.boluscalc != null ? detailedBolusInfo.boluscalc.toString() : null;
-        treatment.boluscalc = null;
-        UpdateReturn creatOrUpdateResult;
-
-        getAapsLogger().debug(medtronicPump && MedtronicHistoryData.doubleBolusDebug, LTag.DATATREATMENTS, "DoubleBolusDebug: addToHistoryTreatment::treatment={} " + treatment);
-
-        if (!medtronicPump)
-            creatOrUpdateResult = getService().createOrUpdate(treatment);
-        else
-            creatOrUpdateResult = getService().createOrUpdateMedtronic(treatment, false);
-
-        boolean newRecordCreated = creatOrUpdateResult.getNewRecord();
-        //log.debug("Adding new Treatment record" + treatment.toString());
-        if (detailedBolusInfo.carbTime != 0) {
-
-            Treatment carbsTreatment = new Treatment();
-            carbsTreatment.source = (detailedBolusInfo.getPumpType() == PumpType.USER) ? Source.USER : Source.PUMP;
-            carbsTreatment.pumpId = detailedBolusInfo.getCarbsPumpId() != null ? detailedBolusInfo.getCarbsPumpId() : 0; // but this should never happen
-            carbsTreatment.date = detailedBolusInfo.timestamp + detailedBolusInfo.carbTime * 60 * 1000L + 1000L; // add 1 sec to make them different records
-            carbsTreatment.carbs = detailedBolusInfo.carbs;
-
-            getAapsLogger().debug(medtronicPump && MedtronicHistoryData.doubleBolusDebug, LTag.DATATREATMENTS, "DoubleBolusDebug: carbTime!=0, creating second treatment. CarbsTreatment={}" + carbsTreatment);
-
-            if (!medtronicPump)
-                getService().createOrUpdate(carbsTreatment);
-            else
-                getService().createOrUpdateMedtronic(carbsTreatment, false);
-            //log.debug("Adding new Treatment record" + carbsTreatment);
-        }
-        if (newRecordCreated && detailedBolusInfo.getBolusType() != DetailedBolusInfo.BolusType.PRIMING)
-            nsUpload.uploadTreatmentRecord(detailedBolusInfo);
-
-        if (!allowUpdate && !creatOrUpdateResult.getSuccess()) {
-            getAapsLogger().error("Treatment could not be added to DB", new Exception());
-
-            String status = String.format(resourceHelper.gs(R.string.error_adding_treatment_message), treatment.insulin, (int) treatment.carbs, dateUtil.dateAndTimeString(treatment.date));
-
-            ErrorHelperActivity.Companion.runAlarm(context, status, resourceHelper.gs(R.string.error_adding_treatment_title), R.raw.error);
-
-            Bundle bundle = new Bundle();
-            bundle.putString(FirebaseAnalytics.Param.ITEM_LIST_ID, "TreatmentClash");
-            bundle.putString(FirebaseAnalytics.Param.ITEM_LIST_NAME, status);
-            fabricPrivacy.logCustom(bundle);
-        }
-
-        return newRecordCreated;
- */
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/treatments/events/EventTreatmentUpdateGui.kt b/app/src/main/java/info/nightscout/androidaps/plugins/treatments/events/EventTreatmentUpdateGui.kt
deleted file mode 100644
index ff42917aec..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/treatments/events/EventTreatmentUpdateGui.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package info.nightscout.androidaps.plugins.treatments.events
-
-import info.nightscout.androidaps.events.EventUpdateGui
-
-class EventTreatmentUpdateGui : EventUpdateGui()
\ No newline at end of file
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 448e917ae9..8553f76596 100644
--- a/app/src/main/java/info/nightscout/androidaps/queue/CommandQueue.kt
+++ b/app/src/main/java/info/nightscout/androidaps/queue/CommandQueue.kt
@@ -9,6 +9,7 @@ import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.activities.BolusProgressHelperActivity
 import info.nightscout.androidaps.activities.ErrorHelperActivity
+import info.nightscout.androidaps.annotations.OpenForTesting
 import info.nightscout.androidaps.data.DetailedBolusInfo
 import info.nightscout.androidaps.data.ProfileSealed
 import info.nightscout.androidaps.data.PumpEnactResult
@@ -47,8 +48,9 @@ import java.util.*
 import javax.inject.Inject
 import javax.inject.Singleton
 
+@OpenForTesting
 @Singleton
-open class CommandQueue @Inject constructor(
+class CommandQueue @Inject constructor(
     private val injector: HasAndroidInjector,
     private val aapsLogger: AAPSLogger,
     private val rxBus: RxBusWrapper,
@@ -62,21 +64,26 @@ open 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()
 
     private val queue = LinkedList<Command>()
-    private var thread: QueueThread? = null
+    @Volatile private var thread: QueueThread? = null
 
-    var performing: Command? = null
+    @Volatile var performing: Command? = null
 
     init {
-        disposable.add(rxBus
+        disposable += rxBus
             .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)
@@ -86,7 +93,6 @@ open class CommandQueue @Inject constructor(
                                 ErrorHelperActivity.runAlarm(context, result.comment, resourceHelper.gs(R.string.failedupdatebasalprofile), R.raw.boluserror)
                             }
                             if (result.enacted) {
-                                rxBus.send(EventNewBasalProfile())
                                 repository.createEffectiveProfileSwitch(
                                     EffectiveProfileSwitch(
                                         timestamp = dateUtil.now(),
@@ -104,13 +110,12 @@ open class CommandQueue @Inject constructor(
                                         insulinConfiguration = it.insulinConfiguration
                                     )
                                 )
+                                rxBus.send(EventNewBasalProfile())
                             }
                         }
                     })
                 }
             }, fabricPrivacy::logException)
-        )
-
     }
 
     private fun executingNowError(): PumpEnactResult =
@@ -172,8 +177,7 @@ open 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,18 +199,21 @@ open 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()
     }
 
     @Synchronized
     override fun bolusInQueue(): Boolean {
         if (isRunning(CommandType.BOLUS)) return true
+        if (isRunning(CommandType.SMB_BOLUS)) return true
         synchronized(queue) {
             for (i in queue.indices) {
-                if (queue[i].commandType == CommandType.BOLUS) {
-                    return true
-                }
+                if (queue[i].commandType == CommandType.BOLUS) return true
+                if (queue[i].commandType == CommandType.SMB_BOLUS) return true
             }
         }
         return false
@@ -243,13 +250,15 @@ open class CommandQueue @Inject constructor(
         }
         var type = if (detailedBolusInfo.bolusType == DetailedBolusInfo.BolusType.SMB) CommandType.SMB_BOLUS else CommandType.BOLUS
         if (type == CommandType.SMB_BOLUS) {
-            if (isRunning(CommandType.BOLUS) || isRunning(CommandType.SMB_BOLUS) || bolusInQueue()) {
+            if (bolusInQueue()) {
                 aapsLogger.debug(LTag.PUMPQUEUE, "Rejecting SMB since a bolus is queue/running")
+                callback?.result(PumpEnactResult(injector).enacted(false).success(false))?.run()
                 return false
             }
             val lastBolusTime = repository.getLastBolusRecord()?.timestamp ?: 0L
             if (detailedBolusInfo.lastKnownBolusTime < lastBolusTime) {
                 aapsLogger.debug(LTag.PUMPQUEUE, "Rejecting bolus, another bolus was issued since request time")
+                callback?.result(PumpEnactResult(injector).enacted(false).success(false))?.run()
                 return false
             }
             removeAll(CommandType.SMB_BOLUS)
@@ -566,11 +575,12 @@ open class CommandQueue @Inject constructor(
         return HtmlHelper.fromHtml(s)
     }
 
-    override fun isThisProfileSet(profile: Profile): Boolean {
-        val result = activePlugin.activePump.isThisProfileSet(profile)
+    override fun isThisProfileSet(requestedProfile: Profile): Boolean {
+        val runningProfile = profileFunction.getProfile() ?: return false
+        val result = activePlugin.activePump.isThisProfileSet(requestedProfile) && requestedProfile.isEqual(runningProfile)
         if (!result) {
             aapsLogger.debug(LTag.PUMPQUEUE, "Current profile: ${profileFunction.getProfile()}")
-            aapsLogger.debug(LTag.PUMPQUEUE, "New profile: $profile")
+            aapsLogger.debug(LTag.PUMPQUEUE, "New profile: $requestedProfile")
         }
         return result
     }
diff --git a/app/src/main/java/info/nightscout/androidaps/queue/QueueThread.kt b/app/src/main/java/info/nightscout/androidaps/queue/QueueThread.kt
index 34b64b8501..6de611c276 100644
--- a/app/src/main/java/info/nightscout/androidaps/queue/QueueThread.kt
+++ b/app/src/main/java/info/nightscout/androidaps/queue/QueueThread.kt
@@ -135,6 +135,7 @@ class QueueThread internal constructor(
                         aapsLogger.debug(LTag.PUMPQUEUE, "disconnected")
                         return
                     } else {
+                        rxBus.send(EventPumpStatusChanged(EventPumpStatusChanged.Status.WAITING_FOR_DISCONNECTION))
                         aapsLogger.debug(LTag.PUMPQUEUE, "waiting for disconnect")
                         SystemClock.sleep(1000)
                     }
diff --git a/app/src/main/java/info/nightscout/androidaps/queue/commands/CommandLoadEvents.kt b/app/src/main/java/info/nightscout/androidaps/queue/commands/CommandLoadEvents.kt
index f959eff033..58a0570eaf 100644
--- a/app/src/main/java/info/nightscout/androidaps/queue/commands/CommandLoadEvents.kt
+++ b/app/src/main/java/info/nightscout/androidaps/queue/commands/CommandLoadEvents.kt
@@ -3,6 +3,7 @@ package info.nightscout.androidaps.queue.commands
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.interfaces.ActivePlugin
 import info.nightscout.androidaps.interfaces.Dana
+import info.nightscout.androidaps.interfaces.Diaconn
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.queue.Callback
 import javax.inject.Inject
@@ -22,6 +23,13 @@ class CommandLoadEvents(
             aapsLogger.debug(LTag.PUMPQUEUE, "Result success: ${r.success} enacted: ${r.enacted}")
             callback?.result(r)?.run()
         }
+
+        if (pump is Diaconn) {
+            val diaconnPump = pump as Diaconn
+            val r = diaconnPump.loadHistory()
+            aapsLogger.debug(LTag.PUMPQUEUE, "Result success: ${r.success} enacted: ${r.enacted}")
+            callback?.result(r)?.run()
+        }
     }
 
     override fun status(): String = "LOAD EVENTS"
diff --git a/app/src/main/java/info/nightscout/androidaps/queue/commands/CommandLoadHistory.kt b/app/src/main/java/info/nightscout/androidaps/queue/commands/CommandLoadHistory.kt
index 431b4fe12e..3ff9c133c1 100644
--- a/app/src/main/java/info/nightscout/androidaps/queue/commands/CommandLoadHistory.kt
+++ b/app/src/main/java/info/nightscout/androidaps/queue/commands/CommandLoadHistory.kt
@@ -3,6 +3,7 @@ package info.nightscout.androidaps.queue.commands
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.interfaces.ActivePlugin
 import info.nightscout.androidaps.interfaces.Dana
+import info.nightscout.androidaps.interfaces.Diaconn
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.queue.Callback
 import javax.inject.Inject
@@ -23,6 +24,13 @@ class CommandLoadHistory(
             aapsLogger.debug(LTag.PUMPQUEUE, "Result success: " + r.success + " enacted: " + r.enacted)
             callback?.result(r)?.run()
         }
+
+        if (pump is Diaconn) {
+            val diaconnG8Pump = pump as Diaconn
+            val r = diaconnG8Pump.loadHistory()
+            aapsLogger.debug(LTag.PUMPQUEUE, "Result success: " + r.success + " enacted: " + r.enacted)
+            callback?.result(r)?.run()
+        }
     }
 
     override fun status(): String = "LOAD HISTORY $type"
diff --git a/app/src/main/java/info/nightscout/androidaps/queue/commands/CommandSMBBolus.kt b/app/src/main/java/info/nightscout/androidaps/queue/commands/CommandSMBBolus.kt
index d43493059b..eaac269a71 100644
--- a/app/src/main/java/info/nightscout/androidaps/queue/commands/CommandSMBBolus.kt
+++ b/app/src/main/java/info/nightscout/androidaps/queue/commands/CommandSMBBolus.kt
@@ -23,6 +23,7 @@ class CommandSMBBolus(
     override fun execute() {
         val r: PumpEnactResult
         val lastBolusTime = repository.getLastBolusRecord()?.timestamp ?: 0L
+        aapsLogger.debug(LTag.PUMPQUEUE, "Last bolus: $lastBolusTime ${dateUtil.dateAndTimeAndSecondsString(lastBolusTime)}")
         if (lastBolusTime != 0L && lastBolusTime + T.mins(3).msecs() > dateUtil.now()) {
             aapsLogger.debug(LTag.PUMPQUEUE, "SMB requested but still in 3 min interval")
             r = PumpEnactResult(injector).enacted(false).success(false).comment("SMB requested but still in 3 min interval")
diff --git a/app/src/main/java/info/nightscout/androidaps/queue/commands/CommandSetUserSettings.kt b/app/src/main/java/info/nightscout/androidaps/queue/commands/CommandSetUserSettings.kt
index abefe7e00e..7460529e67 100644
--- a/app/src/main/java/info/nightscout/androidaps/queue/commands/CommandSetUserSettings.kt
+++ b/app/src/main/java/info/nightscout/androidaps/queue/commands/CommandSetUserSettings.kt
@@ -3,6 +3,7 @@ package info.nightscout.androidaps.queue.commands
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.interfaces.ActivePlugin
 import info.nightscout.androidaps.interfaces.Dana
+import info.nightscout.androidaps.interfaces.Diaconn
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.queue.Callback
 import javax.inject.Inject
@@ -21,6 +22,12 @@ class CommandSetUserSettings(
             aapsLogger.debug(LTag.PUMPQUEUE, "Result success: ${r.success} enacted: ${r.enacted}")
             callback?.result(r)?.run()
         }
+
+        if (pump is Diaconn) {
+            val r = pump.setUserOptions()
+            aapsLogger.debug(LTag.PUMPQUEUE, "Result success: ${r.success} enacted: ${r.enacted}")
+            callback?.result(r)?.run()
+        }
     }
 
     override fun status(): String = "SET USER SETTINGS"
diff --git a/app/src/main/java/info/nightscout/androidaps/receivers/BTReceiver.kt b/app/src/main/java/info/nightscout/androidaps/receivers/BTReceiver.kt
index 37a135b44f..63485fce7b 100644
--- a/app/src/main/java/info/nightscout/androidaps/receivers/BTReceiver.kt
+++ b/app/src/main/java/info/nightscout/androidaps/receivers/BTReceiver.kt
@@ -13,7 +13,7 @@ class BTReceiver : DaggerBroadcastReceiver() {
 
     override fun onReceive(context: Context, intent: Intent) {
         super.onReceive(context, intent)
-        val device: BluetoothDevice = intent.getParcelableExtra(BluetoothDevice.EXTRA_DEVICE)
+        val device: BluetoothDevice = intent.getParcelableExtra(BluetoothDevice.EXTRA_DEVICE) ?: return
 
         when (intent.action) {
             BluetoothDevice.ACTION_ACL_CONNECTED    ->
diff --git a/app/src/main/java/info/nightscout/androidaps/receivers/KeepAliveReceiver.kt b/app/src/main/java/info/nightscout/androidaps/receivers/KeepAliveReceiver.kt
index 1b78360966..1d475d162d 100644
--- a/app/src/main/java/info/nightscout/androidaps/receivers/KeepAliveReceiver.kt
+++ b/app/src/main/java/info/nightscout/androidaps/receivers/KeepAliveReceiver.kt
@@ -28,6 +28,7 @@ import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.aps.loop.LoopPlugin
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.configBuilder.RunningConfiguration
+import info.nightscout.androidaps.plugins.general.maintenance.MaintenancePlugin
 import info.nightscout.androidaps.queue.commands.Command
 import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.utils.FabricPrivacy
@@ -72,6 +73,7 @@ class KeepAliveReceiver : DaggerBroadcastReceiver() {
         @Inject lateinit var rxBus: RxBusWrapper
         @Inject lateinit var commandQueue: CommandQueueProvider
         @Inject lateinit var fabricPrivacy: FabricPrivacy
+        @Inject lateinit var maintenancePlugin: MaintenancePlugin
 
         init {
             (context.applicationContext as HasAndroidInjector).androidInjector().inject(this)
@@ -93,6 +95,8 @@ class KeepAliveReceiver : DaggerBroadcastReceiver() {
             localAlertUtils.checkStaleBGAlert()
             checkPump()
             checkAPS()
+            maintenancePlugin.deleteLogs(30)
+
             return Result.success()
         }
 
@@ -119,18 +123,18 @@ class KeepAliveReceiver : DaggerBroadcastReceiver() {
         private fun checkPump() {
             val pump = activePlugin.activePump
             val ps = profileFunction.getRequestedProfile() ?: return
-            val profile = ProfileSealed.PS(ps)
+            val requestedProfile = ProfileSealed.PS(ps)
+            val runningProfile = profileFunction.getProfile()
             val lastConnection = pump.lastDataTime()
             val isStatusOutdated = lastConnection + STATUS_UPDATE_FREQUENCY < System.currentTimeMillis()
-            val isBasalOutdated = abs(profile.getBasal() - pump.baseBasalRate) > pump.pumpDescription.basalStep
+            val isBasalOutdated = abs(requestedProfile.getBasal() - pump.baseBasalRate) > pump.pumpDescription.basalStep
             aapsLogger.debug(LTag.CORE, "Last connection: " + dateUtil.dateAndTimeString(lastConnection))
             // sometimes keep alive broadcast stops
             // as as workaround test if readStatus was requested before an alarm is generated
             if (lastReadStatus != 0L && lastReadStatus > System.currentTimeMillis() - T.mins(5).msecs()) {
                 localAlertUtils.checkPumpUnreachableAlarm(lastConnection, isStatusOutdated, loopPlugin.isDisconnected)
             }
-            if (!pump.isThisProfileSet(profile) && !commandQueue.isRunning(Command.CommandType.BASAL_PROFILE)
-                || profileFunction.getProfile() == null) {
+            if (runningProfile == null || ((!pump.isThisProfileSet(requestedProfile) || !requestedProfile.isEqual(runningProfile)) && !commandQueue.isRunning(Command.CommandType.BASAL_PROFILE))) {
                 rxBus.send(EventProfileSwitchChanged())
             } else if (isStatusOutdated && !pump.isBusy()) {
                 lastReadStatus = System.currentTimeMillis()
diff --git a/app/src/main/java/info/nightscout/androidaps/setupwizard/SWDefinition.kt b/app/src/main/java/info/nightscout/androidaps/setupwizard/SWDefinition.kt
index b65a284149..8b526b97bd 100644
--- a/app/src/main/java/info/nightscout/androidaps/setupwizard/SWDefinition.kt
+++ b/app/src/main/java/info/nightscout/androidaps/setupwizard/SWDefinition.kt
@@ -28,6 +28,7 @@ import info.nightscout.androidaps.setupwizard.elements.*
 import info.nightscout.androidaps.setupwizard.events.EventSWUpdate
 import info.nightscout.androidaps.utils.AndroidPermission
 import info.nightscout.androidaps.utils.CryptoUtil
+import info.nightscout.androidaps.utils.HardLimits
 import info.nightscout.androidaps.utils.extensions.isRunningTest
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import info.nightscout.androidaps.utils.sharedPreferences.SP
@@ -53,7 +54,8 @@ class SWDefinition @Inject constructor(
     private val importExportPrefs: ImportExportPrefs,
     private val androidPermission: AndroidPermission,
     private val cryptoUtil: CryptoUtil,
-    private val config: Config
+    private val config: Config,
+    private val hardLimits: HardLimits
 ) {
 
     lateinit var activity: AppCompatActivity
@@ -255,7 +257,7 @@ class SWDefinition @Inject constructor(
         .add(SWFragment(injector, this)
             .add(LocalProfileFragment()))
         .validator {
-            localProfilePlugin.profile?.getDefaultProfile()?.let { ProfileSealed.Pure(it).isValid("StartupWizard", activePlugin.activePump, config, resourceHelper, rxBus) }
+            localProfilePlugin.profile?.getDefaultProfile()?.let { ProfileSealed.Pure(it).isValid("StartupWizard", activePlugin.activePump, config, resourceHelper, rxBus, hardLimits).isValid }
                 ?: false
         }
         .visibility { localProfilePlugin.isEnabled() }
@@ -265,7 +267,7 @@ class SWDefinition @Inject constructor(
             .label(R.string.profileswitch_ismissing))
         .add(SWButton(injector)
             .text(R.string.doprofileswitch)
-            .action { ProfileSwitchDialog().show(activity.supportFragmentManager, "SetupWizard") })
+            .action { ProfileSwitchDialog().show(activity.supportFragmentManager, "ProfileSwitchDialog") })
         .validator { profileFunction.getProfile() != null }
         .visibility { profileFunction.getProfile() == null }
     private val screenPump = SWScreen(injector, R.string.configbuilder_pump)
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 a1a0a76c5a..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()
     }
@@ -127,7 +127,7 @@ class SetupWizardActivity : NoSplashAppCompatActivity() {
     override fun updateButtons() {
         runOnUiThread {
             val currentScreen = screens[currentWizardPage]
-            if (currentScreen.validator == null || currentScreen.validator!!.isValid || currentScreen.skippable) {
+            if (currentScreen.validator == null || currentScreen.validator?.isValid == true || currentScreen.skippable) {
                 if (currentWizardPage == nextPage(null)) {
                     findViewById<View>(R.id.finish_button).visibility = View.VISIBLE
                     findViewById<View>(R.id.next_button).visibility = View.GONE
@@ -184,7 +184,7 @@ class SetupWizardActivity : NoSplashAppCompatActivity() {
     private fun nextPage(view: View?): Int {
         var page = currentWizardPage + 1
         while (page < screens.size) {
-            if (screens[page].visibility == null || screens[page].visibility!!.isValid) return page
+            if (screens[page].visibility == null || screens[page].visibility?.isValid == true) return page
             page++
         }
         return min(currentWizardPage, screens.size - 1)
@@ -194,7 +194,7 @@ class SetupWizardActivity : NoSplashAppCompatActivity() {
     private fun previousPage(view: View?): Int {
         var page = currentWizardPage - 1
         while (page >= 0) {
-            if (screens[page].visibility == null || screens[page].visibility!!.isValid) return page
+            if (screens[page].visibility == null || screens[page].visibility?.isValid == true) return page
             page--
         }
         return max(currentWizardPage, 0)
diff --git a/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWEditEncryptedPassword.kt b/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWEditEncryptedPassword.kt
index d32a0f4770..60886e0efc 100644
--- a/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWEditEncryptedPassword.kt
+++ b/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWEditEncryptedPassword.kt
@@ -5,11 +5,13 @@ import android.text.Editable
 import android.text.InputType
 import android.text.TextWatcher
 import android.view.View
+import android.widget.Button
 import android.widget.EditText
 import android.widget.LinearLayout
 import android.widget.TextView
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.R
+import info.nightscout.androidaps.extensions.toVisibility
 import info.nightscout.androidaps.setupwizard.SWTextValidator
 import info.nightscout.androidaps.utils.CryptoUtil
 
@@ -17,36 +19,71 @@ class SWEditEncryptedPassword(injector: HasAndroidInjector, private val cryptoUt
 
     private var validator: SWTextValidator = SWTextValidator(String::isNotEmpty)
     private var updateDelay = 0L
+    private var button: Button? = null
+    private var editText: EditText? = null
+    private var editText2: EditText? = null
+    private var l: TextView? = null
+    private var c: TextView? = null
+    private var c2: TextView? = null
 
     override fun generateDialog(layout: LinearLayout) {
         val context = layout.context
-        val l = TextView(context)
-        l.id = View.generateViewId()
-        label?.let { l.setText(it) }
-        l.setTypeface(l.typeface, Typeface.BOLD)
-        layout.addView(l)
-        val c = TextView(context)
-        c.id = View.generateViewId()
-        comment?.let { c.setText(it) }
-        c.setTypeface(c.typeface, Typeface.ITALIC)
-        layout.addView(c)
-        val editText = EditText(context)
-        editText.id = View.generateViewId()
-        editText.inputType = InputType.TYPE_CLASS_TEXT
-        editText.maxLines = 1
-        editText.inputType = InputType.TYPE_CLASS_TEXT or InputType.TYPE_TEXT_VARIATION_PASSWORD
+        val isPasswordSet = sp.contains(R.string.key_master_password) && sp.getString(R.string.key_master_password, "") != ""
+
+        button = Button(context)
+        button?.setText(R.string.unlock_settings)
+        button?.setOnClickListener {
+            scanForActivity(context)?.let { activity ->
+                passwordCheck.queryPassword(activity, R.string.master_password, R.string.key_master_password, {
+                    button?.visibility = View.GONE
+                    editText?.visibility = View.VISIBLE
+                    editText2?.visibility = View.VISIBLE
+                    l?.visibility = View.VISIBLE
+                    c?.visibility = View.VISIBLE
+                    c2?.visibility = View.VISIBLE
+                })
+            }
+        }
+        button?.visibility = isPasswordSet.toVisibility()
+        layout.addView(button)
+
+        label?.let {
+            l = TextView(context)
+            l?.id = View.generateViewId()
+            l?.setText(it)
+            l?.setTypeface(l?.typeface, Typeface.BOLD)
+            layout.addView(l)
+        }
+
+        comment?.let {
+            c = TextView(context)
+            c?.id = View.generateViewId()
+            c?.setText(it)
+            c?.setTypeface(c?.typeface, Typeface.ITALIC)
+            c?.visibility = isPasswordSet.not().toVisibility()
+            layout.addView(c)
+        }
+
+        editText = EditText(context)
+        editText?.id = View.generateViewId()
+        editText?.inputType = InputType.TYPE_CLASS_TEXT
+        editText?.maxLines = 1
+        editText?.inputType = InputType.TYPE_CLASS_TEXT or InputType.TYPE_TEXT_VARIATION_PASSWORD
+        editText?.visibility = isPasswordSet.not().toVisibility()
         layout.addView(editText)
 
-        val c2 = TextView(context)
-        c2.id = View.generateViewId()
-        c2.setText(R.string.confirm)
+        c2 = TextView(context)
+        c2?.id = View.generateViewId()
+        c2?.setText(R.string.confirm)
+        c2?.visibility = isPasswordSet.not().toVisibility()
         layout.addView(c2)
 
-        val editText2 = EditText(context)
-        editText2.id = View.generateViewId()
-        editText2.inputType = InputType.TYPE_CLASS_TEXT
-        editText2.maxLines = 1
-        editText2.inputType = InputType.TYPE_CLASS_TEXT or InputType.TYPE_TEXT_VARIATION_PASSWORD
+        editText2 = EditText(context)
+        editText2?.id = View.generateViewId()
+        editText2?.inputType = InputType.TYPE_CLASS_TEXT
+        editText2?.maxLines = 1
+        editText2?.inputType = InputType.TYPE_CLASS_TEXT or InputType.TYPE_TEXT_VARIATION_PASSWORD
+        editText2?.visibility = isPasswordSet.not().toVisibility()
         layout.addView(editText2)
 
         super.generateDialog(layout)
@@ -55,14 +92,14 @@ class SWEditEncryptedPassword(injector: HasAndroidInjector, private val cryptoUt
             override fun onTextChanged(s: CharSequence, start: Int, before: Int, count: Int) {
                 sp.remove(preferenceId)
                 scheduleChange(updateDelay)
-                if (validator.isValid(editText.text.toString()) && validator.isValid(editText2.text.toString()) && editText.text.toString() == editText2.text.toString())
+                if (validator.isValid(editText?.text.toString()) && validator.isValid(editText2?.text.toString()) && editText?.text.toString() == editText2?.text.toString())
                     save(s.toString(), updateDelay)
             }
 
             override fun afterTextChanged(s: Editable) {}
         }
-        editText.addTextChangedListener(watcher)
-        editText2.addTextChangedListener(watcher)
+        editText?.addTextChangedListener(watcher)
+        editText2?.addTextChangedListener(watcher)
     }
 
     fun preferenceId(preferenceId: Int): SWEditEncryptedPassword {
diff --git a/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWItem.kt b/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWItem.kt
index 2a25c2ea91..a23619d2ef 100644
--- a/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWItem.kt
+++ b/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWItem.kt
@@ -1,14 +1,18 @@
 package info.nightscout.androidaps.setupwizard.elements
 
+import android.content.Context
+import android.content.ContextWrapper
 import android.view.View
 import android.widget.LinearLayout
 import androidx.annotation.StringRes
+import androidx.appcompat.app.AppCompatActivity
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.events.EventPreferenceChange
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.setupwizard.events.EventSWUpdate
+import info.nightscout.androidaps.utils.protection.PasswordCheck
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import info.nightscout.androidaps.utils.sharedPreferences.SP
 import java.util.concurrent.Executors
@@ -22,6 +26,7 @@ open class SWItem(val injector: HasAndroidInjector, var type: Type) {
     @Inject lateinit var rxBus: RxBusWrapper
     @Inject lateinit var resourceHelper: ResourceHelper
     @Inject lateinit var sp: SP
+    @Inject lateinit var passwordCheck: PasswordCheck
 
     private val eventWorker = Executors.newSingleThreadScheduledExecutor()
     private var scheduledEventPost: ScheduledFuture<*>? = null
@@ -33,6 +38,7 @@ open class SWItem(val injector: HasAndroidInjector, var type: Type) {
 
     @Suppress("unused")
     enum class Type {
+
         NONE, TEXT, HTML_LINK, BREAK, LISTENER, URL, STRING, NUMBER, DECIMAL_NUMBER, RADIOBUTTON, PLUGIN, BUTTON, FRAGMENT, UNIT_NUMBER, PREFERENCE
     }
 
@@ -79,4 +85,13 @@ open class SWItem(val injector: HasAndroidInjector, var type: Type) {
         val task: Runnable = PostRunnable()
         scheduledEventPost = eventWorker.schedule(task, updateDelay, TimeUnit.SECONDS)
     }
+
+    fun scanForActivity(cont: Context?): AppCompatActivity? {
+        return when (cont) {
+            null                 -> null
+            is AppCompatActivity -> cont
+            is ContextWrapper    -> scanForActivity(cont.baseContext)
+            else                 -> null
+        }
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/ActivityMonitor.kt b/app/src/main/java/info/nightscout/androidaps/utils/ActivityMonitor.kt
index 313d82308b..8f45f00b98 100644
--- a/app/src/main/java/info/nightscout/androidaps/utils/ActivityMonitor.kt
+++ b/app/src/main/java/info/nightscout/androidaps/utils/ActivityMonitor.kt
@@ -20,8 +20,8 @@ class ActivityMonitor @Inject constructor(
     private val dateUtil: DateUtil
 ) : Application.ActivityLifecycleCallbacks {
 
-    override fun onActivityPaused(activity: Activity?) {
-        val name = activity?.javaClass?.simpleName ?: return
+    override fun onActivityPaused(activity: Activity) {
+        val name = activity.javaClass.simpleName
         val resumed = sp.getLong("Monitor_" + name + "_" + "resumed", 0)
         if (resumed == 0L) {
             aapsLogger.debug(LTag.UI, "onActivityPaused: $name resumed == 0")
@@ -36,25 +36,25 @@ class ActivityMonitor @Inject constructor(
         aapsLogger.debug(LTag.UI, "onActivityPaused: $name elapsed=$elapsed total=${total + elapsed}")
     }
 
-    override fun onActivityResumed(activity: Activity?) {
-        val name = activity?.javaClass?.simpleName ?: return
+    override fun onActivityResumed(activity: Activity) {
+        val name = activity.javaClass.simpleName
         aapsLogger.debug(LTag.UI, "onActivityResumed: $name")
         sp.putLong("Monitor_" + name + "_" + "resumed", dateUtil.now())
     }
 
-    override fun onActivityStarted(activity: Activity?) {
+    override fun onActivityStarted(activity: Activity) {
     }
 
-    override fun onActivityDestroyed(activity: Activity?) {
+    override fun onActivityDestroyed(activity: Activity) {
     }
 
-    override fun onActivitySaveInstanceState(activity: Activity?, outState: Bundle?) {
+    override fun onActivitySaveInstanceState(activity: Activity, outState: Bundle) {
     }
 
-    override fun onActivityStopped(activity: Activity?) {
+    override fun onActivityStopped(activity: Activity) {
     }
 
-    override fun onActivityCreated(activity: Activity?, savedInstanceState: Bundle?) {
+    override fun onActivityCreated(activity: Activity, savedInstanceState: Bundle?) {
     }
 
     private fun toText(): String {
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/JSONFormatter.kt b/app/src/main/java/info/nightscout/androidaps/utils/JSONFormatter.kt
index adda9f9cc2..73c83207ad 100644
--- a/app/src/main/java/info/nightscout/androidaps/utils/JSONFormatter.kt
+++ b/app/src/main/java/info/nightscout/androidaps/utils/JSONFormatter.kt
@@ -17,7 +17,6 @@ class JSONFormatter @Inject constructor(
     private val aapsLogger: AAPSLogger
 ) {
 
-    @kotlin.ExperimentalStdlibApi
     fun format(jsonString: String?): Spanned {
         jsonString ?: return fromHtml("")
         val visitor = JsonVisitor(1, '\t')
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/LocalAlertUtils.kt b/app/src/main/java/info/nightscout/androidaps/utils/LocalAlertUtils.kt
index a8bdb9e92b..32775e9121 100644
--- a/app/src/main/java/info/nightscout/androidaps/utils/LocalAlertUtils.kt
+++ b/app/src/main/java/info/nightscout/androidaps/utils/LocalAlertUtils.kt
@@ -4,12 +4,17 @@ import info.nightscout.androidaps.interfaces.Config
 import info.nightscout.androidaps.Constants
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.database.AppRepository
+import info.nightscout.androidaps.database.entities.TherapyEvent
+import info.nightscout.androidaps.database.entities.UserEntry.Action
+import info.nightscout.androidaps.database.entities.UserEntry.Sources
+import info.nightscout.androidaps.database.entities.ValueWithUnit
 import info.nightscout.androidaps.database.transactions.InsertTherapyEventAnnouncementTransaction
 import info.nightscout.androidaps.interfaces.ActivePlugin
 import info.nightscout.androidaps.interfaces.IobCobCalculator
 import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.logging.UserEntryLogger
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.general.overview.events.EventDismissNotification
 import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification
@@ -38,7 +43,8 @@ class LocalAlertUtils @Inject constructor(
     private val smsCommunicatorPlugin: SmsCommunicatorPlugin,
     private val config: Config,
     private val repository: AppRepository,
-    private val dateUtil: DateUtil
+    private val dateUtil: DateUtil,
+    private val uel: UserEntryLogger
 ) {
 
     private val disposable = CompositeDisposable()
@@ -59,6 +65,7 @@ class LocalAlertUtils @Inject constructor(
                 aapsLogger.debug(LTag.CORE, "Generating pump unreachable alarm. lastConnection: " + dateUtil.dateAndTimeString(lastConnection) + " isStatusOutdated: " + isStatusOutdated)
                 sp.putLong("nextPumpDisconnectedAlarm", System.currentTimeMillis() + pumpUnreachableThreshold())
                 rxBus.send(EventNewNotification(Notification(Notification.PUMP_UNREACHABLE, resourceHelper.gs(R.string.pump_unreachable), Notification.URGENT).also { it.soundId = R.raw.alarm }))
+                uel.log(Action.CAREPORTAL, Sources.Aaps, resourceHelper.gs(R.string.pump_unreachable), ValueWithUnit.TherapyEventType(TherapyEvent.Type.ANNOUNCEMENT))
                 if (sp.getBoolean(R.string.key_ns_create_announcements_from_errors, true))
                     disposable += repository.runTransaction(InsertTherapyEventAnnouncementTransaction(resourceHelper.gs(R.string.pump_unreachable))).subscribe()
             }
@@ -117,6 +124,7 @@ class LocalAlertUtils @Inject constructor(
             n.soundId = R.raw.alarm
             sp.putLong("nextMissedReadingsAlarm", System.currentTimeMillis() + missedReadingsThreshold())
             rxBus.send(EventNewNotification(n))
+            uel.log(Action.CAREPORTAL, Sources.Aaps, resourceHelper.gs(R.string.missed_bg_readings), ValueWithUnit.TherapyEventType(TherapyEvent.Type.ANNOUNCEMENT))
             if (sp.getBoolean(R.string.key_ns_create_announcements_from_errors, true)) {
                 n.text?.let { disposable += repository.runTransaction(InsertTherapyEventAnnouncementTransaction(it)).subscribe() }
             }
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/PercentageSplitter.kt b/app/src/main/java/info/nightscout/androidaps/utils/PercentageSplitter.kt
index 3e38a2088c..96d1ad6b49 100644
--- a/app/src/main/java/info/nightscout/androidaps/utils/PercentageSplitter.kt
+++ b/app/src/main/java/info/nightscout/androidaps/utils/PercentageSplitter.kt
@@ -15,6 +15,6 @@ object PercentageSplitter {
      */
     fun pureName(name: String): String {
         val percentageMatch = splitPattern.matcher(name)
-        return if (percentageMatch.find()) percentageMatch.group(1).trim { it <= ' ' } else name
+        return if (percentageMatch.find()) (percentageMatch.group(1) as String).trim { it <= ' ' } else name
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/Profiler.kt b/app/src/main/java/info/nightscout/androidaps/utils/Profiler.kt
index b3ac2bbe94..b5a5ba1697 100644
--- a/app/src/main/java/info/nightscout/androidaps/utils/Profiler.kt
+++ b/app/src/main/java/info/nightscout/androidaps/utils/Profiler.kt
@@ -1,10 +1,12 @@
 package info.nightscout.androidaps.utils
 
+import info.nightscout.androidaps.annotations.OpenForTesting
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import javax.inject.Inject
 import javax.inject.Singleton
 
+@OpenForTesting
 @Singleton
 class Profiler @Inject constructor(val aapsLogger: AAPSLogger) {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/XdripCalibrations.kt b/app/src/main/java/info/nightscout/androidaps/utils/XdripCalibrations.kt
index bc7d5ff479..133a03187a 100644
--- a/app/src/main/java/info/nightscout/androidaps/utils/XdripCalibrations.kt
+++ b/app/src/main/java/info/nightscout/androidaps/utils/XdripCalibrations.kt
@@ -4,6 +4,7 @@ import android.content.Context
 import android.content.Intent
 import android.os.Bundle
 import info.nightscout.androidaps.R
+import info.nightscout.androidaps.annotations.OpenForTesting
 import info.nightscout.androidaps.interfaces.GlucoseUnit
 import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.logging.AAPSLogger
@@ -12,6 +13,7 @@ import info.nightscout.androidaps.utils.resources.ResourceHelper
 import javax.inject.Inject
 import javax.inject.Singleton
 
+@OpenForTesting
 @Singleton
 class XdripCalibrations @Inject constructor(
     private val aapsLogger: AAPSLogger,
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/androidNotification/NotificationHolderImpl.kt b/app/src/main/java/info/nightscout/androidaps/utils/androidNotification/NotificationHolderImpl.kt
index dfe9ed21c4..4fda9e5fd8 100644
--- a/app/src/main/java/info/nightscout/androidaps/utils/androidNotification/NotificationHolderImpl.kt
+++ b/app/src/main/java/info/nightscout/androidaps/utils/androidNotification/NotificationHolderImpl.kt
@@ -40,6 +40,6 @@ class NotificationHolderImpl @Inject constructor(
     override fun openAppIntent(context: Context): PendingIntent? = TaskStackBuilder.create(context).run {
         addParentStack(MainActivity::class.java)
         addNextIntent(Intent(context, MainActivity::class.java))
-        getPendingIntent(0, PendingIntent.FLAG_UPDATE_CURRENT)
+        getPendingIntent(0, PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_UPDATE_CURRENT)
     }
 }
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/buildHelper/BuildHelper.kt b/app/src/main/java/info/nightscout/androidaps/utils/buildHelper/BuildHelper.kt
deleted file mode 100644
index 0cb6b5c772..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/utils/buildHelper/BuildHelper.kt
+++ /dev/null
@@ -1,31 +0,0 @@
-package info.nightscout.androidaps.utils.buildHelper
-
-import info.nightscout.androidaps.BuildConfig
-import info.nightscout.androidaps.interfaces.Config
-import info.nightscout.androidaps.plugins.general.maintenance.LoggerUtils
-import java.io.File
-import javax.inject.Inject
-import javax.inject.Singleton
-
-@Singleton
-class BuildHelper @Inject constructor(private val config: Config, loggerUtils: LoggerUtils) {
-
-    private var devBranch = false
-    private var engineeringMode = false
-
-    init {
-        val extFilesDir = loggerUtils.logDirectory
-        val engineeringModeSemaphore = File(extFilesDir, "engineering__mode")
-
-        engineeringMode = engineeringModeSemaphore.exists() && engineeringModeSemaphore.isFile
-        devBranch = BuildConfig.VERSION.contains("-") || BuildConfig.VERSION.matches(Regex(".*[a-zA-Z]+.*"))
-    }
-
-    fun isEngineeringModeOrRelease(): Boolean =
-        if (!config.APS) true else engineeringMode || !devBranch
-
-    fun isEngineeringMode(): Boolean =
-        engineeringMode
-
-    fun isDev(): Boolean = devBranch
-}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/buildHelper/BuildHelperImpl.kt b/app/src/main/java/info/nightscout/androidaps/utils/buildHelper/BuildHelperImpl.kt
new file mode 100644
index 0000000000..c37fedb8a4
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/utils/buildHelper/BuildHelperImpl.kt
@@ -0,0 +1,30 @@
+package info.nightscout.androidaps.utils.buildHelper
+
+import info.nightscout.androidaps.BuildConfig
+import info.nightscout.androidaps.annotations.OpenForTesting
+import info.nightscout.androidaps.interfaces.Config
+import info.nightscout.androidaps.plugins.general.maintenance.PrefFileListProvider
+import java.io.File
+
+class BuildHelperImpl constructor(
+    private val config: Config,
+    fileListProvider: PrefFileListProvider
+) : BuildHelper {
+
+    private var devBranch = false
+    private var engineeringMode = false
+
+    init {
+        val engineeringModeSemaphore = File(fileListProvider.ensureExtraDirExists(), "engineering__mode")
+
+        engineeringMode = engineeringModeSemaphore.exists() && engineeringModeSemaphore.isFile
+        devBranch = BuildConfig.VERSION.contains("-") || BuildConfig.VERSION.matches(Regex(".*[a-zA-Z]+.*"))
+    }
+
+    override fun isEngineeringModeOrRelease(): Boolean =
+        if (!config.APS) true else engineeringMode || !devBranch
+
+    override fun isEngineeringMode(): Boolean = engineeringMode
+
+    override fun isDev(): Boolean = devBranch
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/NumberPickerVertical.kt b/app/src/main/java/info/nightscout/androidaps/utils/ui/NumberPickerVertical.kt
similarity index 82%
rename from app/src/main/java/info/nightscout/androidaps/utils/NumberPickerVertical.kt
rename to app/src/main/java/info/nightscout/androidaps/utils/ui/NumberPickerVertical.kt
index 5e7a0d7e90..495dc01e7f 100644
--- a/app/src/main/java/info/nightscout/androidaps/utils/NumberPickerVertical.kt
+++ b/app/src/main/java/info/nightscout/androidaps/utils/ui/NumberPickerVertical.kt
@@ -1,10 +1,9 @@
-package info.nightscout.androidaps.utils
+package info.nightscout.androidaps.utils.ui
 
 import android.content.Context
 import android.util.AttributeSet
 import android.view.LayoutInflater
 import info.nightscout.androidaps.R
-import info.nightscout.androidaps.utils.ui.NumberPicker
 
 class NumberPickerVertical : NumberPicker {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/SpinnerHelper.java b/app/src/main/java/info/nightscout/androidaps/utils/ui/SpinnerHelper.java
similarity index 99%
rename from app/src/main/java/info/nightscout/androidaps/utils/SpinnerHelper.java
rename to app/src/main/java/info/nightscout/androidaps/utils/ui/SpinnerHelper.java
index a45fcd5a57..191f539680 100644
--- a/app/src/main/java/info/nightscout/androidaps/utils/SpinnerHelper.java
+++ b/app/src/main/java/info/nightscout/androidaps/utils/ui/SpinnerHelper.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.utils;
+package info.nightscout.androidaps.utils.ui;
 
 import android.view.MotionEvent;
 import android.view.View;
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/TimeListEdit.java b/app/src/main/java/info/nightscout/androidaps/utils/ui/TimeListEdit.java
similarity index 98%
rename from app/src/main/java/info/nightscout/androidaps/utils/TimeListEdit.java
rename to app/src/main/java/info/nightscout/androidaps/utils/ui/TimeListEdit.java
index 33a24e3244..591da73eaa 100644
--- a/app/src/main/java/info/nightscout/androidaps/utils/TimeListEdit.java
+++ b/app/src/main/java/info/nightscout/androidaps/utils/ui/TimeListEdit.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.utils;
+package info.nightscout.androidaps.utils.ui;
 
 import android.content.Context;
 import android.text.Editable;
@@ -26,7 +26,10 @@ import java.util.List;
 
 import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.logging.AAPSLogger;
+import info.nightscout.androidaps.utils.DateUtil;
+import info.nightscout.androidaps.utils.SafeParse;
 import info.nightscout.androidaps.utils.ui.NumberPicker;
+import info.nightscout.androidaps.utils.ui.SpinnerHelper;
 
 /**
  * Created by mike on 29.12.2016.
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/wizard/BolusWizard.kt b/app/src/main/java/info/nightscout/androidaps/utils/wizard/BolusWizard.kt
index a9f2462bc6..29de9c8266 100644
--- a/app/src/main/java/info/nightscout/androidaps/utils/wizard/BolusWizard.kt
+++ b/app/src/main/java/info/nightscout/androidaps/utils/wizard/BolusWizard.kt
@@ -12,6 +12,7 @@ import info.nightscout.androidaps.data.DetailedBolusInfo
 import info.nightscout.androidaps.interfaces.Profile
 import info.nightscout.androidaps.database.AppRepository
 import info.nightscout.androidaps.database.entities.BolusCalculatorResult
+import info.nightscout.androidaps.database.entities.OfflineEvent
 import info.nightscout.androidaps.database.entities.ValueWithUnit
 import info.nightscout.androidaps.database.entities.TemporaryTarget
 import info.nightscout.androidaps.database.entities.UserEntry.Action
@@ -132,7 +133,6 @@ class BolusWizard @Inject constructor(
     private var carbTime: Int = 0
     private var quickWizard: Boolean = true
 
-    @JvmOverloads
     fun doCalc(profile: Profile,
                profileName: String,
                tempTarget: TemporaryTarget?,
@@ -374,7 +374,7 @@ class BolusWizard @Inject constructor(
                 if (useSuperBolus) {
                     uel.log(Action.SUPERBOLUS_TBR, Sources.WizardDialog)
                     if (loopPlugin.isEnabled(PluginType.LOOP)) {
-                        loopPlugin.superBolusTo(System.currentTimeMillis() + 2 * 60L * 60 * 1000)
+                        loopPlugin.goToZeroTemp(2 * 60, profile, OfflineEvent.Reason.SUPER_BOLUS)
                         rxBus.send(EventRefreshOverview("WizardDialog"))
                     }
 
@@ -408,7 +408,7 @@ class BolusWizard @Inject constructor(
                     context = ctx
                     mgdlGlucose = Profile.toMgdl(bg, profile.units)
                     glucoseType = DetailedBolusInfo.MeterType.MANUAL
-                    carbTime = this@BolusWizard.carbTime
+                    carbsTimestamp = dateUtil.now() + T.mins(this@BolusWizard.carbTime.toLong()).msecs()
                     bolusCalculatorResult = createBolusCalculatorResult()
                     notes = this@BolusWizard.notes
                     if (insulin > 0 || carbs > 0) {
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/wizard/QuickWizardEntry.kt b/app/src/main/java/info/nightscout/androidaps/utils/wizard/QuickWizardEntry.kt
index 9e9ae6a87a..c1784ca4ff 100644
--- a/app/src/main/java/info/nightscout/androidaps/utils/wizard/QuickWizardEntry.kt
+++ b/app/src/main/java/info/nightscout/androidaps/utils/wizard/QuickWizardEntry.kt
@@ -84,11 +84,9 @@ class QuickWizardEntry @Inject constructor(private val injector: HasAndroidInjec
             bg = lastBG.valueToUnits(profileFunction.getUnits())
         }
         // COB
-        var cob = 0.0
-        if (useCOB() == YES) {
-            val cobInfo = iobCobCalculator.getCobInfo(_synchronized, "QuickWizard COB")
-            if (cobInfo.displayCob != null) cob = cobInfo.displayCob!!
-        }
+        val cob =
+            if (useCOB() == YES) iobCobCalculator.getCobInfo(_synchronized, "QuickWizard COB").displayCob ?: 0.0
+            else 0.0
         // Bolus IOB
         var bolusIOB = false
         if (useBolusIOB() == YES) {
@@ -121,7 +119,7 @@ class QuickWizardEntry @Inject constructor(private val injector: HasAndroidInjec
             trend = true
         }
         val percentage = sp.getInt(R.string.key_boluswizard_percentage, 100)
-        return BolusWizard(injector).doCalc(profile, profileName, tempTarget, carbs(), cob, bg, 0.0, percentage, true, useCOB() == YES, bolusIOB, basalIOB, superBolus, useTempTarget() == YES, trend, false, buttonText(), quickWizard = true) //tbc, ok if only quickwizard, but if other sources elsewhere use Sources.QuickWiard
+        return BolusWizard(injector).doCalc(profile, profileName, tempTarget, carbs(), cob, bg, 0.0, percentage, true, useCOB() == YES, bolusIOB, basalIOB, superBolus, useTempTarget() == YES, trend, false, buttonText(), quickWizard = true) //tbc, ok if only quickwizard, but if other sources elsewhere use Sources.QuickWizard
     }
 
     fun buttonText(): String = safeGetString(storage, "buttonText", "")
diff --git a/app/src/main/res/drawable/open_humans.xml b/app/src/main/res/drawable/open_humans.xml
deleted file mode 100644
index 2ffbadc2b1..0000000000
--- a/app/src/main/res/drawable/open_humans.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector android:height="100.5272dp" android:viewportHeight="108.36626"
-    android:viewportWidth="107.79796" android:width="100dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#ff9161" android:pathData="m59.75,62.316c5.179,-2.256 8.801,-7.417 8.801,-13.427 0,-8.086 -6.555,-14.641 -14.641,-14.641 -8.086,0 -14.641,6.555 -14.641,14.641 0,6.01 3.622,11.171 8.801,13.427 -7.849,1.589 -14.555,6.318 -18.76,12.817 5.968,6.896 14.774,11.272 24.589,11.272 9.821,0 18.633,-4.382 24.601,-11.286 -4.205,-6.491 -10.907,-11.215 -18.75,-12.803z"/>
-    <path android:fillColor="#ff9161" android:pathData="M21.689,33.33 L10.002,21.643c-5.155,7 -8.677,15.271 -10.002,24.25l16.523,0c0.968,-4.535 2.741,-8.776 5.166,-12.563z"/>
-    <path android:fillColor="#ff9161" android:pathData="m91.275,45.893l16.523,0C106.473,36.909 102.947,28.634 97.787,21.631L86.101,33.317c2.429,3.79 4.205,8.035 5.174,12.576z"/>
-    <path android:fillColor="#ff9161" android:pathData="M86.305,10.106C79.304,4.91 71.02,1.351 62.022,0l0,15.422l13.059,5.908z"/>
-    <path android:fillColor="#ff9161" android:pathData="M45.754,15.339L45.754,0.003c-8.995,1.354 -17.276,4.915 -24.274,10.113l10.963,10.963z"/>
-    <path android:fillColor="#4bc0c7" android:pathData="m26.558,80.554c-4.881,-5.002 -8.405,-11.333 -9.971,-18.394l-16.546,0c4.001,26.128 26.629,46.206 53.858,46.206 27.229,0 49.857,-20.077 53.858,-46.206l-16.546,0c-1.564,7.053 -5.082,13.378 -9.955,18.378 -6.946,7.127 -16.643,11.56 -27.357,11.56 -10.706,0 -20.396,-4.427 -27.341,-11.544z"/>
-</vector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/actions_fragment.xml b/app/src/main/res/layout/actions_fragment.xml
index 98e3976d97..7d43edb857 100644
--- a/app/src/main/res/layout/actions_fragment.xml
+++ b/app/src/main/res/layout/actions_fragment.xml
@@ -273,7 +273,7 @@
                 style="@style/ButtonSmallFontStyle"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:drawableTop="@drawable/ic_danarhistory"
+                android:drawableTop="@drawable/ic_pump_history"
                 android:paddingLeft="0dp"
                 android:paddingRight="0dp"
                 android:text="@string/nav_historybrowser"
diff --git a/app/src/main/res/layout/actions_fragment_lowres.xml b/app/src/main/res/layout/actions_fragment_lowres.xml
index bf90751f8d..689277d9d7 100644
--- a/app/src/main/res/layout/actions_fragment_lowres.xml
+++ b/app/src/main/res/layout/actions_fragment_lowres.xml
@@ -273,7 +273,7 @@
                 style="@style/ButtonSmallFontStyle"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:drawableTop="@drawable/ic_danarhistory"
+                android:drawableTop="@drawable/ic_pump_history"
                 android:paddingLeft="0dp"
                 android:paddingRight="0dp"
                 android:text="@string/nav_historybrowser"
diff --git a/app/src/main/res/layout/activity_historybrowse.xml b/app/src/main/res/layout/activity_historybrowse.xml
index 98ce50f0c4..65bd506f7e 100644
--- a/app/src/main/res/layout/activity_historybrowse.xml
+++ b/app/src/main/res/layout/activity_historybrowse.xml
@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context="info.nightscout.androidaps.historyBrowser.HistoryBrowseActivity">
+    tools:context="info.nightscout.androidaps.activities.HistoryBrowseActivity">
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -72,7 +72,7 @@
                 android:layout_weight="1">
 
                 <com.jjoe64.graphview.GraphView
-                    android:id="@+id/bggraph"
+                    android:id="@+id/bg_graph"
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent" />
 
diff --git a/app/src/main/res/layout/activity_open_humans_login.xml b/app/src/main/res/layout/activity_open_humans_login.xml
deleted file mode 100644
index f13e3b0682..0000000000
--- a/app/src/main/res/layout/activity_open_humans_login.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:fillViewport="true">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center"
-        android:orientation="vertical"
-        android:padding="16dp">
-
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/uploaded_data"
-            android:textAlignment="center"
-            android:textAppearance="@style/TextAppearance.AppCompat.Headline" />
-
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="8dp"
-            android:text="@string/the_following_data_will_be_uploaded_to_your_open_humans_account"
-            android:textAlignment="center"
-            android:textAppearance="@style/TextAppearance.AppCompat.Body1" />
-
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="16dp"
-            android:text="@string/terms_of_use"
-            android:textAlignment="center"
-            android:textAppearance="@style/TextAppearance.AppCompat.Headline" />
-
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="8dp"
-            android:text="@string/open_humans_terms"
-            android:textAlignment="center"
-            android:textAppearance="@style/TextAppearance.AppCompat.Body1" />
-
-        <CheckBox
-            android:id="@+id/checkbox"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="16dp"
-            android:text="@string/i_understand_and_agree" />
-
-        <Button
-            android:id="@+id/button"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/login" />
-    </LinearLayout>
-</ScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/configbuilder_single_plugin.xml b/app/src/main/res/layout/configbuilder_single_plugin.xml
index 94d6468828..c6303a922b 100644
--- a/app/src/main/res/layout/configbuilder_single_plugin.xml
+++ b/app/src/main/res/layout/configbuilder_single_plugin.xml
@@ -9,17 +9,17 @@
 
     <RadioButton
         android:id="@+id/plugin_enabled_exclusive"
-        android:saveEnabled="false"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginEnd="6dp" />
+        android:layout_marginEnd="6dp"
+        android:saveEnabled="false" />
 
     <CheckBox
         android:id="@+id/plugin_enabled_inclusive"
-        android:saveEnabled="false"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginEnd="6dp" />
+        android:layout_marginEnd="6dp"
+        android:saveEnabled="false" />
 
     <LinearLayout
         android:layout_width="0dp"
@@ -31,14 +31,21 @@
             android:id="@+id/plugin_icon"
             android:layout_width="36dp"
             android:layout_height="36dp"
-            android:layout_marginEnd="8dp"
-            android:layout_gravity="center_vertical"/>
+            android:layout_gravity="center_vertical"
+            android:layout_marginEnd="8dp" />
+
+        <ImageView
+            android:id="@+id/plugin_icon2"
+            android:layout_width="36dp"
+            android:layout_height="36dp"
+            android:layout_gravity="center_vertical"
+            android:layout_marginEnd="8dp" />
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginBottom="12dp"
             android:layout_marginTop="12dp"
+            android:layout_marginBottom="12dp"
             android:orientation="vertical">
 
             <TextView
@@ -69,7 +76,7 @@
 
     <CheckBox
         android:id="@+id/plugin_visibility"
-        android:saveEnabled="false"
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
+        android:layout_height="wrap_content"
+        android:saveEnabled="false" />
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_loop.xml b/app/src/main/res/layout/dialog_loop.xml
index 594d1855e3..fa1d97105e 100644
--- a/app/src/main/res/layout/dialog_loop.xml
+++ b/app/src/main/res/layout/dialog_loop.xml
@@ -275,6 +275,7 @@
         </LinearLayout>
 
         <LinearLayout
+            android:id="@+id/overview_pump"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical">
diff --git a/app/src/main/res/layout/dialog_profileswitch.xml b/app/src/main/res/layout/dialog_profileswitch.xml
index b9efbfc06e..aa5bdf6b99 100644
--- a/app/src/main/res/layout/dialog_profileswitch.xml
+++ b/app/src/main/res/layout/dialog_profileswitch.xml
@@ -210,6 +210,33 @@
 
         </LinearLayout>
 
+        <LinearLayout
+            android:id="@+id/tt_layout"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:width="120dp"
+                android:paddingLeft="10dp"
+                android:paddingRight="10dp"
+                android:text="@string/careportal_temporarytarget"
+                android:textAppearance="@style/TextAppearance.AppCompat.Small"
+                android:textStyle="bold" />
+
+            <CheckBox
+                android:id="@+id/tt"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:layout_weight="1"
+                android:text="@string/activity" />
+
+        </LinearLayout>
+
         <include
             android:id="@+id/notes_layout"
             layout="@layout/notes" />
diff --git a/app/src/main/res/layout/overview_fragment.xml b/app/src/main/res/layout/overview_fragment.xml
index 149fa2c9ce..f37998f4e3 100644
--- a/app/src/main/res/layout/overview_fragment.xml
+++ b/app/src/main/res/layout/overview_fragment.xml
@@ -10,8 +10,7 @@
         android:id="@+id/top_part_scrollbar"
         android:layout_width="wrap_content"
         android:layout_height="0dp"
-        android:layout_weight="1"
-        tools:ignore="UselessParent">
+        android:layout_weight="1">
 
         <LinearLayout
             android:id="@+id/inner_layout"
@@ -24,9 +23,42 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content" />
 
-            <include
-                android:id="@+id/loop_pump_status_layout"
-                layout="@layout/overview_loop_pumpstatus_layout" />
+            <LinearLayout
+                android:id="@+id/loop_layout"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal" >
+
+                <TextView
+                    android:id="@+id/active_profile"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="end"
+                    android:layout_marginEnd="5dp"
+                    android:layout_weight="1"
+                    android:gravity="center_vertical|center_horizontal"
+                    android:paddingTop="6dp"
+                    android:paddingBottom="6dp"
+                    android:text="Profile"
+                    android:textAppearance="?android:attr/textAppearanceSmall"
+                    tools:ignore="HardcodedText" />
+
+                <TextView
+                    android:id="@+id/temp_target"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="end"
+                    android:layout_weight="1"
+                    android:gravity="center_vertical|center_horizontal"
+                    android:paddingTop="6dp"
+                    android:paddingBottom="6dp"
+                    android:text="TempTarget"
+                    android:textAppearance="?android:attr/textAppearanceSmall"
+                    android:textColor="@color/mdtp_white"
+                    tools:ignore="HardcodedText" />
+
+            </LinearLayout>
+
 
             <include
                 android:id="@+id/info_layout"
@@ -92,6 +124,28 @@
 
     </ScrollView>
 
+    <LinearLayout
+        android:id="@+id/pump_status_layout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:visibility="gone">
+
+        <TextView
+            android:id="@+id/pump_status"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="5dp"
+            android:layout_marginRight="5dp"
+            android:background="@color/pumpStatusBackground"
+            android:gravity="center_vertical|center_horizontal"
+            android:paddingTop="6dp"
+            android:paddingBottom="6dp"
+            android:text="@string/initializing"
+            android:textAppearance="?android:attr/textAppearanceSmall" />
+
+    </LinearLayout>
+
     <include
         android:id="@+id/buttons_layout"
         layout="@layout/overview_buttons_layout" />
diff --git a/app/src/main/res/layout/overview_loop_pumpstatus_layout.xml b/app/src/main/res/layout/overview_loop_pumpstatus_layout.xml
deleted file mode 100644
index 0a6288d429..0000000000
--- a/app/src/main/res/layout/overview_loop_pumpstatus_layout.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content">
-
-    <LinearLayout
-        android:id="@+id/loop_layout"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal" >
-
-        <TextView
-            android:id="@+id/active_profile"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="end"
-            android:layout_marginEnd="5dp"
-            android:layout_weight="1"
-            android:gravity="center_vertical|center_horizontal"
-            android:paddingTop="6dp"
-            android:paddingBottom="6dp"
-            android:text="Profile"
-            android:textAppearance="?android:attr/textAppearanceSmall"
-            tools:ignore="HardcodedText" />
-
-        <TextView
-            android:id="@+id/temp_target"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="end"
-            android:layout_weight="1"
-            android:gravity="center_vertical|center_horizontal"
-            android:paddingTop="6dp"
-            android:paddingBottom="6dp"
-            android:text="TempTarget"
-            android:textAppearance="?android:attr/textAppearanceSmall"
-            android:textColor="@color/mdtp_white"
-            tools:ignore="HardcodedText" />
-
-    </LinearLayout>
-
-    <LinearLayout
-        android:id="@+id/pump_status_layout"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:visibility="gone">
-
-        <TextView
-            android:id="@+id/pump_status"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="5dp"
-            android:layout_marginRight="5dp"
-            android:gravity="center_vertical|center_horizontal"
-            android:paddingTop="6dp"
-            android:paddingBottom="6dp"
-            android:text="@string/initializing"
-            android:textAppearance="?android:attr/textAppearanceSmall" />
-
-    </LinearLayout>
-
-
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/timelistedit_element_vertical.xml b/app/src/main/res/layout/timelistedit_element_vertical.xml
index d10a7f46ab..a76a8bc20b 100644
--- a/app/src/main/res/layout/timelistedit_element_vertical.xml
+++ b/app/src/main/res/layout/timelistedit_element_vertical.xml
@@ -20,13 +20,13 @@
         android:layout_height="wrap_content"
         android:orientation="horizontal">
 
-        <info.nightscout.androidaps.utils.NumberPickerVertical
+        <info.nightscout.androidaps.utils.ui.NumberPickerVertical
             android:id="@+id/timelistedit_edit1"
             android:layout_width="60dp"
             android:layout_height="100dp"
             android:layout_marginRight="5dp" />
 
-        <info.nightscout.androidaps.utils.NumberPickerVertical
+        <info.nightscout.androidaps.utils.ui.NumberPickerVertical
             android:id="@+id/timelistedit_edit2"
             android:layout_width="60dp"
             android:layout_height="100dp" />
diff --git a/app/src/main/res/layout/treatments_tempbasals_item.xml b/app/src/main/res/layout/treatments_tempbasals_item.xml
index cd9d6fcc4f..ff42255451 100644
--- a/app/src/main/res/layout/treatments_tempbasals_item.xml
+++ b/app/src/main/res/layout/treatments_tempbasals_item.xml
@@ -164,6 +164,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="5dp"
+                android:visibility="gone"
                 android:text="@string/remove_button"
                 android:textAlignment="viewEnd"
                 android:textColor="@android:color/holo_orange_light" />
diff --git a/app/src/main/res/layout/virtualpump_fragment.xml b/app/src/main/res/layout/virtualpump_fragment.xml
index 9ec99fad5d..4129d2e050 100644
--- a/app/src/main/res/layout/virtualpump_fragment.xml
+++ b/app/src/main/res/layout/virtualpump_fragment.xml
@@ -234,6 +234,51 @@
 
             </LinearLayout>
 
+            <!-- Pump Serial -->
+            <View
+                android:layout_width="fill_parent"
+                android:layout_height="2dip"
+                android:layout_marginBottom="5dp"
+                android:layout_marginLeft="20dp"
+                android:layout_marginRight="20dp"
+                android:layout_marginTop="5dp"
+                android:background="@color/list_delimiter" />
+
+            <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"
+                    android:gravity="end"
+                    android:paddingRight="5dp"
+                    android:text="@string/serialnumber"
+                    android:textSize="14sp" />
+
+                <TextView
+                    android:layout_width="5dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="0"
+                    android:gravity="center_horizontal"
+                    android:paddingEnd="2dp"
+                    android:paddingStart="2dp"
+                    android:text=":"
+                    android:textSize="14sp" />
+
+                <TextView
+                    android:id="@+id/serial_number"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:gravity="start"
+                    android:paddingLeft="5dp"
+                    android:textSize="14sp" />
+
+            </LinearLayout>
+
             <!-- Pump Type -->
             <View
                 android:layout_width="fill_parent"
@@ -279,7 +324,7 @@
 
             </LinearLayout>
 
-            <!-- Pump Type -->
+            <!-- Pump Definition -->
             <View
                 android:layout_width="fill_parent"
                 android:layout_height="2dip"
diff --git a/app/src/main/res/values-af-rZA/strings.xml b/app/src/main/res/values-af-rZA/strings.xml
index 7fdd0bc9b8..45d6660066 100644
--- a/app/src/main/res/values-af-rZA/strings.xml
+++ b/app/src/main/res/values-af-rZA/strings.xml
@@ -75,8 +75,6 @@
     <string name="careportal">Careportal</string>
     <string name="configbuilder_pump">Pomp</string>
     <string name="configbuilder_pump_description">Watter pomp wil jy gebruik met AndroidAPS?</string>
-    <string name="configbuilder_treatments">Behandelings</string>
-    <string name="configbuilder_treatments_description">Watter plugin moet gebruik word vir behandeling hantering?</string>
     <string name="configbuilder_profile">Profiel</string>
     <string name="configbuilder_profile_description">Watter profiel moet AndroidAPS gebruik?</string>
     <string name="configbuilder_aps">APS</string>
@@ -149,7 +147,6 @@
     <string name="smscommunicator_loophasbeendisabled">Loop is gedeaktiveer</string>
     <string name="smscommunicator_loophasbeenenabled">Loop is geaktiveerd</string>
     <string name="smscommunicator_loopisenabled">Lus geaktiveer</string>
-    <string name="valuelimitedto">%1$.2f beperk tot %2$.2f</string>
     <string name="smscommunicator_remotecommandnotallowed">Afstandbeheerde bevel word nie toegelaat nie</string>
     <string name="smscommunicator_remotebolusnotallowed">Afstandbeheerde bolus nie beskikbaar nie. Probeer later weer.</string>
     <string name="smscommunicator_profilereplywithcode">Om profiel te verander na %1$s %2$d%% antwoord met %3$s</string>
diff --git a/app/src/main/res/values-bg-rBG/objectives.xml b/app/src/main/res/values-bg-rBG/objectives.xml
index b8d993fff4..14fdadc587 100644
--- a/app/src/main/res/values-bg-rBG/objectives.xml
+++ b/app/src/main/res/values-bg-rBG/objectives.xml
@@ -17,7 +17,6 @@
     <string name="objectives_maxiob_gate">Прекарайте няколко дни по този начин, като поне една нощ нямате аларма за ниска КЗ</string>
     <string name="objectives_autosens_objective">Настройване на базалния инсулин и коефициенти ако е необходимо и активиране на auto-sens</string>
     <string name="objectives_autosens_gate">Една седмица успешно дневно използване с редовно въвеждане на въглехидрати</string>
-    <string name="objectives_ama_objective">Активиране на допълнителни функции за дневно използване, включително и advanced meal assist (АМА)</string>
     <string name="objectives_smb_objective">Добавяне на допълнителни функции за използване през деня, като SMB</string>
     <string name="objectives_auto_objective">Разрешаване на автоматизация</string>
     <string name="objectives_smb_gate">Трябва да прочетете wiki и увеличите maxIOB за да може SMB да работи добре! Добро начало е maxIOB = средния болус за хранене + 3 пъти най-големия базал от профила</string>
diff --git a/app/src/main/res/values-bg-rBG/strings.xml b/app/src/main/res/values-bg-rBG/strings.xml
index d534d43b6a..a453bfac59 100644
--- a/app/src/main/res/values-bg-rBG/strings.xml
+++ b/app/src/main/res/values-bg-rBG/strings.xml
@@ -81,8 +81,6 @@
     <string name="careportal">Careportal</string>
     <string name="configbuilder_pump">Помпа</string>
     <string name="configbuilder_pump_description">Каква помпа използвате с AndroidAPS?</string>
-    <string name="configbuilder_treatments">Лечения</string>
-    <string name="configbuilder_treatments_description">Коя приставка да използваме за леченията?</string>
     <string name="configbuilder_profile">Профил</string>
     <string name="configbuilder_profile_description">Кой тип профил да използва AndroidAPS?</string>
     <string name="configbuilder_aps">Алгоритъм за APS</string>
@@ -190,7 +188,6 @@
     <string name="smscommunicator_loophasbeendisabled">APS е деактивиран</string>
     <string name="smscommunicator_loophasbeenenabled">APS е активиран</string>
     <string name="smscommunicator_loopisenabled">APS е включен</string>
-    <string name="valuelimitedto">%1$.2f ограничен до %2$.2f</string>
     <string name="smscommunicator_pumpconnectwithcode">За свързване с помпа отговорете с код %1$s</string>
     <string name="smscommunicator_pumpconnectfail">Връзката с помпата е неуспешна</string>
     <string name="smscommunicator_pumpdisconnectwithcode">За да спрете помпата за %1$d минути отговорете с код %2$s</string>
@@ -828,36 +825,6 @@
     <string name="formatwithweight">Възраст: %1$.0f Тегло: %2$.0f кг</string>
     <string name="basalpctfromtdd_label">% от базата</string>
     <string name="dpvdefaultprofile">Профил по подразбиране</string>
-    <string name="open_humans">Open Humans</string>
-    <string name="finishing_open_humans_setup">Довършване на Open Humans инсталация…</string>
-    <string name="this_may_take_a_while">Това може да отнеме време. Не изключвайте телефона или тази приставка.</string>
-    <string name="setup_finished">Настройката е завършена</string>
-    <string name="your_phone_will_upload_data">Телефонът ви скоро ще качва данни в \"Open Humans\".</string>
-    <string name="your_phone_is_upload_data">Телефонът ви качва данни в \"Open Humans\".</string>
-    <string name="setup_failed">Настройката е НЕУСПЕШНА</string>
-    <string name="there_was_an_error">Имаше грешка. Моля, опитайте се да влезете отново, за да продължите. Съжаляваме и ви благодарим!</string>
-    <string name="open_humans_terms">Това е отворен код, който ще копира данните ви в Open Humans. Ние не запазваме никакви права да споделяме вашите данни с трети страни без изричното ви разрешение. Данните, които проектът и приложението получават, се идентифицират чрез случаен идентификатор на потребител и ще бъдат надеждно предадени на Open Humans акаунт с вашето разрешение за този процес. Можете да спрете качването и да изтриете данните за качване по всяко време чрез www.openhumans.org.</string>
-    <string name="i_understand_and_agree">Разбирам и съм съгласен.</string>
-    <string name="login">Вход</string>
-    <string name="logout">Изход</string>
-    <string name="oh_logout_confirmation">Наистина ли искате да излезете и да спрете да дарявате данни на науката?</string>
-    <string name="project_member_id">Project Member ID: %s</string>
-    <string name="queue_size">Големина на опашката: %d</string>
-    <string name="terms_of_use">Условия за ползване</string>
-    <string name="not_logged_in">Не сте влезнали в профила си</string>
-    <string name="you_need_to_accept_the_of_use_first">Трябва да се съгласите с условията за ползване.</string>
-    <string name="successfully_logged_in">Успешно влизане</string>
-    <string name="setup_will_continue_in_background">Настройката ще бъде завършена във фонов режим. Благодаря, че дарявате данните.\n\nМоля, задръжте този плъгин и телефона ви включени, докато настройката да завърши.</string>
-    <string name="completing_login">Завършване на вход…</string>
-    <string name="donate_your_data_to_science">Дарете данните си на науката.</string>
-    <string name="open_humans_short">OH</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="only_upload_if_connected_to_wifi">Качване, само при свързано WiFi</string>
-    <string name="only_upload_if_charging">Качване само при зареждане</string>
-    <string name="worker_state">Статус: %s</string>
-    <string name="uploaded_data">Качени данни</string>
-    <string name="the_following_data_will_be_uploaded_to_your_open_humans_account">Следните данни ще бъдат качвани във вашия Open Humans акаунт: Глюкозни стойности, болуси, въглехидрати, удължени болуси, профилни смени, общи дневни дози, временни базали, временни цели, предпочитания, версия на AAPS, модел на телефона и размери на екрана. Тайна или лична информация, като например вашия адрес на Nightscout или API, няма да бъдат качени.</string>
     <string name="setupwizard_pump_riley_link_status">RileyLink статус:</string>
     <string name="filter">Филтър</string>
     <string name="copytolocalprofile_invalid">Не може да се създаде локален профил. Профилът е невалиден.</string>
@@ -878,4 +845,5 @@
     <string name="clear_filter">Премахни филтъра</string>
     <string name="trend_arrow">Стрелка тенденция</string>
     <string name="cannula">Канюла</string>
+    <string name="ns_receive_profile_store_summary">Синхронизирай NS профила с локалния</string>
 </resources>
diff --git a/app/src/main/res/values-cs-rCZ/exam.xml b/app/src/main/res/values-cs-rCZ/exam.xml
index 64545e4677..4e4eadcbfb 100644
--- a/app/src/main/res/values-cs-rCZ/exam.xml
+++ b/app/src/main/res/values-cs-rCZ/exam.xml
@@ -132,7 +132,7 @@
     <string name="wronginsulin_label">Chyby v podání inzulínu</string>
     <string name="wronginsulin_whattodo">Co byste měli udělat, pokud jste dostali méně inzulínu, než ukazuje historie pumpy, např. v důsledku okluze, vadné kanyly nebo zapomenutí na opětovné připojení pumpy po sprše? </string>
     <string name="wronginsulin_careportal">Odstraňte data z Nightscoutu pro odstranění z historie pumpy.</string>
-    <string name="wronginsulin_compare">Porovnejte hodnoty v AndroidAPS a historii pumpy.</string>
+    <string name="wronginsulin_compare">Porovnat hodnoty v AndroidAPS s hodnotami v historii pumpy (pokud to pumpa podporuje).</string>
     <string name="wronginsulin_prime">Pošlete bolus na vypočtený „chybějící“ inzulín buď injekční stříkačkou nebo perem nebo pomocí plnění na pumpě.</string>
     <string name="wronginsulin_donothing">Neudělejte nic a dovolte AndroidAPS opravit jakoukoliv výslednou vysokou hladinu glukózy v krvi.</string>
     <string name="iob_label">Aktivní inzulín (IOB)</string>
diff --git a/app/src/main/res/values-cs-rCZ/objectives.xml b/app/src/main/res/values-cs-rCZ/objectives.xml
index ab802e6388..cf5a84b627 100644
--- a/app/src/main/res/values-cs-rCZ/objectives.xml
+++ b/app/src/main/res/values-cs-rCZ/objectives.xml
@@ -17,7 +17,6 @@
     <string name="objectives_maxiob_gate">Provozovat smyčku několik dní s alespoň jednou nocí bez alarmů na nízkou glykémii</string>
     <string name="objectives_autosens_objective">Upravit bazály a poměry, bude-li to potřeba, a povolit automatickou detekci citlivosti na inzulín</string>
     <string name="objectives_autosens_gate">Jeden týden úspěšného používání s běžným příjmem sacharidů</string>
-    <string name="objectives_ama_objective">Povolení doplňkový funkcí pro každodenní použití, jako např. pokročilý jídelní asistent (AMA)</string>
     <string name="objectives_smb_objective">Povolit další funkce pro běžné používání jako SMB</string>
     <string name="objectives_auto_objective">Povolení automatizace</string>
     <string name="objectives_smb_gate">Přečíst si dokumentaci a zvýšit maximální IOB, aby mohlo SMB fungovat. Pro začátek se dá použít velikost běžného bolusu + 3x maximální denní bazál</string>
diff --git a/app/src/main/res/values-cs-rCZ/strings.xml b/app/src/main/res/values-cs-rCZ/strings.xml
index da7cb83568..f4263041b4 100644
--- a/app/src/main/res/values-cs-rCZ/strings.xml
+++ b/app/src/main/res/values-cs-rCZ/strings.xml
@@ -81,8 +81,6 @@
     <string name="careportal">Péče</string>
     <string name="configbuilder_pump">Pumpa</string>
     <string name="configbuilder_pump_description">Jakou pumpu chcete používat s AndroidAPS?</string>
-    <string name="configbuilder_treatments">Ošetření</string>
-    <string name="configbuilder_treatments_description">Jaký plugin chcete používat pro ukládání informací?</string>
     <string name="configbuilder_profile">Profil</string>
     <string name="configbuilder_profile_description">Jaký profil má AndroidAPS používat?</string>
     <string name="configbuilder_aps">APS</string>
@@ -191,8 +189,6 @@
     <string name="smscommunicator_loophasbeendisabled">Smyčka byla zakázána</string>
     <string name="smscommunicator_loophasbeenenabled">Smyčka byla povolena</string>
     <string name="smscommunicator_loopisenabled">Smyčka je povolena</string>
-    <string name="valuelimitedto">%1$.2f omezeno na %2$.2f</string>
-    <string name="valueoutofrange">»%1$s« je mimo pevně nastavené limity</string>
     <string name="smscommunicator_pumpconnectwithcode">Chcete-li připojit pumpu, odpovězte pomocí SMS s kódem %1$s</string>
     <string name="smscommunicator_pumpconnectfail">Připojení k pumpě selhalo</string>
     <string name="smscommunicator_pumpdisconnectwithcode">Chcete-li odpojit pumpu na %1$d minut, odpovězte pomocí SMS s kódem %2$s</string>
@@ -498,6 +494,7 @@
     <string name="dexcomg5_xdripupload_title">Odesílat data do xDrip+</string>
     <string name="dexcomg5_xdripupload_summary">V xDrip+ vyberte zdroj dat 640g/Eversense</string>
     <string name="nsclientbg">Glykémie z NS</string>
+    <string name="nsclientbgshort">NSGL</string>
     <string name="overview_editquickwizard_usebg">Kalkulace glykémie</string>
     <string name="overview_editquickwizard_usebolusiob">Kalkulace bolusového IOB</string>
     <string name="overview_editquickwizard_usebasaliob">Kalkulace bazálního IOB</string>
@@ -834,36 +831,6 @@
     <string name="formatwithweight">Věk: %1$.0f Hmotnost: %2$.0f kg</string>
     <string name="basalpctfromtdd_label">% bazálu</string>
     <string name="dpvdefaultprofile">Výchozí profil DPV</string>
-    <string name="open_humans">Open Humans</string>
-    <string name="finishing_open_humans_setup">Dokončit nastavení Open Humans…</string>
-    <string name="this_may_take_a_while">Může to chvíli trvat. Nevypínejte telefon nebo tento plugin.</string>
-    <string name="setup_finished">Nastavení dokončeno</string>
-    <string name="your_phone_will_upload_data">Váš telefon brzy odešle data do Open Humans.</string>
-    <string name="your_phone_is_upload_data">Váš telefon nyní nahrává data do Open Humans.</string>
-    <string name="setup_failed">Nastavení selhalo</string>
-    <string name="there_was_an_error">Došlo k chybě. Chcete-li pokračovat, zkuste se přihlásit znovu. Lituji &amp; Děkuji!</string>
-    <string name="open_humans_terms">Jedná se o open source nástroj, který zkopíruje vaše data do Open Humans. Zachováváme práva ke sdílení vašich údajů s třetími stranami bez vašeho výslovného povolení. Data, která projekt a aplikace obdrží, jsou identifikována pomocí náhodného ID uživatele a budou bezpečně přenášena pouze na účet Otevřít Humans a jen s vaším svolením. Můžete kdykoli zastavit odesílání a smazat Vaše data prostřednictvím adresy www.openhumans.org.</string>
-    <string name="i_understand_and_agree">Rozumím a souhlasím.</string>
-    <string name="login">Přihlášení</string>
-    <string name="logout">Odhlášení</string>
-    <string name="oh_logout_confirmation">Opravdu se chcete odhlásit a zastavit darování dat vědě?</string>
-    <string name="project_member_id">ID člena projektu: %s</string>
-    <string name="queue_size">Velikost fronty: %d</string>
-    <string name="terms_of_use">Smluvní podmínky</string>
-    <string name="not_logged_in">Nejste přihlášen</string>
-    <string name="you_need_to_accept_the_of_use_first">Nejprve je třeba přijmout podmínky použití.</string>
-    <string name="successfully_logged_in">Přihlášení proběhlo úspěšně</string>
-    <string name="setup_will_continue_in_background">Nastavení bude nyní dokončeno na pozadí. Děkujeme za nahrání vašich dat.\n\nNechte prosím tento plugin a váš telefon na krátkou dobu zapnutý, aby bylo dokončeno nastavení.</string>
-    <string name="completing_login">Dokončení přihlášení…</string>
-    <string name="donate_your_data_to_science">Darujte svá data vědě</string>
-    <string name="open_humans_short">OH</string>
-    <string name="you_have_been_signed_out_of_open_humans">Byl jste odhlášen z Open Humans</string>
-    <string name="click_here_to_sign_in_again_if_this_wasnt_on_purpose">Chcete-li se znovu přihlásit, klepněte zde, pokud to nebylo schválně.</string>
-    <string name="only_upload_if_connected_to_wifi">Odeslat pouze při připojení k Wi-Fi</string>
-    <string name="only_upload_if_charging">Odeslat pouze při nabíjení</string>
-    <string name="worker_state">Stav procesu: %s</string>
-    <string name="uploaded_data">Odeslaná data</string>
-    <string name="the_following_data_will_be_uploaded_to_your_open_humans_account">Následující data budou nahrána do vašeho účtu Open Humans: hodnoty glykémie, bolusy, sacharidy, události péče (kromě poznámek), rozložené bolusy, přepnutí profilu, celkové denní dávky, dočasné bazály, nastavení, verze aplikace, model zařízení a rozměry obrazovky. Tajné nebo soukromé informace, jako je URL nebo API heslo vašeho Nightscoutu, nahrány nebudou.</string>
     <string name="setupwizard_pump_riley_link_status">Status RileyLink:</string>
     <string name="filter">Filtr</string>
     <string name="copytolocalprofile_invalid">Nelze vytvořit lokální profil. Profil je neplatný.</string>
@@ -890,26 +857,19 @@
     <string name="email_address">E-mailová adresa</string>
     <string name="privacy_settings">Nastavení soukromí</string>
     <string name="privacy_summary">Pokud chcete být upozorněni na selhání aplikace, můžete zadat volitelně e-mailovou adresu. Toto není automatizovaná služba. Vývojáři vás budou kontaktovat v nebezpečných situacích.</string>
-    <string name="profile_low_target">Dolní cíl profilu</string>
-    <string name="profile_high_target">Horní cíl profilu</string>
-    <string name="temp_target_low_target">Dolní hodnota dočasného cíle</string>
-    <string name="temp_target_high_target">Horní hodnota dočasného cíle</string>
-    <string name="temp_target_value">Hodnota dočasného cíle</string>
-    <string name="profile_dia">Hodnota DIA profilu</string>
-    <string name="profile_sensitivity_value">Hodnota citlivosti profilu</string>
-    <string name="profile_max_daily_basal_value">Maximální hodnota bazálu profilu</string>
-    <string name="current_basal_value">Aktuální hodnota bazálu</string>
-    <string name="profile_carbs_ratio_value">Inzulino-sacharidový poměr profilu</string>
     <string name="full_sync">Úplná synchronizace</string>
     <string name="prime">Doplňování</string>
     <string name="ns_sync_options">Synchronizace</string>
     <string name="ns_upload_summary">Profily, bolusy, sacharidy, dočasné bazály jsou nahrány do NS</string>
     <string name="ns_upload">Nahrávat data do NS</string>
     <string name="ns_receive_profile_store">Přijímat úložiště profilu</string>
+    <string name="ns_receive_profile_store_summary">Synchronizovat profily z NS do místního profilu</string>
     <string name="ns_receive_temp_target">Přijímat dočasné cíle</string>
     <string name="ns_receive_temp_target_summary">Přijmout dočasné cíle zadané prostřednictvím NS nebo NSClienta</string>
     <string name="ns_receive_profile_switch">Přijímat přepnutí profilu</string>
     <string name="ns_receive_profile_switch_summary">Přijmout přepnutí profilu zadané prostřednictvím NS nebo NSClienta</string>
+    <string name="ns_receive_offline_event">Přijímat události APS offline</string>
+    <string name="ns_receive_offline_event_summary">Přijmout APS offline události zadané prostřednictvím NS nebo NSClienta</string>
     <string name="ns_receive_insulin">Přijímat inzulín</string>
     <string name="ns_receive_insulin_summary">Přijmout inzulín vložený přes NS nebo NSClient (není dodán, pouze započítán do IOB)</string>
     <string name="ns_receive_carbs">Přijímat sacharidy</string>
@@ -918,4 +878,7 @@
     <string name="ns_receive_therapy_events_summary">Přijmout léčebné události (výměna setu, inzulínu, baterie atd.) zadané prostřednictvím NS nebo NSClienta</string>
     <string name="ns_receive_cgm">Přijímat/doplňovat glykémie</string>
     <string name="ns_receive_cgm_summary">Přijmout CGM data z NS</string>
+    <string name="sms_timeout_while_wating">Vypršel časový limit při čekání na dokončení předchozí komunikace s pumpou</string>
+    <string name="smscommunicator_another_bolus_in_queue">Ve frontě je další bolus. Zkuste to znovu později.</string>
+    <string name="calculation_in_progress">Probíhá výpočet</string>
 </resources>
diff --git a/app/src/main/res/values-de-rDE/exam.xml b/app/src/main/res/values-de-rDE/exam.xml
index 9ae09f203d..c396ed6783 100644
--- a/app/src/main/res/values-de-rDE/exam.xml
+++ b/app/src/main/res/values-de-rDE/exam.xml
@@ -132,7 +132,7 @@
     <string name="wronginsulin_label">Fehler bei Insulinabgabe/Eintrag</string>
     <string name="wronginsulin_whattodo">Wie solltest Du vorgehen, wenn Du weniger Insulin im Körper hast als in der Pumpenhistorie vermerkt - z.B. durch eine Verstopfung, Kanülenfehler oder eine nach dem Duschen nicht wieder angekoppelte Pumpe?</string>
     <string name="wronginsulin_careportal">Lösche Insulindaten im Nightscout careportal, um sie aus der Pumpenhistorie zu entfernen.</string>
-    <string name="wronginsulin_compare">Vergleiche die Werte in AndroidAPS und der Pumpenhistorie.</string>
+    <string name="wronginsulin_compare">Vergleiche die Werte der Historie in AAPS und Deiner Pumpe (wenn die Pumpe diese Funktion bietet).</string>
     <string name="wronginsulin_prime">Gib einen Teil-Bolus des \'nicht erhaltenen\' Insulins mit Spritze / Pen oder durch Befüllen der Kanüle.</string>
     <string name="wronginsulin_donothing">Unternimm nichts und lass AndroidAPS die entstehenden hohen Glukosewerte korrigieren.</string>
     <string name="iob_label">Aktives Insulin (IOB)</string>
diff --git a/app/src/main/res/values-de-rDE/objectives.xml b/app/src/main/res/values-de-rDE/objectives.xml
index 447501dd5d..bbd1442137 100644
--- a/app/src/main/res/values-de-rDE/objectives.xml
+++ b/app/src/main/res/values-de-rDE/objectives.xml
@@ -17,7 +17,6 @@
     <string name="objectives_maxiob_gate">Bevor Du den Zielwert niedriger einstellst, musst Du einige Tage Erfahrung sammeln und mindestens eine Nacht ohne Hypoalarm schaffen</string>
     <string name="objectives_autosens_objective">Passe Basalraten und Faktoren bei Bedarf an und schalte anschließend Autosens ein.</string>
     <string name="objectives_autosens_gate">Loope eine Woche tagsüber mit regelmäßiger Kohlenhydrat-Eingabe</string>
-    <string name="objectives_ama_objective">Aktiviere zusätzliche Funktionen für die Nutzung tagsüber wie z. B. den erweiterten Mahlzeitenassistenten (AMA)</string>
     <string name="objectives_smb_objective">Aktiviere zusätzliche Funktionen für die Nutzung tagsüber wie z. B. SMB</string>
     <string name="objectives_auto_objective">Automatisierung aktivieren</string>
     <string name="objectives_smb_gate">Lies das Wiki und erhöhe maxIOB, damit der SMB gut funktioniert. Ein guter Anfang ist
diff --git a/app/src/main/res/values-de-rDE/strings.xml b/app/src/main/res/values-de-rDE/strings.xml
index 86ba955765..2375b013bd 100644
--- a/app/src/main/res/values-de-rDE/strings.xml
+++ b/app/src/main/res/values-de-rDE/strings.xml
@@ -81,8 +81,6 @@
     <string name="careportal">Careportal</string>
     <string name="configbuilder_pump">Pumpe</string>
     <string name="configbuilder_pump_description">Welche Pumpe möchtest Du mit AndroidAPS nutzen?</string>
-    <string name="configbuilder_treatments">Behandlungen</string>
-    <string name="configbuilder_treatments_description">Welches Plugin soll zum Verarbeiten von Behandlungen genutzt werden?</string>
     <string name="configbuilder_profile">Profil</string>
     <string name="configbuilder_profile_description">Welches Profil soll AndroidAPS nutzen?</string>
     <string name="configbuilder_aps">APS</string>
@@ -135,6 +133,7 @@
     <string name="configbuilder_nightscoutversion_label">Nightscout-Version:</string>
     <string name="missing_carbs">%1$d g fehlen</string>
     <string name="exported">Einstellungen exportiert</string>
+    <string name="ue_exported">Benutzereinträge exportiert</string>
     <string name="export_to">Einstellungen exportieren nach</string>
     <string name="import_from">Importiere Einstellungen von</string>
     <string name="setting_imported">Einstellungen importiert</string>
@@ -190,8 +189,6 @@
     <string name="smscommunicator_loophasbeendisabled">Loop wurde deaktiviert.</string>
     <string name="smscommunicator_loophasbeenenabled">Lopp wurde aktiviert.</string>
     <string name="smscommunicator_loopisenabled">Loop ist aktiviert.</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="smscommunicator_pumpconnectwithcode">Um die Pumpe zu verbinden, antworte mit dem Code %1$s</string>
     <string name="smscommunicator_pumpconnectfail">Verbindung zur Pumpe fehlgeschlagen</string>
     <string name="smscommunicator_pumpdisconnectwithcode">Um die Verbindung zur Pumpe für %1$d Minuten zu trennen, antworte mit dem Code %2$s</string>
@@ -497,6 +494,7 @@
     <string name="dexcomg5_xdripupload_title">Sende BZ-Werte zu xDrip+</string>
     <string name="dexcomg5_xdripupload_summary">Wähle in xDrip+ 640g/Eversense als Daten-Quelle.</string>
     <string name="nsclientbg">Nightscout-Client BZ</string>
+    <string name="nsclientbgshort">NS BZ</string>
     <string name="overview_editquickwizard_usebg">BZ Berechnung</string>
     <string name="overview_editquickwizard_usebolusiob">Bolus-IOB Berechnung</string>
     <string name="overview_editquickwizard_usebasaliob">Basal-IOB Berechnung</string>
@@ -834,36 +832,6 @@ Unerwartetes Verhalten.</string>
     <string name="formatwithweight">Alter: %1$.0f Gewicht: %2$.0f kg</string>
     <string name="basalpctfromtdd_label">% der Basalrate</string>
     <string name="dpvdefaultprofile">DPV-Standard-Profil</string>
-    <string name="open_humans">Open Humans</string>
-    <string name="finishing_open_humans_setup">Einrichtung von Open Humans abschließen…</string>
-    <string name="this_may_take_a_while">Das kann eine Weile dauern. Schalte Dein Telefon oder dieses Plugin nicht aus.</string>
-    <string name="setup_finished">Einrichtung abgeschlossen</string>
-    <string name="your_phone_will_upload_data">Dein Telefon wird in Kürze Daten zu Open Human hochladen.</string>
-    <string name="your_phone_is_upload_data">Dein Telefon lädt nun Daten zu Open Human hoch.</string>
-    <string name="setup_failed">Einrichtung fehlgeschlagen</string>
-    <string name="there_was_an_error">Es gab einen Fehler. Bitte logge Dich erneut ein, um fortzufahren. Entschuldigung &amp; Danke!</string>
-    <string name="open_humans_terms">Dies ist ein Open-Source-Tool, das Deine Daten zu Open Humans hochlädt. Wir behalten uns keine Rechte vor, Deine Daten ohne Deine ausdrückliche Genehmigung an Dritte weiterzugeben. Die Daten, die das Projekt und die Anwendung erhalten, werden über eine zufällige Benutzer-ID identifiziert und nur nach Deiner Zustimmung sicher auf ein Open Humans-Konto übertragen. Du kannst das Hochladen beenden und Deine hochgeladenen Daten jederzeit über www.openhumans.org löschen.</string>
-    <string name="i_understand_and_agree">Verstanden und akzeptiert. </string>
-    <string name="login">Login</string>
-    <string name="logout">Logout</string>
-    <string name="oh_logout_confirmation">Willst Du Dich wirklich abmelden und die Spende von Daten an die Wissenschaft beenden?</string>
-    <string name="project_member_id">Project Member ID: %s</string>
-    <string name="queue_size">Größe der Warteschlange: %d</string>
-    <string name="terms_of_use">Nutzungsbedingungen</string>
-    <string name="not_logged_in">Nicht angemeldet</string>
-    <string name="you_need_to_accept_the_of_use_first">Du musst zuerst die Nutzungsbedingungen akzeptieren.</string>
-    <string name="successfully_logged_in">Erfolgreich angemeldet</string>
-    <string name="setup_will_continue_in_background">Die Einrichtung wird jetzt im Hintergrund abgeschlossen. Vielen Dank für das Hochladen Deiner Daten.\n\nBitte halte dieses Plugin und Dein Handy für kurze Zeit eingeschaltet, damit das Setup abgeschlossen werden kann.</string>
-    <string name="completing_login">Login wird abgeschlossen…</string>
-    <string name="donate_your_data_to_science">Spende deine Daten an Wissenschaft</string>
-    <string name="open_humans_short">OH</string>
-    <string name="you_have_been_signed_out_of_open_humans">Du wurdest von Open Humans abgemeldet.</string>
-    <string name="click_here_to_sign_in_again_if_this_wasnt_on_purpose">Klicke hier, um Dich erneut anzumelden, falls dies versehentlich passiert ist.</string>
-    <string name="only_upload_if_connected_to_wifi">Nur über WLAN hochladen</string>
-    <string name="only_upload_if_charging">Nur beim Laden hochladen</string>
-    <string name="worker_state">Worker State: %s</string>
-    <string name="uploaded_data">Daten hochgeladen</string>
-    <string name="the_following_data_will_be_uploaded_to_your_open_humans_account">Die folgenden Daten werden auf Dein Open Humans-Konto hochgeladen: Glukosewerte, Boli, Kohlenhydrate, Careportal-Ereignisse (außer Notizen), erweiterte Boli, Profilwechsel, Gesamttagesdosen, temporäre Basalwerte, Temporäre Ziele, Einstellungen, Anwendungsversion, Gerätemodell und Bildschirmabmessungen. Vertrauliche oder private Informationen wie z.B. Deine Nightscout-URL oder Dein API-Secret werden nicht hochgeladen.</string>
     <string name="setupwizard_pump_riley_link_status">RileyLink Status:</string>
     <string name="filter">Filter</string>
     <string name="copytolocalprofile_invalid">Lokales Profil kann nicht erstellt werden. Profil ist ungültig.</string>
@@ -890,26 +858,19 @@ Unerwartetes Verhalten.</string>
     <string name="email_address">E‐Mail‐Adresse</string>
     <string name="privacy_settings">Privatsphäre-Einstellungen</string>
     <string name="privacy_summary">Du kannst optional eine E-Mail-Adresse angeben, wenn Du bei Absturzberichten kontaktiert werden möchtest. Dies ist keine Automatik, Du wirst von den Entwicklern in gefährlichen Situationen kontaktiert. </string>
-    <string name="profile_low_target">Profil unteres Ziel</string>
-    <string name="profile_high_target">Profil oberes Ziel</string>
-    <string name="temp_target_low_target">Temp. Ziel unterer Wert</string>
-    <string name="temp_target_high_target">Temp. Ziel oberer Wert</string>
-    <string name="temp_target_value">Temp. Ziel Wert</string>
-    <string name="profile_dia">Profil Insulinwirkdauer</string>
-    <string name="profile_sensitivity_value">Profil Sensitivitätswert</string>
-    <string name="profile_max_daily_basal_value">Profil max. Basalwert</string>
-    <string name="current_basal_value">Aktueller Basalwert</string>
-    <string name="profile_carbs_ratio_value">Profil KH-Faktor</string>
     <string name="full_sync">Vollständige Sync</string>
     <string name="prime">Füllen</string>
     <string name="ns_sync_options">Synchronisierung</string>
     <string name="ns_upload_summary">Profile, Boli, Kohlenhydrate und temporäre Basalraten werden zu NS hochgeladen</string>
     <string name="ns_upload">Daten zu NS hochladen</string>
     <string name="ns_receive_profile_store">Gespeicherte Profile abrufen</string>
+    <string name="ns_receive_profile_store_summary">Profile vom NS-Profil-Editors zu lokalen Profil synchronisieren</string>
     <string name="ns_receive_temp_target">Temporäre Ziele abrufen</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>
@@ -918,4 +879,7 @@ Unerwartetes Verhalten.</string>
     <string name="ns_receive_therapy_events_summary">Ereignisse (Kanülen-, Ampullen-, Batteriewechsel etc.) akzeptieren, die in NS oder NSClient eingegeben wurden</string>
     <string name="ns_receive_cgm">Historische CGM Daten ergänzen</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-el-rGR/objectives.xml b/app/src/main/res/values-el-rGR/objectives.xml
index b1a3bf4d96..07d3f76fdc 100644
--- a/app/src/main/res/values-el-rGR/objectives.xml
+++ b/app/src/main/res/values-el-rGR/objectives.xml
@@ -17,7 +17,6 @@
     <string name="objectives_maxiob_gate">Τρέξτε το για λίγες ημέρες, και τουλάχιστον μία νύχτα χωρίς χαμηλό συναγερμό BG, πριν χαμηλώσετε τα όρια</string>
     <string name="objectives_autosens_objective">Ρυθμίστε τον βασικό ρυθμό και τις αναλογίες αν χρειάζεται, και μετά ενεργοποιήστε το auto-sens</string>
     <string name="objectives_autosens_gate">1 επιτυχής εβδομάδα ημερήσιου κυκλώματος με κανονική εισαγωγή υδατανθράκων</string>
-    <string name="objectives_ama_objective">Ενεργοποιώντας επιπρόσθετα χαρακτηριστικά για χρήση κατά την ημέρα, όπως τον Προχωρημένο Βοηθό Γεύματος</string>
     <string name="objectives_smb_objective">Ενεργοποιώντας επιπρόσθετα χαρακτηριστικά για χρήση κατά την ημέρα, όπως το SMB</string>
     <string name="objectives_smb_gate">Πρέπει να διαβάσετε τον οδηγό wiki και να αυξήσετε το ανώτατο όριο του IOB για να μπορέσει να λειτουργήσει σωστά το SMB! Μια καλή αρχή είναι μέγιστο IOB= μέσο bolus γεύματος + 3 x το μέγιστο ημερήσιο βασικού ρυθμού</string>
     <string name="objectives_bgavailableinns">BG διαθέσιμες στο NS</string>
diff --git a/app/src/main/res/values-el-rGR/strings.xml b/app/src/main/res/values-el-rGR/strings.xml
index 6917843c6d..e19e0259ab 100644
--- a/app/src/main/res/values-el-rGR/strings.xml
+++ b/app/src/main/res/values-el-rGR/strings.xml
@@ -77,8 +77,6 @@
     <string name="careportal">Φροντίδα</string>
     <string name="configbuilder_pump">Αντλία</string>
     <string name="configbuilder_pump_description">Ποια αντλία θα θέλατε να χρησιμοποιήσετε με το AndroidAPS;</string>
-    <string name="configbuilder_treatments">Θεραπείες</string>
-    <string name="configbuilder_treatments_description">Ποια προσθήκη πρέπει να χρησιμοποιηθεί για το χειρισμό της θεραπείας;</string>
     <string name="configbuilder_profile">Προφίλ</string>
     <string name="configbuilder_profile_description">Ποιο προφίλ πρέπει να χρησιμοποιήσει το AndroidAPS;</string>
     <string name="configbuilder_aps">APS</string>
@@ -151,7 +149,6 @@
     <string name="smscommunicator_loophasbeendisabled">Το κύκλωμα απενεργοποιήθηκε</string>
     <string name="smscommunicator_loophasbeenenabled">Το κύκλωμα ενεργοποιήθηκε</string>
     <string name="smscommunicator_loopisenabled">Κύκλωμα ενεργοποιημένο</string>
-    <string name="valuelimitedto">Το %1$.2f περιορίζεται σε %2$.2f</string>
     <string name="smscommunicator_remotecommandnotallowed">Δεν επιτρέπεται απομακρυσμένη εντολή</string>
     <string name="smscommunicator_remotebolusnotallowed">Απομακρυσμένο bolus μη διαθέσιμο. Δοκιμάστε ξανά αργότερα.</string>
     <string name="smscommunicator_profilereplywithcode">Για αλλαγή προφίλ σε %1$s %2$d%% στείλτε κωδικό %3$s</string>
diff --git a/app/src/main/res/values-es-rES/exam.xml b/app/src/main/res/values-es-rES/exam.xml
index 62580663f0..be9e506253 100644
--- a/app/src/main/res/values-es-rES/exam.xml
+++ b/app/src/main/res/values-es-rES/exam.xml
@@ -132,7 +132,6 @@
     <string name="wronginsulin_label">Errores de entrega/entrada de insulina</string>
     <string name="wronginsulin_whattodo">¿Qué debes hacer si recibiste menos insulina de la que sugiere la historia de la bomba p.ej. debido a una oclusión, una cánula fallida o olvidarse de reponer la bomba después de una ducha?</string>
     <string name="wronginsulin_careportal">Elimina los datos de insulina del portal de Nightscout Careportal para eliminarlos del historial de la bomba.</string>
-    <string name="wronginsulin_compare">Comparar valores en AndroidAPS e historial de la bomba.</string>
     <string name="wronginsulin_prime">Bolo una proporción de la insulina calculada “perdida” por jeringa/pluma o usando menú de llenado.</string>
     <string name="wronginsulin_donothing">No haga nada y permite que AndroidAPS corrija cualquier nivel alto de glucosa en la sangre resultante.</string>
     <string name="iob_label">Insulina a bordo (IOB)</string>
diff --git a/app/src/main/res/values-es-rES/objectives.xml b/app/src/main/res/values-es-rES/objectives.xml
index e2c5d553ee..59f41a60b5 100644
--- a/app/src/main/res/values-es-rES/objectives.xml
+++ b/app/src/main/res/values-es-rES/objectives.xml
@@ -17,7 +17,6 @@
     <string name="objectives_maxiob_gate">Usar unos cuantos días, y al menos una noche sin alarmas de glucosa baja, antes de bajar valor de glucosa</string>
     <string name="objectives_autosens_objective">Ajustar las basales y ratios, si es necesario, y luego activar auto-sens</string>
     <string name="objectives_autosens_gate">Una semana con éxito en lazo cerrado durante el día con entrada regular de carbohidratos</string>
-    <string name="objectives_ama_objective">Habilitar funciones adicionales para su uso durante el día, como el asistente de comida avanzado</string>
     <string name="objectives_smb_objective">Habilitar funciones adicionales para uso durante el día como SMB</string>
     <string name="objectives_auto_objective">Activar automatización</string>
     <string name="objectives_smb_gate">¡Debes leer el wiki y subir maxIOB para que SMB funcione bien! Para comenzar un buen valor sería maxIOB = bolo de comida medio + 3 x máximo basal diario</string>
diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml
index 068c0dd9a3..54d825a9cb 100644
--- a/app/src/main/res/values-es-rES/strings.xml
+++ b/app/src/main/res/values-es-rES/strings.xml
@@ -81,8 +81,6 @@
     <string name="careportal">Portal de Tratamientos</string>
     <string name="configbuilder_pump">Bomba</string>
     <string name="configbuilder_pump_description">¿Qué bomba quieres utilizar con AndroidAPS?</string>
-    <string name="configbuilder_treatments">Tratamientos</string>
-    <string name="configbuilder_treatments_description">¿Que complemento quieres usar para el manejo del tratamiento?</string>
     <string name="configbuilder_profile">Perfil</string>
     <string name="configbuilder_profile_description">¿Qué perfil debe usar AndroidAPS?</string>
     <string name="configbuilder_aps">APS</string>
@@ -190,7 +188,6 @@
     <string name="smscommunicator_loophasbeendisabled">Lazo se ha desactivado</string>
     <string name="smscommunicator_loophasbeenenabled">Lazo se ha activado</string>
     <string name="smscommunicator_loopisenabled">Lazo activo</string>
-    <string name="valuelimitedto">%1$.2f limitado a %2$.2f</string>
     <string name="smscommunicator_pumpconnectwithcode">Para conectar la infusora responder con el código %1$s</string>
     <string name="smscommunicator_pumpconnectfail">Error al conectar a la bomba</string>
     <string name="smscommunicator_pumpdisconnectwithcode">Para desconectar la bomba durante %1$dminutos responde con el código %2$s</string>
@@ -828,36 +825,6 @@
     <string name="formatwithweight">Edad: %1$.0f Peso: %2$.0f kg</string>
     <string name="basalpctfromtdd_label">% de basal</string>
     <string name="dpvdefaultprofile">Perfil DPV por defecto</string>
-    <string name="open_humans">Open Humans</string>
-    <string name="finishing_open_humans_setup">Finalizando la configuración de Open Humans…</string>
-    <string name="this_may_take_a_while">Esto puede tardar un tiempo. No apague su teléfono o este plugin.</string>
-    <string name="setup_finished">Configuración finalizada</string>
-    <string name="your_phone_will_upload_data">Tu teléfono subirá los datos a Open Humans pronto.</string>
-    <string name="your_phone_is_upload_data">Su teléfono está subiendo datos a Open Humans ahora.</string>
-    <string name="setup_failed">Fallo en la configuración</string>
-    <string name="there_was_an_error">Se ha producido un error. Vuelva a iniciar sesión para poder continuar. Lo siento &amp; ¡Gracias!</string>
-    <string name="open_humans_terms">Esta es una herramienta de código abierto que copiará sus datos a Open Humans. No conservamos ningún derecho a compartir sus datos con terceros sin su autorización explícita. Los datos que el proyecto y la aplicación reciben se identifican mediante un ID de usuario aleatorio y sólo se transmitirán de forma segura a una cuenta de Open Humans con la autorización de dicho proceso. Puedes dejar de subir y borrar tus datos en cualquier momento a través de www.openhumans.org.</string>
-    <string name="i_understand_and_agree">Entiendo y acepto.</string>
-    <string name="login">Login</string>
-    <string name="logout">Cerrar sesión</string>
-    <string name="oh_logout_confirmation">¿Realmente quieres cerrar sesión y dejar de donar datos a la ciencia?</string>
-    <string name="project_member_id">ID de miembro del proyecto: %s</string>
-    <string name="queue_size">Tamaño de Cola: %d</string>
-    <string name="terms_of_use">Condiciones de Uso</string>
-    <string name="not_logged_in">No has accedido</string>
-    <string name="you_need_to_accept_the_of_use_first">Primero debe aceptar los términos de uso.</string>
-    <string name="successfully_logged_in">Sesión iniciada correctamente</string>
-    <string name="setup_will_continue_in_background">La configuración ahora se completará en segundo plano. Gracias por cargar sus datos.\n\nPor favor, mantenga este plugin y su teléfono encendido por un un momento mientras se completa la configuración.</string>
-    <string name="completing_login">Completando inicio de sesión…</string>
-    <string name="donate_your_data_to_science">Dona tus datos a la ciencia</string>
-    <string name="open_humans_short">OH</string>
-    <string name="you_have_been_signed_out_of_open_humans">Has cerrado la sesión de Open Humans</string>
-    <string name="click_here_to_sign_in_again_if_this_wasnt_on_purpose">Haga clic aquí para iniciar sesión de nuevo si no tenía esa intención.</string>
-    <string name="only_upload_if_connected_to_wifi">Subir datos solo si está conectado a WiFi</string>
-    <string name="only_upload_if_charging">Sólo subir datos si se está cargando</string>
-    <string name="worker_state">Worker State: %s</string>
-    <string name="uploaded_data">Datos subidos</string>
-    <string name="the_following_data_will_be_uploaded_to_your_open_humans_account">Los siguientes datos se cargarán en su cuenta de Open Humans: valores de glucosa, bolos, carbohidratos, eventos de la bomba (excepto notas), bolos extendidos, cambios de perfil, dosis diarias totales, valores basales temporales, objetivos de temperatura, preferencias, versión de la aplicación, modelo del dispositivo y dimensiones de la pantalla. No se cargará información secreta o privada, como su URL de Nightscout o el API secreto.</string>
     <string name="setupwizard_pump_riley_link_status">Estado de RileyLink:</string>
     <string name="filter">Filtro</string>
     <string name="copytolocalprofile_invalid">No se puede crear el perfil local. El perfil no es válido.</string>
diff --git a/app/src/main/res/values-fr-rFR/exam.xml b/app/src/main/res/values-fr-rFR/exam.xml
index 896f6d8ffc..c34666ac39 100644
--- a/app/src/main/res/values-fr-rFR/exam.xml
+++ b/app/src/main/res/values-fr-rFR/exam.xml
@@ -132,13 +132,13 @@
     <string name="wronginsulin_label">Erreurs de saisie/injection d\'insuline</string>
     <string name="wronginsulin_whattodo">Que devriez-vous faire si vous avez reçu moins d\'insuline que l\'historique de la pompe suggère par ex. à cause d\'une occlusion, d\'une mauvaise canule ou d\'un oubli de rebranchement de la pompe après une douche ?</string>
     <string name="wronginsulin_careportal">Supprimez les données d\'insuline de Nightscout Careportal pour le retirer de l\'historique de la pompe.</string>
-    <string name="wronginsulin_compare">Comparez les valeurs dans l\'historique de la pompe et AndroidAPS.</string>
+    <string name="wronginsulin_compare">Comparer les valeurs dans l\'historique d\'AndroidAPS et de la pompe (si la pompe le permet).</string>
     <string name="wronginsulin_prime">Faites un bolus du montant de votre insuline calculée « manquante » soit par seringue / stylo ou en utilisant un amorçage.</string>
     <string name="wronginsulin_donothing">Ne faites rien et laissez AndroidAPS corriger tout taux élevé de glycémie qui en résulte.</string>
     <string name="iob_label">Insuline Active (IA)</string>
     <string name="iob_which">Sélectionnez toutes les bonnes réponses.</string>
     <string name="iob_value">La valeur de l\'IA est impactée par les débits de basal temporaires émis.</string>
-    <string name="iob_hightemp">Une basal temp. haute ne sera pas donnée quand votre glycémie est en dessous de la cible.</string>
+    <string name="iob_hightemp">Une basale temp haute ne sera pas donnée quand votre glycémie est en dessous de la cible.</string>
     <string name="iob_negiob">Une IA négative pendant une période significative en l\'absence d\'exercice indique que votre profil est trop fort et qu\'il faut moins d\'insuline dans vos paramètres.</string>
     <string name="iob_posiob">Une IA positive pendant une période significative indique une résistance à l\'insuline ou des repas non signalés.</string>
     <string name="breadgrams_label">Entrée de glucides et bolus</string>
diff --git a/app/src/main/res/values-fr-rFR/objectives.xml b/app/src/main/res/values-fr-rFR/objectives.xml
index b58e7e6ef7..996e380bcc 100644
--- a/app/src/main/res/values-fr-rFR/objectives.xml
+++ b/app/src/main/res/values-fr-rFR/objectives.xml
@@ -17,7 +17,6 @@
     <string name="objectives_maxiob_gate">Utilisez pendant plusieurs jours, et au moins une nuit sans alarme d’hypoglycémie, avant d\'abaisser les cibles glycémiques</string>
     <string name="objectives_autosens_objective">Ajustement des débits Basal et des ratios si nécessaire, puis activation de la fonction auto-sens</string>
     <string name="objectives_autosens_gate">1 semaine de Boucle Fermée en journée en saisissant régulièrement les glucides</string>
-    <string name="objectives_ama_objective">Activation de fonctionnalités supplémentaires en journée, comme l\'Aide au Repas Améliorée ARA (AMA)</string>
     <string name="objectives_smb_objective">Activation de fonctionnalités supplémentaires pour l\'utilisation en journée, telles que la fonction SMB</string>
     <string name="objectives_auto_objective">Activation de l\'automatisation</string>
     <string name="objectives_smb_gate">Lisez le wiki et augmentez le maxIA pour que les SMBs fonctionnent correctement ! Un bon début est maxIA = moyenne des Bolus Repas + 3 x maximum débit Basal quotidien</string>
diff --git a/app/src/main/res/values-fr-rFR/strings.xml b/app/src/main/res/values-fr-rFR/strings.xml
index bc7b5122f0..e9e2d67f84 100644
--- a/app/src/main/res/values-fr-rFR/strings.xml
+++ b/app/src/main/res/values-fr-rFR/strings.xml
@@ -81,8 +81,6 @@
     <string name="careportal">Careportal</string>
     <string name="configbuilder_pump">Pompe</string>
     <string name="configbuilder_pump_description">Quelle pompe souhaitez-vous utiliser avec AndroidAPS ?</string>
-    <string name="configbuilder_treatments">Traitements</string>
-    <string name="configbuilder_treatments_description">Quel plugin doit être utilisé pour la gestion des traitements ?</string>
     <string name="configbuilder_profile">Profil</string>
     <string name="configbuilder_profile_description">Quel profil doit utiliser AndroidAPS ?</string>
     <string name="configbuilder_aps">APS</string>
@@ -96,7 +94,7 @@
     <string name="loop_aps_label">APS</string>
     <string name="loop_constraintsprocessed_label">Après traitement des restrictions</string>
     <string name="loop_tbrsetbypump_label">Basal temporaire défini par la pompe</string>
-    <string name="noapsselected">Pas d\'APS séléctionné ou pas de résultat fourni</string>
+    <string name="noapsselected">Pas d\'APS sélectionné ou pas de résultat fourni</string>
     <string name="safety">Sécurité</string>
     <string name="openapsma_disabled">Plugin désactivé</string>
     <string name="constraints_violation">Violation des restrictions</string>
@@ -192,8 +190,6 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="smscommunicator_loophasbeendisabled">La Boucle a été désactivée</string>
     <string name="smscommunicator_loophasbeenenabled">La Boucle a été activée</string>
     <string name="smscommunicator_loopisenabled">La Boucle est activée</string>
-    <string name="valuelimitedto">%1$.2f limité à %2$.2f</string>
-    <string name="valueoutofrange">\"%1$s\" est en dehors des limites</string>
     <string name="smscommunicator_pumpconnectwithcode">Pour connecter la pompe, renvoyez le code %1$s</string>
     <string name="smscommunicator_pumpconnectfail">Echec de la connexion pompe</string>
     <string name="smscommunicator_pumpdisconnectwithcode">Pour déconnecter la pompe pendant %1$d min, renvoyez le code %2$s</string>
@@ -210,7 +206,7 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="smscommunicator_loopresumereplywithcode">Pour reprendre la boucle, renvoyez le code %1$s</string>
     <string name="smscommunicator_loopenablereplywithcode">Pour activer la boucle, renvoyez le code %1$s</string>
     <string name="smscommunicator_loopdisablereplywithcode">Pour désactiver la boucle, renvoyez le code %1$s</string>
-    <string name="smscommunicator_tempbasalset">Démarrage réussi pour %1$.2fU/h de basal temporaire pour %2$d min</string>
+    <string name="smscommunicator_tempbasalset">Démarrage réussi pour %1$.2fU/h de basal temp pour %2$d min</string>
     <string name="smscommunicator_extendedset">Le Bolus étendu %1$.2fU pendant %2$d min a commencé avec succès</string>
     <string name="smscommunicator_carbsset">%1$d  g de glucides entrés avec succès</string>
     <string name="smscommunicator_carbsfailed">L\'entrée de %1$dg de glucides a échoué</string>
@@ -523,7 +519,7 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="enablesmbwithcob_summary">Activer SMB tant que des Glucides sont actifs.</string>
     <string name="enablesmbwithtemptarget">Activer SMB avec les cibles temporaires</string>
     <string name="enablesmbwithtemptarget_summary">Activer SMB lorsqu\'il y a une cible temporaire active (repas imminent, exercise)</string>
-    <string name="enablesmbwithhightemptarget">Activer SMB avec cibles temp. hautes</string>
+    <string name="enablesmbwithhightemptarget">Activer SMB avec cibles temp hautes</string>
     <string name="enablesmbwithhightemptarget_summary">Activer les SMB quand il y a une cible temp haute active (exercise, au dessus de 100 mg/dl ou 5.5 mmol/l)</string>
     <string name="overview_insulin_label">Insuline</string>
     <string name="overview_buttons_selection">Boutons</string>
@@ -732,7 +728,7 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="slowabsorptiondetected"><![CDATA[<font color=\'%1$s\'>!!!!! Absorption lente des glucides détectée : %2$d%% du temps. Vérifiez de nouveau votre calcul. Les GA (Glucides Actifs) peuvent être surestimés et alors plus d\'insuline pourrait être délivré !!!!!</font>]]></string>
     <string name="partialboluswizard">Injecter cette partie de Bolus calculée par l’assistant [%]</string>
     <string name="deliverpartofboluswizard">L\'assistant Bolus effectue le calcul mais seulement cette partie de l\'insuline calculée est délivrée. Utile avec l\'algorithme SMB.</string>
-    <string name="snooze">Report alarme</string>
+    <string name="snooze">Masquer</string>
     <string name="increasingmaxbasal">Augmentation de la valeur du débit Basal max parce que ce paramètre est inférieur au débit Basal max de votre profil</string>
     <string name="smscommunicator_messagebody">Message invalide</string>
     <string name="format_bg_isf">%1$s SI: %2$.1f</string>
@@ -779,6 +775,7 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="randombg_short">Gly</string>
     <string name="tools">Outils</string>
     <string name="show_calculation">Afficher le calcul</string>
+    <string name="show_removed">Afficher les éléments supprimés</string>
     <string name="clearqueueconfirm">Effacer la queue ? Toutes les données en attente seront perdues !</string>
     <string name="ebstopsloop">L\'utilisation du bolus étendu arrètera la boucle fermée pour la durée d\'exécution du bolus étendu. Voulez-vous vraiment le faire ?</string>
     <string name="closed_loop_disabled_with_eb">Boucle fermée désactivée à cause du bolus étendu</string>
@@ -834,36 +831,6 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="formatwithweight">Âge: %1$.0f Poids: %2$.0f kg</string>
     <string name="basalpctfromtdd_label">% de basal</string>
     <string name="dpvdefaultprofile">Profil par défaut DPV</string>
-    <string name="open_humans">Open Humans</string>
-    <string name="finishing_open_humans_setup">Fin de la configuration d\'Open Humans…</string>
-    <string name="this_may_take_a_while">Cela peut prendre un certain temps. N\'éteignez pas votre téléphone ni ce plugin.</string>
-    <string name="setup_finished">Configuration terminée</string>
-    <string name="your_phone_will_upload_data">Votre téléphone va bientôt télécharger les données vers Open Humans.</string>
-    <string name="your_phone_is_upload_data">Votre téléphone télécharge les données vers Open Humans.</string>
-    <string name="setup_failed">Échec de la configuration</string>
-    <string name="there_was_an_error">Une erreur s\'est produite. Essayez de vous reconnecter pour continuer. Désolé &amp; merci !</string>
-    <string name="open_humans_terms">Il s\'agit d\'un outil open source qui va copier vos données vers Open Humans. Nous ne conservons aucun droit de partage et vos données ne seront pas partagées avec des tiers sans votre autorisation explicite. Les données que le projet et l\'application reçoivent sont identifiées par un Identifiant utilisateur aléatoire et ne seront transmises à un compte Open Humans qu\'avec votre autorisation et en toute sécurité. Vous pouvez arrêter de télécharger et supprimer vos données de téléchargées à tout moment via www.openhumans.org.</string>
-    <string name="i_understand_and_agree">Je comprends et je suis d\'accord.</string>
-    <string name="login">Connexion</string>
-    <string name="logout">Déconnexion</string>
-    <string name="oh_logout_confirmation">Voulez-vous vraiment vous déconnecter et arrêter de donner vos données à la science?</string>
-    <string name="project_member_id">ID utilisateur : %s</string>
-    <string name="queue_size">Taille de la queue : %d</string>
-    <string name="terms_of_use">Conditions d’Utilisation</string>
-    <string name="not_logged_in">Non connecté</string>
-    <string name="you_need_to_accept_the_of_use_first">Vous devez d\'abord accepter les conditions d’utilisation.</string>
-    <string name="successfully_logged_in">Connexion réussie</string>
-    <string name="setup_will_continue_in_background">La configuration sera terminée en arrière-plan. Merci de télécharger vos données.\n\nVeuillez conserver ce plug-in et votre téléphone allumés pendant un petit moment pour que la configuration se termine.</string>
-    <string name="completing_login">Fin de la connexion…</string>
-    <string name="donate_your_data_to_science">Donner vos données à la science</string>
-    <string name="open_humans_short">OH</string>
-    <string name="you_have_been_signed_out_of_open_humans">Vous avez été déconnecté d\'Open Humans</string>
-    <string name="click_here_to_sign_in_again_if_this_wasnt_on_purpose">Cliquez ici pour vous connecter à nouveau si ce n\'était pas volontaire.</string>
-    <string name="only_upload_if_connected_to_wifi">Ne télécharger que si connecté au WiFi</string>
-    <string name="only_upload_if_charging">Ne télécharger que si en charge</string>
-    <string name="worker_state">État du travail : %s</string>
-    <string name="uploaded_data">Données transférées</string>
-    <string name="the_following_data_will_be_uploaded_to_your_open_humans_account">Les données suivantes seront téléchargées sur votre compte Open Humans : glycémie, bolus, glucides, événements Careportal (sauf les notes), bolus étendus, changements de profil, doses quotidiennes totales, basales temporaires, cibles temporaires, préférences, version de l\'application, modèle de l\'appareil et dimensions de l\'écran. Les informations secrètes ou privées telles que votre URL Nightscout ou votre API secret ne seront pas téléchargés.</string>
     <string name="setupwizard_pump_riley_link_status">État du RileyLink :</string>
     <string name="filter">Filtrer</string>
     <string name="copytolocalprofile_invalid">Impossible de créer le profil local. Le profil est invalide.</string>
@@ -890,14 +857,28 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="email_address">Adresse e-mail</string>
     <string name="privacy_settings">Paramètres de confidentialité</string>
     <string name="privacy_summary">Vous pouvez fournir une adresse e-mail facultative si vous voulez être informé des plantages de l\'application. Ce n\'est pas un service automatisé. Vous serez contacté par les développeurs dans des situations dangereuses.</string>
-    <string name="profile_low_target">Cible basse du profil</string>
-    <string name="profile_high_target">Cible haute du profil</string>
-    <string name="temp_target_low_target">Valeur basse de cible temporaire</string>
-    <string name="temp_target_high_target">Valeur haute de cible temporaire</string>
-    <string name="temp_target_value">Valeur de cible temporaire</string>
-    <string name="profile_dia">Valeur DAI du profil</string>
-    <string name="profile_sensitivity_value">Valeur de sensibilité du profil</string>
-    <string name="profile_max_daily_basal_value">Basale maximale du profil</string>
-    <string name="current_basal_value">Basale actuelle</string>
-    <string name="profile_carbs_ratio_value">Rapport glucides/insuline de profil</string>
+    <string name="full_sync">Synchro. complète</string>
+    <string name="prime">Amorcer</string>
+    <string name="ns_sync_options">Synchronisation</string>
+    <string name="ns_upload_summary">Profils, boluses, glucides, basals temporaires sont téléchargés vers NS</string>
+    <string name="ns_upload">Télécharger des données vers NS</string>
+    <string name="ns_receive_profile_store">Recevoir les profils sauvegardés</string>
+    <string name="ns_receive_profile_store_summary">Synchroniser les profils à partir de l\'éditeur de profil NS vers le profil local</string>
+    <string name="ns_receive_temp_target">Recevoir les cibles temporaires</string>
+    <string name="ns_receive_temp_target_summary">Accepter les cibles temporaires entrées via NS ou NSClient</string>
+    <string name="ns_receive_profile_switch">Recevoir les changements de profil</string>
+    <string name="ns_receive_profile_switch_summary">Accepter les changements de profil entrés via NS ou NSClient</string>
+    <string name="ns_receive_offline_event">Recevoir les événements APS hors ligne</string>
+    <string name="ns_receive_offline_event_summary">Accepter les événements APS hors ligne entrés via NS ou NSClient</string>
+    <string name="ns_receive_insulin">Recevoir l\'insuline</string>
+    <string name="ns_receive_insulin_summary">Acceptez l\'insuline entrée via NS ou NSClient (elle n\'est pas injectée, uniquement pour le calcul pour IA)</string>
+    <string name="ns_receive_carbs">Recevoir les glucides</string>
+    <string name="ns_receive_carbs_summary">Accepter les glucides entrés par NS ou NSClient</string>
+    <string name="ns_receive_therapy_events">Recevoir des événements thérapeutiques</string>
+    <string name="ns_receive_therapy_events_summary">Accepter les événements de thérapie (canule, insuline, changement de batterie, etc.) entrés via NS ou NSClient</string>
+    <string name="ns_receive_cgm">Recevoir/remplir les anciennes données MGC</string>
+    <string name="ns_receive_cgm_summary">Accepter les données MGC de NS</string>
+    <string name="sms_timeout_while_wating">Délai d\'attente pour finir la communication précédente avec la pompe</string>
+    <string name="smscommunicator_another_bolus_in_queue">Un autre bolus est en file d\'attente. Réessayez plus tard.</string>
+    <string name="calculation_in_progress">Calcul en cours</string>
 </resources>
diff --git a/app/src/main/res/values-ga-rIE/strings.xml b/app/src/main/res/values-ga-rIE/strings.xml
index 755334e67f..ed0ea2a53c 100644
--- a/app/src/main/res/values-ga-rIE/strings.xml
+++ b/app/src/main/res/values-ga-rIE/strings.xml
@@ -35,7 +35,6 @@
     <string name="sms_delta">Deilte:</string>
     <string name="treatments">Cóireálacha</string>
     <string name="configbuilder_pump">Caidéil</string>
-    <string name="configbuilder_treatments">Cóireálacha</string>
     <string name="configbuilder_profile">Próifíl</string>
     <string name="configbuilder_aps">APS</string>
     <string name="configbuilder_general">Ginearálta</string>
diff --git a/app/src/main/res/values-it-rIT/exam.xml b/app/src/main/res/values-it-rIT/exam.xml
index aeda204839..aeec52c1e6 100644
--- a/app/src/main/res/values-it-rIT/exam.xml
+++ b/app/src/main/res/values-it-rIT/exam.xml
@@ -132,7 +132,7 @@
     <string name="wronginsulin_label">Errori erogazione/inserimento insulina</string>
     <string name="wronginsulin_whattodo">Cosa dovresti fare se hai ricevuto meno insulina di quanto lo storico del micro suggerisce? Ad esempio a causa di un\'occlusione, una cannula difettosa o l\'aver dimenticato di riattaccare il micro dopo una doccia? </string>
     <string name="wronginsulin_careportal">Eliminare dal portale Nightscout i dati relativi all\'insulina per rimuoverli dallo storico del micro.</string>
-    <string name="wronginsulin_compare">Confrontare i valori in AndroidAPS con lo storico del micro.</string>
+    <string name="wronginsulin_compare">Compara i valori in AndroidAPS con lo storico micro (se supportato).</string>
     <string name="wronginsulin_prime">Erogare un bolo con parte della tua insulina calcolata \"mancante\" usando una siringa/penna o la funzione caricamento.</string>
     <string name="wronginsulin_donothing">Non fare nulla e permettere ad AndroidAPS di correggere eventuali glicemie alte.</string>
     <string name="iob_label">Insulina attiva (IOB)</string>
diff --git a/app/src/main/res/values-it-rIT/objectives.xml b/app/src/main/res/values-it-rIT/objectives.xml
index 8882c00407..15e34cd03c 100644
--- a/app/src/main/res/values-it-rIT/objectives.xml
+++ b/app/src/main/res/values-it-rIT/objectives.xml
@@ -17,7 +17,6 @@
     <string name="objectives_maxiob_gate">Esegui l\'applicazione per alcuni giorni e almeno una notte senza allarmi di glicemia bassa, prima di abbassare il target glicemico</string>
     <string name="objectives_autosens_objective">Adatta basali e rapporti se necessario, quindi attiva auto-sens</string>
     <string name="objectives_autosens_gate">1 settimana di looping diurno con inserimento regolare dei carboidrati, eseguito con successo</string>
-    <string name="objectives_ama_objective">Abilitazione funzioni aggiuntive per l\'uso diurno, ad esempio AMA (advanced meal assist - assistenza avanzata del pasto)</string>
     <string name="objectives_smb_objective">Abilitazione funzioni aggiuntive per l\'uso diurno, come SMB</string>
     <string name="objectives_auto_objective">Abilitazione automazione</string>
     <string name="objectives_smb_gate">È necessario leggere il wiki e aumentare maxIOB affinché le azioni di SMB funzionino adeguatamente! Un buon inizio è maxIOB = media bolo posto + 3 x max basale giornaliera</string>
diff --git a/app/src/main/res/values-it-rIT/strings.xml b/app/src/main/res/values-it-rIT/strings.xml
index 9745384a08..5bf1259491 100644
--- a/app/src/main/res/values-it-rIT/strings.xml
+++ b/app/src/main/res/values-it-rIT/strings.xml
@@ -81,8 +81,6 @@
     <string name="careportal">Portale</string>
     <string name="configbuilder_pump">Micro</string>
     <string name="configbuilder_pump_description">Quale microinfusore desideri usare con AndroidAPS?</string>
-    <string name="configbuilder_treatments">Trattamenti</string>
-    <string name="configbuilder_treatments_description">Quale plugin dovrebbe essere usato per la gestione del trattamento?</string>
     <string name="configbuilder_profile">Profilo</string>
     <string name="configbuilder_profile_description">Quale profilo AndroidAPS dovrebbe usare?</string>
     <string name="configbuilder_aps">APS</string>
@@ -191,8 +189,6 @@
     <string name="smscommunicator_loophasbeendisabled">Il loop è stato disabilitato</string>
     <string name="smscommunicator_loophasbeenenabled">Il loop è stato abilitato</string>
     <string name="smscommunicator_loopisenabled">Il loop è abilitato</string>
-    <string name="valuelimitedto">%1$.2f limitato a %2$.2f</string>
-    <string name="valueoutofrange">»%1$s« è fuori dai limiti consentiti</string>
     <string name="smscommunicator_pumpconnectwithcode">Per connettere il micro rispondi col codice %1$s</string>
     <string name="smscommunicator_pumpconnectfail">Connessione al micro fallita</string>
     <string name="smscommunicator_pumpdisconnectwithcode">Per disconnettere il micro per %1$d minuti rispondi col codice %2$s</string>
@@ -778,6 +774,7 @@
     <string name="randombg_short">BG</string>
     <string name="tools">Strumenti</string>
     <string name="show_calculation">Mostra calcolo</string>
+    <string name="show_removed">Mostra rimossi</string>
     <string name="clearqueueconfirm">Cancellare la coda? Tutti i dati in coda andranno persi!</string>
     <string name="ebstopsloop">L\'uso della funzione bolo esteso interromperà la modalità loop chiuso per il tempo di esecuzione del bolo esteso. Lo vuoi davvero?</string>
     <string name="closed_loop_disabled_with_eb">Loop chiuso disabilitato a causa dell\'esecuzione di un bolo esteso</string>
@@ -833,36 +830,6 @@
     <string name="formatwithweight">Età: %1$.0f Peso: %2$.0f kg</string>
     <string name="basalpctfromtdd_label">% di basale</string>
     <string name="dpvdefaultprofile">Profilo DPV predefinito</string>
-    <string name="open_humans">Open Humans</string>
-    <string name="finishing_open_humans_setup">Completamento configurazione Open Humans…</string>
-    <string name="this_may_take_a_while">Potrebbe volerci un po\' di tempo. Non spegnere il tuo telefono e non disattivare questo plugin.</string>
-    <string name="setup_finished">Configurazione completata</string>
-    <string name="your_phone_will_upload_data">Il tuo telefono caricherà a breve i dati su Open Humans.</string>
-    <string name="your_phone_is_upload_data">Il tuo telefono sta caricando ora i dati su Open Humans.</string>
-    <string name="setup_failed">Configurazione fallita</string>
-    <string name="there_was_an_error">Si è verificato un errore. Prova ad accedere di nuovo per procedere.</string>
-    <string name="open_humans_terms">Questo è uno strumento open source che copierà i tuoi dati su Open Humans. Non ci riserviamo alcun diritto di condividere i tuoi dati con terze parti senza la tua esplicita autorizzazione. I dati che il progetto e l\'app ricevono vengono identificati tramite un ID utente casuale e verranno trasmessi in modo sicuro a un account Open Humans solo con la tua autorizzazione per tale processo. Puoi interrompere il caricamento ed eliminare i dati di caricamento in qualsiasi momento tramite www.openhumans.org.</string>
-    <string name="i_understand_and_agree">Comprendo e accetto.</string>
-    <string name="login">Login</string>
-    <string name="logout">Logout</string>
-    <string name="oh_logout_confirmation">Vuoi davvero fare il logout e smettere di donare dati alla scienza?</string>
-    <string name="project_member_id">Project Member ID: %s</string>
-    <string name="queue_size">Dimensione coda: %d</string>
-    <string name="terms_of_use">Termini d\'uso</string>
-    <string name="not_logged_in">Accesso non effettuato</string>
-    <string name="you_need_to_accept_the_of_use_first">Devi prima accettare i termini d\'uso.</string>
-    <string name="successfully_logged_in">Accesso riuscito</string>
-    <string name="setup_will_continue_in_background">La configurazione verrà ora completata in background. Grazie per il caricamento dei tuoi dati.\n\nPer completare la configurazione, mantieni questo plugin attivo e il telefono acceso per un po\' di tempo.</string>
-    <string name="completing_login">Completamento accesso…</string>
-    <string name="donate_your_data_to_science">Dona i tuoi dati alla scienza</string>
-    <string name="open_humans_short">OH</string>
-    <string name="you_have_been_signed_out_of_open_humans">Sei stato disconnesso da Open Humans</string>
-    <string name="click_here_to_sign_in_again_if_this_wasnt_on_purpose">Fare click qui per accedere di nuovo.</string>
-    <string name="only_upload_if_connected_to_wifi">Upload solo se connesso a WiFi</string>
-    <string name="only_upload_if_charging">Upload solo se in carica</string>
-    <string name="worker_state">Worker State: %s</string>
-    <string name="uploaded_data">Dati caricati</string>
-    <string name="the_following_data_will_be_uploaded_to_your_open_humans_account">I seguenti dati verranno caricati sul tuo account Open Humans: valori glicemia, boli, carboidrati, eventi portale (eccetto note), boli estesi, cambi profilo, dosi giornaliere totali (TDD), basali temporanee, target temporanei, preferenze, versione dell\'applicazione, modello del dispositivo e dimensioni dello schermo. Informazioni segrete o private come l\'URL di Nightscout o l\'API secret non verranno caricate.</string>
     <string name="setupwizard_pump_riley_link_status">Stato RileyLink:</string>
     <string name="filter">Filtro</string>
     <string name="copytolocalprofile_invalid">Impossibile creare il profilo locale. Il profilo non è valido.</string>
@@ -889,14 +856,28 @@
     <string name="email_address">Indirizzo email</string>
     <string name="privacy_settings">Impostazioni privacy</string>
     <string name="privacy_summary">Puoi fornire un indirizzo e-mail opzionale se desideri essere avvisato in caso di arresti anomali dell\'app. Questo non è un servizio automatizzato. Sarai contattato dagli sviluppatori in situazioni pericolose.</string>
-    <string name="profile_low_target">Target basso (profilo)</string>
-    <string name="profile_high_target">Target alto (profilo)</string>
-    <string name="temp_target_low_target">Valore inferiore target temporaneo</string>
-    <string name="temp_target_high_target">Valore superiore target temporaneo</string>
-    <string name="temp_target_value">Valore target temporaneo</string>
-    <string name="profile_dia">Valore DIA (profilo)</string>
-    <string name="profile_sensitivity_value">Valore sensibilità (profilo)</string>
-    <string name="profile_max_daily_basal_value">Valore max basale (profilo)</string>
-    <string name="current_basal_value">Valore basale corrente</string>
-    <string name="profile_carbs_ratio_value">Valore rapporto CHO (profilo)</string>
+    <string name="full_sync">Sincronizzazione completa</string>
+    <string name="prime">Caricamento</string>
+    <string name="ns_sync_options">Sincronizzazione</string>
+    <string name="ns_upload_summary">Profili, boli, CHO, basali temporanee vengono caricati su NS</string>
+    <string name="ns_upload">Carica dati su NS</string>
+    <string name="ns_receive_profile_store">Ricevi \"store\" profilo</string>
+    <string name="ns_receive_profile_store_summary">Sincronizza i profili da NS al profilo locale</string>
+    <string name="ns_receive_temp_target">Ricevi target temporanei</string>
+    <string name="ns_receive_temp_target_summary">Accetta target temporanei inseriti tramite NS o NSClient</string>
+    <string name="ns_receive_profile_switch">Ricevi cambi profilo</string>
+    <string name="ns_receive_profile_switch_summary">Accetta cambi profilo inseriti tramite NS o NSClient</string>
+    <string name="ns_receive_offline_event">Ricevi eventi APS offline</string>
+    <string name="ns_receive_offline_event_summary">Accetta eventi APS offline inseriti tramite NS o NSClient</string>
+    <string name="ns_receive_insulin">Ricevi insulina</string>
+    <string name="ns_receive_insulin_summary">Accetta insulina inserita tramite NS o NSClient (non viene erogata, solo calcolata per IOB)</string>
+    <string name="ns_receive_carbs">Ricevi CHO</string>
+    <string name="ns_receive_carbs_summary">Accetta CHO inseriti tramite NS o NSClient</string>
+    <string name="ns_receive_therapy_events">Ricevi eventi terapia</string>
+    <string name="ns_receive_therapy_events_summary">Accetta eventi terapia (cambio cannula, insulina, batteria, ecc.) inseriti tramite NS o NSClient</string>
+    <string name="ns_receive_cgm">Ricevi/riempi dati CGM</string>
+    <string name="ns_receive_cgm_summary">Accetta dati CGM da NS</string>
+    <string name="sms_timeout_while_wating">Timeout nell\'attesa della fine della precedente comunicazione col micro.</string>
+    <string name="smscommunicator_another_bolus_in_queue">C\'è un altro bolo in coda. Riprova più tardi.</string>
+    <string name="calculation_in_progress">Calcolo in corso</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 43a810e887..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>
@@ -132,7 +132,7 @@
     <string name="wronginsulin_label">שגיאות ברישום\\הזרקת אינסולין</string>
     <string name="wronginsulin_whattodo">מה עליכם לעשות אם מקבלים פחות אינסולין מאשר המוצע ע\"י היסטוריית המשאבה, למשל עקב חסימה, צינורית כושלת או אי חיבור מחדש של המשאבה אחרי מקלחת? </string>
     <string name="wronginsulin_careportal">מחקו את נתוני האינסולין מפורטל הטיפולים של נייטסקאוט כדי לסלק אותם מהיסטוריית המשאבה.</string>
-    <string name="wronginsulin_compare">השוו את הערכים שב-AndroidAPS לאלה שבהיסטוריית משאבה.</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>
@@ -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/objectives.xml b/app/src/main/res/values-iw-rIL/objectives.xml
index 7ebba972a8..c6047474da 100644
--- a/app/src/main/res/values-iw-rIL/objectives.xml
+++ b/app/src/main/res/values-iw-rIL/objectives.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="objectives_button_start">התחל</string>
-    <string name="objectives_button_verify">אמת</string>
+    <string name="objectives_button_verify">סיום</string>
     <string name="nth_objective">%1$d. משימה</string>
     <string name="objectivenotstarted">מטרה %1$d לא החלה</string>
     <string name="objectivenotfinished">משימה %1$d לא בוצעה במלואה</string>
@@ -17,7 +17,6 @@
     <string name="objectives_maxiob_gate">לפני הורדת ערך רמת הסוכר, הפעילו במשך מס\' ימים, עם לפחות לילה אחד ללא התרעת רמת סוכר נמוכה</string>
     <string name="objectives_autosens_objective">במידת הצורך, בצעו התאמת בזאלי ויחסים, ולאחר מכן הפעילו את Autosens</string>
     <string name="objectives_autosens_gate">שבוע של הפעלה מוצלחת של הלולאה במשך שעות היום, עם רישום ערכי פחמימות בקביעות</string>
-    <string name="objectives_ama_objective">הפעלת פונקציות נוספות לשימוש במשך היום, לדוגמה AMA (סיוע ארוחות מתקדם)</string>
     <string name="objectives_smb_objective">הפעלת פונקציות נוספות לשימוש במשך היום, כגון סופר מיקרו בולוסים (SMB)</string>
     <string name="objectives_auto_objective">הפעלת אוטומציה</string>
     <string name="objectives_smb_gate">חובה לקרוא את הויקי ולהעלות את ערך ה-maxIOB כדי להפעיל את ה- SMB כראוי. התחלה טובה תהיה maxIOB=בולוס ממוצע + 3 פעמים ערך הבזאלי היומי המקסימלי</string>
diff --git a/app/src/main/res/values-iw-rIL/strings.xml b/app/src/main/res/values-iw-rIL/strings.xml
index 70398f14c6..5b7d0981f8 100644
--- a/app/src/main/res/values-iw-rIL/strings.xml
+++ b/app/src/main/res/values-iw-rIL/strings.xml
@@ -81,8 +81,6 @@
     <string name="careportal">פורטל טיפולים</string>
     <string name="configbuilder_pump">משאבה</string>
     <string name="configbuilder_pump_description">עם איזו משאבה אתם מעוניינים להשתמש ב-AndroidAPS?</string>
-    <string name="configbuilder_treatments">טיפולים</string>
-    <string name="configbuilder_treatments_description">איזה תוסף ישמש לתפעול הטיפולים?</string>
     <string name="configbuilder_profile">פרופיל</string>
     <string name="configbuilder_profile_description">באיזה פרופיל על AndroidAPS להשתמש?</string>
     <string name="configbuilder_aps">APS</string>
@@ -115,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>
@@ -191,8 +189,6 @@
     <string name="smscommunicator_loophasbeendisabled">הלולאה הושבתה</string>
     <string name="smscommunicator_loophasbeenenabled">הלולאה הופעלה</string>
     <string name="smscommunicator_loopisenabled">לולאה פעילה</string>
-    <string name="valuelimitedto">%1$.2f מוגבלת ל- %2$.2f</string>
-    <string name="valueoutofrange">»הערך %1$s« מחוץ לתחום הקשיח</string>
     <string name="smscommunicator_pumpconnectwithcode">לחיבור המשאבה יש להשיב עם הקוד %1$s</string>
     <string name="smscommunicator_pumpconnectfail">החיבור אל המשאבה נכשל</string>
     <string name="smscommunicator_pumpdisconnectwithcode">לניתוק המשאבה למשך %1$d דקות השיבו עם הקוד %2$s</string>
@@ -245,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>
@@ -291,7 +287,7 @@
     <string name="openapsama_autosens_adjusttargets">וויסות ערכי מטרה ע\"י Autosens</string>
     <string name="openapsama_autosens_adjusttargets_summary">ערך ברירת מחדל: התאמה מדויקת\n נועד לאפשר ל-Autosens לשנות את המטרה של ערכי הסוכר, בנוסף ליחס התיקון והבזאלים.</string>
     <string name="openapsama_bolussnooze_dia_divisor_summary">ערך ברירת מחדל: 2\n מעכב בולוס מופעל אחרי שאתם מזריקים בולוס ארוחה, כך שהלולאה לא תפצה ע\"י בזאלי זמני נמוך אחרי הארוחה. הדוגמה כאן וברירת המחדל היא 2; כך שהגדרה של משך פעילות אינסולין של 3 שעות משמעה שהעיכוב יחלוף בהדרגה בתוך 1.5 שעות (3 ש\' לחלק ל-2).</string>
-    <string name="openapsama_min_5m_carbimpact_summary">ערך ברירת מחדל: 3.0 (AMA) או 8.0 (SMB). זוהי הגדרת ברירת מחדל לספיגת פחמימות ב-5 דקות. ברירת המחדל היא 3mg/dL/5min. פעולה זו משפיעה על קצב הדעיכה של פחמ\' פעילות, ועל הנחת קצב ספיגת הפחמ\' בחישוב רמות סוכר עתידיות כשהן בירידה מהירה מהצפוי או עליה איטית מהצפוי.</string>
+    <string name="openapsama_min_5m_carbimpact_summary">ערך ברירת מחדל: 3.0 (AMA) או 8.0 (SMB). זוהי הגדרת ברירת מחדל להשפעת פחמימות על הסוכר בדם ב-5 דקות. ברירת המחדל היא 3mg/dL/5min. פעולה זו משפיעה על קצב הדעיכה של פחמ\' פעילות, ועל הנחת קצב ספיגת הפחמ\' בחישוב רמות סוכר עתידיות כשהן בירידה מהירה מהצפוי או עליה איטית מהצפוי.</string>
     <string name="openapsama_link_to_preferncejson_doc_txt">שימו לב!\nבדרך כלל אינכם צריכים לשנות את הערכים שלהלן. נא ללחוץ כאן, לקרוא את הטקסט ולוודא שאתם מבינים אותו לפני שתשנו ערכים אלה.</string>
     <string name="smscommunicator_invalidphonennumber">מספר טלפון ל-SMS אינו תקין</string>
     <string name="overview_calibration">כיול</string>
@@ -333,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>
@@ -361,7 +357,7 @@
     <string name="smscommunicator_wrongduration">משך שגוי</string>
     <string name="smscommunicator_loopsuspended">לולאה מושהית</string>
     <string name="smscommunicator_loopresumed">לולאה חודשה</string>
-    <string name="treatments_wizard_bgtrend_label">מגמה 15 דקות</string>
+    <string name="treatments_wizard_bgtrend_label">מגמת 15 דקות</string>
     <string name="treatments_wizard_cob_label">פחמ\' פעילות</string>
     <string name="superbolus">סופר בולוס</string>
     <string name="ns_logappstartedevent">רשום הפעלת AAPS ב-Nightscout</string>
@@ -498,6 +494,7 @@
     <string name="dexcomg5_xdripupload_title">שליחת נתוני סוכר אל xDrip</string>
     <string name="dexcomg5_xdripupload_summary">ב-xDrip בחרו 640g/Eversense כמקור נתונים</string>
     <string name="nsclientbg">רמת סוכר מ-NSClient</string>
+    <string name="nsclientbgshort">סוכר NS</string>
     <string name="overview_editquickwizard_usebg">חישוב רמת הסוכר</string>
     <string name="overview_editquickwizard_usebolusiob">חישוב IOB של בולוס</string>
     <string name="overview_editquickwizard_usebasaliob">חישוב IOB של בזאלי</string>
@@ -755,7 +752,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>
@@ -778,6 +775,7 @@
     <string name="randombg_short">ערכי גלוקוז בדם</string>
     <string name="tools">כלים</string>
     <string name="show_calculation">הצג חישוב</string>
+    <string name="show_removed">הצג מחוקים</string>
     <string name="clearqueueconfirm">לנקות את התור? כל הנתונים בתור יאבדו!</string>
     <string name="ebstopsloop">שימוש בבולוס ממושך יפסיק את מצב הלולאה הסגורה לזמן פעילות הבולוס. אתם בטוחים שאתם רוצים להמשיך?</string>
     <string name="closed_loop_disabled_with_eb">הלולאה הסגורה מופסקת עקב מתן בולוס ממושך</string>
@@ -833,36 +831,6 @@
     <string name="formatwithweight">גיל: %1$.0f יח\' משקל: %2$.0f ק\"ג</string>
     <string name="basalpctfromtdd_label">% של הבזאלי</string>
     <string name="dpvdefaultprofile">פרופיל ברירת מחדל</string>
-    <string name="open_humans">Open Humans</string>
-    <string name="finishing_open_humans_setup">מסיים התקנת Open Humans…</string>
-    <string name="this_may_take_a_while">זה עלול לקחת זמן מה. נא לא לכבות את את המכשיר או את התוסף.</string>
-    <string name="setup_finished">ההתקנה הושלמה</string>
-    <string name="your_phone_will_upload_data">מכשירכם ישלח את מידע ל-Open Humans בהקדם.</string>
-    <string name="your_phone_is_upload_data">מכשירכם שולח כעת את המידע ל-Open Humans.</string>
-    <string name="setup_failed">ההתקנה נכשלה</string>
-    <string name="there_was_an_error">חלה שגיאה. בבקשה נסו להתחבר שוב כדי להמשיך. סליחה ותודה!</string>
-    <string name="open_humans_terms">זהו כלי קוד פתוח שיעתיק את הנתונים שלכם ל-Open Humans. אין לנו זכויות לחלוק את הנתונים שלך עם צדדים שלישיים ללא אישורכם המפורש. הנתונים שהפרויקט והיישום מקבלים מזוהים באמצעות מספר זיהוי משתמש אקראי ויעברו באופן מאובטח לחשבון Open Humans באישורכם. תוכלו להפסיק לשלוח ולמחוק את נתוניכם בכל עת דרך www.openhumans.org.</string>
-    <string name="i_understand_and_agree">אני מבינ\\ה ומסכימ\\ה.</string>
-    <string name="login">התחברות</string>
-    <string name="logout">התנתקות</string>
-    <string name="oh_logout_confirmation">אתם בטוחים שברצונכם להתנתק ולהפסיק לתרום מידע למדע?</string>
-    <string name="project_member_id">זיהוי משתתף פרויקט: %s</string>
-    <string name="queue_size">גודל התור: %d</string>
-    <string name="terms_of_use">תנאי השימוש</string>
-    <string name="not_logged_in">לא מחובר\\ת</string>
-    <string name="you_need_to_accept_the_of_use_first">עליכם להסכים לתנאי השימוש.</string>
-    <string name="successfully_logged_in">ההתחברות הצליחה</string>
-    <string name="setup_will_continue_in_background">ההתקנה תושלם כעת ברקע. תודה על שליחת הנתונים שלכם.\n\nאנא השאירו את תוסף זה ואת מכשיר הטלפון שלכם מופעל לזמן קצר כדי להשלים את ההתקנה.</string>
-    <string name="completing_login">משלים התחברות…</string>
-    <string name="donate_your_data_to_science">תרמו את נתוניכם למדע</string>
-    <string name="open_humans_short">OH</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="only_upload_if_connected_to_wifi">אפשר העלאה רק אם מחובר ל-WiFi</string>
-    <string name="only_upload_if_charging">אפשר העלאה רק בזמן טעינת הסוללה</string>
-    <string name="worker_state">מצב עובד: %s</string>
-    <string name="uploaded_data">נתונים שהועלו</string>
-    <string name="the_following_data_will_be_uploaded_to_your_open_humans_account">הנתונים הבאים יועלו לחשבון Open Humans שלכם: ערכי גלוקוז, בולוסים, פחמימות, אירועים מפורטל הטיפולים (מלבד הערות), בולוסים ממושכים, החלפות פרופיל, מינונים יומיים כוללים, באזאלים זמניים, ערכי מטרה זמניים, העדפות, גרסת יישום, דגם המכשיר ומממדי המסך. מידע סודי או פרטי כגון כתובת ה-Nightscout האישית או סוד ה-API שלכם לא יועלו.</string>
     <string name="setupwizard_pump_riley_link_status">מצב ריילילינק:</string>
     <string name="filter">סינון</string>
     <string name="copytolocalprofile_invalid">לא ניתן ליצור פרופיל מקומי. הפרופיל אינו חוקי.</string>
@@ -889,14 +857,28 @@
     <string name="email_address">כתובת דוא\"ל</string>
     <string name="privacy_settings">הגדרות פרטיות</string>
     <string name="privacy_summary">אם תרצו, תוכלו לספק כתובת דוא\"ל כדי לקבל דיווח על קריסות יישום. שירות זה אינו אוטומטי. המפתחים יצרו איתכם קשר במצבים מסוכנים.</string>
-    <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">ערך מינון בזאלי מרבי של הפרופיל</string>
-    <string name="current_basal_value">מינון בזאלי נוכחי</string>
-    <string name="profile_carbs_ratio_value">יחס הפחמימות של הפרופיל</string>
+    <string name="full_sync">סינכרון מלא</string>
+    <string name="prime">תיחול</string>
+    <string name="ns_sync_options">סינכרון</string>
+    <string name="ns_upload_summary">פרופילים, בולוסים, פחמימות ומינונים בזאליים זמניים נטענים לנייטסקאוט</string>
+    <string name="ns_upload">טעינת נתוני סוכר לנייטסקאוט</string>
+    <string name="ns_receive_profile_store">אחזר פרופילים שמורים</string>
+    <string name="ns_receive_profile_store_summary">סינכרון פרופילים מעורך הפרופיל של נייטסקאוט לפרופיל מקומי</string>
+    <string name="ns_receive_temp_target">קבלת ערכי מטרה זמניים</string>
+    <string name="ns_receive_temp_target_summary">קבלת ערכי מטרה זמניים שהוגדרו בנייטסקאוט או ב-NSClient</string>
+    <string name="ns_receive_profile_switch">קבלת החלפות פרופיל</string>
+    <string name="ns_receive_profile_switch_summary">קבלת החלפות פרופיל שהוגדרו בנייטסקאוט או ב-NSClient</string>
+    <string name="ns_receive_offline_event">אחזר אירועים לא מקוונים</string>
+    <string name="ns_receive_offline_event_summary">קבל אירועים לא מקוונים שנרשמו דרך נייטסקאוט או NSClient</string>
+    <string name="ns_receive_insulin">קבלת אינסולין</string>
+    <string name="ns_receive_insulin_summary">קבלת אינסולין שהוזן באמצעות נייטסקאוט או NSClient (הוא לא מוזרק, רק מחושב רק כאינסולין פעיל)</string>
+    <string name="ns_receive_carbs">קבלת פחמימות</string>
+    <string name="ns_receive_carbs_summary">קבלת פחמימות שנרשמו בנייטסקאוט או ב-NSClient</string>
+    <string name="ns_receive_therapy_events">קבלת אירועי טיפול</string>
+    <string name="ns_receive_therapy_events_summary">קבלת אירועי טיפול (צינורית, אינסולין, החלפת סוללה) שצוינו באמצעות נייטסקאוט או NSClient</string>
+    <string name="ns_receive_cgm">קבלת\\טעינת נתוני סנסור</string>
+    <string name="ns_receive_cgm_summary">קבלת נתוני סנסור מנייטסקאוט</string>
+    <string name="sms_timeout_while_wating">בהמתנה עד לסיום תקשורת קודמת עם המשאבה</string>
+    <string name="smscommunicator_another_bolus_in_queue">ישנו בולוס נוסף בתור. נסו שוב מאוחר יותר.</string>
+    <string name="calculation_in_progress">מבצע חישוב</string>
 </resources>
diff --git a/app/src/main/res/values-ko-rKR/exam.xml b/app/src/main/res/values-ko-rKR/exam.xml
index a6f6b29bfe..bbd1b8fbb6 100644
--- a/app/src/main/res/values-ko-rKR/exam.xml
+++ b/app/src/main/res/values-ko-rKR/exam.xml
@@ -1,54 +1,215 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="dia_whatmeansdia">DIA에 대하여 올바른 것은?</string>
+    <string name="dia_label_exam">활성 인슐린 지속 시간 (DIA)</string>
+    <string name="dia_profile">프로파일에 DIA 값을 입력해야 합니다.</string>
+    <string name="dia_minimumis5h">허용되는 최소값은 5시간입니다.</string>
     <string name="dia_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/ko/Configuration/Config-Builder.html?#insulin</string>
+    <string name="dia_meaningisequaltodiapump">AndroidAPS를 사용하기 전에 펌프에서 사용했던 DIA 값이 잘 작동하여 만족했다면, looping을 시작하기 전에 이 값을 변경할 필요는 없습니다.</string>
+    <string name="dia_valuemustbedetermined">적절한 DIA 값을 스스로 찾아야 합니다.</string>
+    <string name="hypott_label">저혈당 임시 목표</string>
+    <string name="hypott_whenhypott">저혈당 임시 목표를 설정하는 가장 중요한 이유는 무엇인가요?</string>
+    <string name="hypott_wrongbasal">잘못된 basal 양 설정으로 인한 저혈당을 수정하기 위함.</string>
+    <string name="hypott_preventoversmb">저혈당에 대한 처치로 빠르게 작용하는 탄수화물을 섭취하여 혈당 상승이 있을 때 AndoridAPS가 이를 과수정하는 것을 방지하기 위함.</string>
+    <string name="hypott_exercise">운동으로 인한 저혈당을 교정하기 위함.</string>
+    <string name="hypott_0basal">0% 임시 basal이 이미 적용되고 있는 상황에서 혈당이 낮아지는 것을 방지하기 위함.</string>
     <string name="hypott_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/ko/Usage/temptarget.html</string>
     <string name="offlineprofile_whatprofile">어떤 프로파일이 오프라인에서 설정할 수 있습니까?</string>
     <string name="offlineprofile_label">주제: 오프라인 프로파일</string>
     <string name="offlineprofile_nsprofile">NS 프로파일이 사용될 수 있지만, 오프라인 상에서 설정할 수는 없습니다.</string>
     <string name="offlineprofile_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/ko/Configuration/Config-Builder.html#profile</string>
+    <string name="pumpdisconnect_label">AndroidAPS에서 \"펌프 연결 해제\"를 적용하는 이유들</string>
     <string name="pumpdisconnect_whattodo">펌프 일시중지할땐 무엇을 해야합니까?</string>
+    <string name="pumpdisconnect_unnecessary">펌프가 물리적으로 연결되어 있지 않을 때에는 인슐린이 주입되지 않으므로 이 기능이 필요하지 않습니다.</string>
+    <string name="pumpdisconnect_missinginsulin">이 기능은 펌프가 물리적으로 떨어져 있는 동안에 주입되지 않은 인슐린을 AndroidAPS가 계산하지 않도록 합니다.</string>
+    <string name="pumpdisconnect_notstop">펌프가 연결된 채로 있다면 이 기능은 인슐린 주입을 멈추지 않습니다.</string>
+    <string name="pumpdisconnect_openloop">이 기능은 AndroidAPS를 open loop 모드로 전환합니다.</string>
     <string name="pumpdisconnect_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/ko/Getting-Started/FAQ.html#other-settings</string>
+    <string name="objectives_label">AndroidAPS 설정들</string>
+    <string name="objectives2_label">AndroidAPS 설정들</string>
+    <string name="objectives_howtosave">설정을 백업하는 가장 좋은 방법은 무엇인가요?</string>
+    <string name="objectives_notesettings">적용된 설정을 따로 기록해둔다면 설정값을 \"내보내기\" 하지 않아도 됩니다.</string>
+    <string name="objectives_afterobjective">목표를 보두 수행한 뒤 설정값을 \"내보내기\" 합니다.</string>
+    <string name="objectives_afterchange">설정이 바뀐 부분이 있다면 설정값을 \"내보내기\" 합니다.</string>
+    <string name="objectives_afterinitialsetup">초기 구성을 마치고, 개별 설정을 입력한 뒤 설정값을 \"내보내기\" 합니다.</string>
+    <string name="objectives2_maintenance">관리 메뉴에서 설정값을 현재 기기로 \"내보내기\" 합니다.</string>
+    <string name="objectives2_internalstorage">핸드폰의 Internal Storage/AAPS/preferences 폴더에서 설정값을 찾을 수 있습니다.</string>
+    <string name="objectives2_cloud">안전한 외부 기기 (예를 들어, 클라우드 드라이브, 컴퓨터에 케이블 연결, email, 등)에 설정 파일을 복사합니다.</string>
+    <string name="objectives2_easyrestore">핸드폰을 잃어버렸거나 고장난 경우, 백업해놓지 않아도 설정값을 원격으로 쉽게 되살릴 수 있습니다.</string>
     <string name="objectives_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/ko/Usage/ExportImportSettings.html</string>
     <string name="objectives_hint2">https://androidaps.readthedocs.io/en/latest/CROWDIN/ko/Getting-Started/FAQ.html#what-emergency-equipment-is-recommended-to-take-with-me</string>
+    <string name="noisycgm_label">노이즈가 심한 CGM의 혈당값</string>
     <string name="noisycgm_whattodo">CGM 혈당의 노이즈가 심하다면 어떻게 해야합니까?</string>
+    <string name="noisycgm_nothing">특별한 조치를 하지 않습니다. - AndroidAPS가 이를 알아서 처리할 것입니다.</string>
+    <string name="noisycgm_pause">과량주입 또는 과소주입의 가능성을 막기 위해 closed loop 기능을 끕니다.</string>
+    <string name="noisycgm_replacesensor">지속적인 노이즈나 부정확한 센서를 교체합니다.</string>
+    <string name="noisycgm_checksmoothing">사용 중인 CGM 어플이 데이터 평활화 기능을 제공하는지 확인합니다.</string>
     <string name="noisycgm_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/ko/Usage/Smoothing-Blood-Glucose-Data-in-xDrip.html#smoothing-blood-glucose-data</string>
+    <string name="exerciseprofile_label">운동과 프로파일</string>
+    <string name="exerciseprofile_whattodo">유산소 운동을 할 때 프로파일을 어떻게 설정하는 것이 시스템에 가장 도움이 될까요?</string>
+    <string name="exerciseprofile_switchprofilebelow100">프로파일을 100% 보다 낮게 변경합니다.</string>
+    <string name="exerciseprofile_switchprofileabove100">프로파일을 100% 보다 높게 변경합니다.</string>
+    <string name="exerciseprofile_leaveat100">프로파일을 100%로 그대로 둡니다.</string>
+    <string name="exerciseprofile_suspendloop">Loop 기능을 중지합니다.</string>
+    <string name="exerciseprofile_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/ko/Usage/temptarget.html#activity-temp-target</string>
+    <string name="exercise_label">운동과 임시 목표</string>
+    <string name="exercise_whattodo">유산소 운동을 할 때 임시 목표를 어떻게 설정하는 것이 시스템에 가장 도움이 될까요?</string>
+    <string name="exercise_settt">운동을 시작하기 전 적절한 시간에 \"운동 시 임시 목표\"가 작동하도록 설정합니다.</string>
+    <string name="exercise_setfinished">운동이 끝난 후 \"운동 시 임시 목표\"를 설정합니다.</string>
+    <string name="exercise_setunchanged">임시 목표를 변경하지 않습니다.</string>
+    <string name="exercise_15g">\"저혈당 임시 목표\"보다 혈당이 떨어질 때까지 기다린 후 빠르게 반응하는 탄수화물 15g을 섭취합니다.</string>
     <string name="exercise_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/ko/Usage/temptarget.html#activity-temp-target</string>
+    <string name="suspendloop_label">중지 또는 일시중지된 loop</string>
     <string name="suspendloop_doigetinsulin">Loop가 중지/일시중지 되었을때 인슐린이 주입됩니까?</string>
     <string name="suspendloop_yes">네, Basal 인슐린은 계속 주입됩니다.</string>
     <string name="suspendloop_no">아니오, 인슐린 주입이 모두 중지됩니다.</string>
+    <string name="basaltest_label">Basal, ISF, and I:C 테스트</string>
+    <string name="basaltest_when">언제 이 값들을 확인해야할까요?</string>
+    <string name="basaltest_beforeloop">Looping을 시작하게 전</string>
+    <string name="basaltest_havingregularhighlow">자주 고혈당 또는 저혈당을 경험할 때</string>
+    <string name="basaltest_weekly">적어도 일주일에 한 번</string>
+    <string name="basaltest_fixed">한 번 설정하고 확인하면, 이 값은 계속 변하면 안됨.</string>
     <string name="basaltest_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/ko/Getting-Started/FAQ.html#androidaps-settings</string>
+    <string name="prerequisites_label">기본 준비사항</string>
+    <string name="prerequisites_what">AndroidAPS를 설정하고 사용하기 위해 필수적인 것은 무엇일까요?</string>
     <string name="prerequisites_determinedcorrectprofile">유효한 프로파일 정보 (Basal, IC, ISF, DIA).</string>
+    <string name="prerequisites_computer">Android Studio가 설치되고 환경설정된 컴퓨터</string>
     <string name="prerequisites_phone">지원되는 폰.</string>
+    <string name="prerequisites_pump">Closed loop을 사용할 계획이라면 호환되는 인슐린 펌프</string>
+    <string name="prerequisites_nightscout">모든 데이터의 log를 보관하고 설정을 검토하기 위한 Nightscout</string>
     <string name="prerequisites_tidepoolaccount">Tidepool 계정.</string>
     <string name="prerequisites_googleaccount">구글(Google) 계정.</string>
     <string name="prerequisites_githubaccount">깃허브(Github) 계정.</string>
+    <string name="prerequisites_beanandroiddeveloper">프로그래밍이나 코딩을 해 본 경험</string>
     <string name="prerequisites_own670g">미니메드(MiniMed) 670G 펌프.</string>
     <string name="prerequisites_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/ko/Module/module.html</string>
     <string name="prerequisites_smartwatch">스마트워치.</string>
     <string name="prerequisites_supportedcgm">지원되는 연속혈당측정기(CGM).</string>
+    <string name="prerequisites2_label">기본 준비사항</string>
+    <string name="prerequisites2_what">AndroidAPS를 설정하고 사용하기 위해 필수적인 것은 무엇일까요?</string>
+    <string name="prerequisites2_profile">프로파일을 설정하기 위해 확인된 정보 (ISF, I:C ratio, basal 양, DIA 등).</string>
+    <string name="prerequisites2_device">호환되는 Android 장치 (예를 들어, 핸드폰, Android 워치, 또는 태블릿).</string>
+    <string name="prerequisites2_internet">Closed loop을 실행하기 위해서는 AndroidAPS가 인터넷에 연결되어 있어야 함.</string>
+    <string name="prerequisites2_supportedcgm">지원되는 CGM과 핸드폰 또는 장치에 혈당값을 수신하기 위한 적절한 어플.</string>
+    <string name="prerequisites2_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/ko/Module/module.html</string>
+    <string name="update_label">AndroidAPS 업데이트하기</string>
+    <string name="whatistrue">올바른 답변을 모두 체크하세요.</string>
+    <string name="update_git">컴퓨터에 Git을 설치하고 환경 설정해야 합니다.</string>
+    <string name="update_asap">AndroidAPS의 업데이트된 버전이 배포되면, 일정 시간이 지난 후 이전 버전은 원격으로 제한됩니다.</string>
+    <string name="update_keys">Keystore의 위치를 저장하고 기록해두어야 이전에 설치할 때 사용했던 동일한 signing key를 업데이트할 때 사용할 수 있습니다.</string>
     <string name="update_neverupdate">시스템이 잘 작동한다면 절대 업데이트하지마세요.</string>
+    <string name="update_askfriend">만약 apk를 만드는 것이 어렵다면, 친구가 만든 apk를 사용하여 설치할 수 있습니다.</string>
     <string name="update_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/ko/Installing-AndroidAPS/Update-to-new-version.html#update-to-a-new-version-or-branch</string>
+    <string name="troubleshooting_label">문제 해결</string>
+    <string name="troubleshooting_wheretoask">어디에서 AndroidAPS에 대한 도움을 받을 수 있을까요?</string>
+    <string name="troubleshooting_fb">Facebook의 AndrioidAPS 사용자 그룹에 조언을 요청할 수 있습니다.</string>
+    <string name="troubleshooting_wiki">AndroidAPS 문서를 읽어야 (그리고 다시 읽어야) 합니다.</string>
+    <string name="troubleshooting_gitter">AndroidAPS Gitter room에 기술적 문제들을 기록하고, 조언을 요청할 수 있습니다.</string>
+    <string name="troubleshooting_yourendo">당뇨병 클리닉/내분비내과의사에게 문의해야 합니다.</string>
     <string name="troubleshooting_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/ko/Installing-AndroidAPS/Update-to-new-version.html#troubleshooting</string>
     <string name="troubleshooting_hint2">https://www.facebook.com/groups/AndroidAPSUsers/</string>
     <string name="troubleshooting_hint3">https://gitter.im/MilosKozak/AndroidAPS</string>
+    <string name="insulin_label">인슐린 플러그인</string>
+    <string name="insulin_ultrarapid">어떤 인슐린에서 초-초속효성의 Oref 플러그인을 사용해야 할까요?</string>
     <string name="insulin_fiasp">피아스프(Fiasp®)</string>
+    <string name="insulin_novorapid">노보래피드(NovoRapid®)/노보로그(Novolog®)</string>
     <string name="insulin_humalog">휴마로그(Humalog®)</string>
+    <string name="insulin_actrapid">액트라피드(Actrapid®)/휴말린 R(Humalin R®)/\"보통의\" 인간 인슐린.</string>
     <string name="insulin_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/ko/Configuration/Config-Builder.html#insulin</string>
+    <string name="sensitivity_label">민감도 플러그인</string>
+    <string name="sensitivity_which">올바른 답변을 모두 체크하세요.</string>
+    <string name="sensitivity_adjust">민감도 플러그인은 AndroidAPS가 일시적 또는 단기적으로 인슐린 민감도를 조절할 수 있도록 합니다. (예를 들어, 호르몬 변화 또는 주입 부위에서 흡수의 문제)</string>
+    <string name="sensitivity_edit">민감도 플러그인은 프로파일을 수정할 때 사용할 수 있도록 basal 양, I:C ratio, ISF의 추천되는 변화값을 사용자에게 제공합니다.</string>
+    <string name="sensitivity_cannula">캐뉼라 교체를 입력하면 Autosens 비율은 100%로 되돌아갑니다.</string>
+    <string name="sensitivity_time">일부 플러그인 옵션은 사용자가 설정 가능한 시간 범위를 갖습니다.</string>
     <string name="sensitivity_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/ko/Configuration/Sensitivity-detection-and-COB.html</string>
+    <string name="wrongcarbs_label">탄수화물 입력 오류</string>
     <string name="wrongcarbs_whattodo">부적절한 탄수화물을 입력하였다면 어떻게 하여야 합니까?</string>
+    <string name="wrongcarbs_treatmentstab">관리 메뉴에서 잘못된 입력을 삭제하고, 새로운 탄수화물 양으로 수정합니다.</string>
+    <string name="wrongcarbs_addinsulin">주입 세트 교체 메뉴의 prime 기능을 사용하여 bolus 인슐린을 주입합니다.</string>
+    <string name="wrongcarbs_donothing">특별한 조치를 하지 않습니다. - AndroidAPS가 적절한 조정을 할 것입니다.</string>
+    <string name="wrongcarbs_bolus">홈 화면에서 \"인슐린 (bolus)\" 버튼을 사용하여 bolus 인슐린을 주입합니다.</string>
+    <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>
+    <string name="iob_which">올바른 답변을 모두 체크하세요.</string>
+    <string name="iob_value">IOB 값은 실행된 임시 basal의 영향을 받습니다.</string>
+    <string name="iob_hightemp">혈당이 목표보다 낮을 경우 높은 임시 basal은 실행되지 않습니다.</string>
+    <string name="iob_negiob">운동 없이도 음수의 IOB (마이너스 IOB) 구간이 많을 경우, 프로파일이 너무 강한 것이며 인슐린 양을 적게 설정해야 합니다.</string>
+    <string name="iob_posiob">양수의 IOB (플러스 IOB) 구간이 많을 경우, 인슐린 저항성 또는 입력하지 않은 식사를 의미합니다.</string>
+    <string name="breadgrams_label">탄수화물 입력과 bolus</string>
+    <string name="breadgrams_grams">섭취한 탄수화물을 계산하고 기록할 때 gram 단위만을 사용해야 합니다.</string>
+    <string name="breadgrams_exchange">섭취한 탄수화물은 적절한 변환 방식 (예를 들어, DAFNE \"CHO\" 변환 또는 유럽의 \"Bread Units\")을 이용하여 기록할 수 있습니다.</string>
+    <string name="breadgrams_decay">AndroidAPS는 탄수화물의 \"소화\"를 예측하고 COB를 계산하기 위해 dynamic model을 사용합니다.</string>
+    <string name="breadgrams_calc">만약 혈당이 적절한 값을 벗어나면 (너무 낮거나 너무 높은 경우), 탄수화물 또는 교정 인슐린의 제안을 위해 bolus 계산기를 사용할 수 있습니다.</string>
+    <string name="breadgrams_hint1">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#insulin-to-carb-ratio-ic-g-u</string>
+    <string name="extendedcarbs_label">확장 탄수화물 (e-carbs)</string>
+    <string name="extendedcarbs_handling">c-carbs (확장 탄수화물)을 언제 사용할 수 있을까요?</string>
+    <string name="extendedcarbs_future">(일정 기간에 걸쳐 인슐린을 나눠서 주입하는 확장 bolus와 유사하게) 일정 기간에 걸쳐 나눠서 탄수화물을 섭취할 계획이 있을 때.</string>
+    <string name="extendedcarbs_free">AndroidAPS가 모르게 (인슐린 주입없이) 운동 시 섭취하는 \'free\' 탄수화물을 기록하기 위함.</string>
+    <string name="extendedcarbs_fat">(이후에 나눠서 섭취할) 확장 탄수화물 (e-carbs)은 AndroidAPS가 고지방/고단백질 식이를 조절하는데 도움을 줄 수 있습니다.</string>
+    <string name="extendedcarbs_rescue">저혈당 처치를 위해 사용한 탄수화물의 제거를 기록하기 위함.</string>
     <string name="extendedcarbs_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/ko/Usage/Extended-Carbs.html</string>
+    <string name="nsclient_label">원격 모니터링</string>
+    <string name="nsclient_howcanyou">어떻게 AndroidAPS를 원격으로 모니터링할 수 있을까요 (예를 들어, 아이들)?</string>
+    <string name="nsclient_nightscout">NS Client 어플, Nightscout 어플, Nightscout 웹페이지 모두 AndroidAPS를 원격으로 팔로우 할 수 있게 합니다.</string>
+    <string name="nsclient_dexcomfollow">다른 어플들(예를 들어, Dexcom 팔로우, 팔로우 모드의 xDrip)은 일부 변수들(혈당/센서 수치)을 원격으로 팔로우 할 수 있지만, 알고리즘이 달라 부정확한 IOB 또는 COB 값을 보여줄 수 있습니다.</string>
+    <string name="nsclient_data">AndroidAPS를 원격으로 팔로우하기 위해서는 Wi-Fi나 모바일/셀룰러 네트워크 데이터를 이용하여 두 기기가 모두 인터넷에 연결되어 있어야 합니다.</string>
+    <string name="nsclient_fullcontrol">NS Client를 원격 팔로워로 사용하면 모니터링과 AndroidAPS의 완전한 제어가 가능합니다.</string>
     <string name="nsclient_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/ko/Children/Children.html</string>
+    <string name="isf_label_exam">인슐린 민감도 (ISF)</string>
+    <string name="isf_increasingvalue">ISF 값을 올리면 일정한 양의 탄수화물을 다루기 위해 더 많은 인슐린이 주입하게 합니다.</string>
+    <string name="isf_decreasingvalue">ISF 값을 낮추면 목표 혈당보다 높을 때 교정을 위해 더 많은 인슐린이 주입하게 합니다.</string>
+    <string name="isf_noeffect">혈당이 목표보다 낮을 때에는 ISF를 높이거나 낮추는 것이 인슐린 주입에 영향을 주지 않습니다.</string>
+    <string name="isf_preferences">ISF를 AndroidAPS 설정에 입력해야 합니다.</string>
     <string name="isf_profile">변경사항을 적용하는데 프로파일에서 ISF 값 변경하는 것으로 충분합니다.</string>
     <string name="isf_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/ko/Getting-Started/FAQ.html#insulin-sensitivity-factor-isf-mmol-l-u-or-mg-dl-u</string>
     <string name="isf_hint2">https://androidaps.readthedocs.io/en/latest/CROWDIN/ko/Usage/Profiles.html</string>
+    <string name="ic_multiple">프로파일에서 한 개 이상의 I:C ratio를 사용할 수 있습니다.</string>
+    <string name="ic_isf">프로파일에서 ISF를 바꾸면, I:C ratio도 항상 바꿔줘야 합니다.</string>
+    <string name="ic_label_exam">인슐린 대 탄수화물 비율 (I:C ratio)</string>
+    <string name="ic_increasingvalue">높은 I:C ratio은 탄수화물 섭취 시 인슐린을 적게 주입하게 합니다.</string>
+    <string name="ic_decreasingvalue">높은 I:C ratio은 탄수화물 섭취 시 인슐린을 적게 주입하게 합니다.</string>
     <string name="ic_noeffect">COB가 0 인 경우 IC 비율을 변경하면 혈당을 교정하기 위해 다른 양의 인슐린이 주입됩니다.</string>
+    <string name="ic_different">Bread unit (교환 단위)를 10g 또는 12g으로 계산하면 IC 값도 달라지게 됩니다.</string>
+    <string name="ic_meaning">IC: 1U의 인슐린으로 bread uits (교환 단위)를 얼마나 섭취할 수 있는 지를 의미합니다.</string>
     <string name="ic_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/ko/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_basallower">Basal 양이 10% 감소합니다.</string>
+    <string name="profileswitch_isfhigher">ISF가 10% 증가합니다.</string>
+    <string name="profileswitch_iclower">I:C ratio 값이 10% 작은 수가 됩니다.</string>
+    <string name="profileswitch_unchanged">ISF와 I:C ratio는 변하지 않습니다.</string>
     <string name="profileswitch_hint1" formatted="false">https://androidaps.readthedocs.io/en/latest/CROWDIN/ko/Usage/Profiles.html?highlight=profile%20switch#profile-switch</string>
+    <string name="profileswitch2_label">프로파일 변경</string>
+    <string name="profileswitch2_pctwillchange">프로파일을 120%로 변경하였을 때, 다음 중 옳은 것은?</string>
+    <string name="profileswitch2_bghigher">목표 혈당값이 20% 높아집니다.</string>
+    <string name="profileswitch2_basalhigher">Basal 양이 20% 증가합니다.</string>
+    <string name="profileswitch2_bgunchanged">목표 혈당값은 변하지 않습니다.</string>
+    <string name="profileswitch2_isfhigher">ISF가 20% 증가합니다.</string>
+    <string name="profileswitchtime_label">프로파일 변경</string>
+    <string name="profileswitchtime_iwant">평소보다 2시간 먼저 일어난 경우, 변경된 일정을 AndroidAPS에게 어떻게 입력해야 할까요?</string>
+    <string name="profileswitchtime_2">시간이동 2으로 프로파일을 변경합니다.</string>
+    <string name="profileswitchtime__2">시간이동 -2으로 프로파일을 변경합니다.</string>
+    <string name="profileswitchtime_tt">\"식사 전 임시 목표\"로 설정합니다.</string>
+    <string name="profileswitchtime_100">프로파일을 100% 보다 높게 변경합니다.</string>
     <string name="profileswitchtime_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/ko/Usage/Profiles.html?highlight=profile%20switch#timeshift</string>
+    <string name="profileswitch4_label">프로파일의 변화</string>
+    <string name="profileswitch4_rates">Basal rates, ISF, I:C ratio 등을 프로파일에서 설정해야 합니다.</string>
+    <string name="profileswitch4_internet">Nightscout 프로파일에서의 변화를 활성화 시키려면, AndroidAPS용 핸드폰이 인터넷에 연결되어 있어야 합니다.</string>
+    <string name="profileswitch4_sufficient">변경된 것을 실행하려면, 프로파일에서 변화된 값을 수정하기만 하면 됩니다.</string>
+    <string name="profileswitch4_multi">변화하는 상황 (예를 들어, 호르몬 변화, 교대근무, 평일/주말 생활 방식)에 적응하기 위하여 여러 개의 프로파일을 만들어서 선택할 수 있습니다.</string>
     <string name="basalhelp_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/ko/Module/module.html#good-individual-dosage-algorithm-for-your-diabetes-therapy</string>
+    <string name="basalhelp_label">Basal 양에 대한 도움</string>
     <string name="basalhelp_where">Basal값 등과 관련된 도움을 어디서 받아야 하나요?</string>
     <string name="basalhelp_diabetesteam">의료진</string>
     <string name="basalhelp_google">구글(Google)</string>
     <string name="basalhelp_facebook">페이스북(Facebook)</string>
+    <string name="other_medication_label">다른 약물. 하단의 문구를 읽고, 내용을 수용하면 네모칸에 체크하십시오.</string>
+    <string name="other_medication_text">AndroidAPS는 혈당을 올리기 위하여 basal값을 내리거나 중단합니다. SGLT2 억제제 (gliflozins) 계열의 약물들은 혈당 상승을 억제하여 DKA (케톤산증)을 일으킬 정도로 위험한 인슐린의 결핍을 유발할 수 있습니다.
+\n일반적인 브랜드명은 다음과 같습니다: Invokana®, Forxiga®, Jardiance®, Steglatro®, Suglat®, Apleway®, Deberza®, Synjardy®, Vokanamet®, Xigduo®.\n\n본인은 AndroidAPS를 사용할 때 이러한 약물들을 복용하지 않을 것, 또는 이러한 약물들을 복용하기 전에 loop을 비활성화 할 것을 약속합니다.</string>
 </resources>
diff --git a/app/src/main/res/values-ko-rKR/objectives.xml b/app/src/main/res/values-ko-rKR/objectives.xml
index 620b7a5f37..9960748a92 100644
--- a/app/src/main/res/values-ko-rKR/objectives.xml
+++ b/app/src/main/res/values-ko-rKR/objectives.xml
@@ -17,9 +17,11 @@
     <string name="objectives_maxiob_gate">혈당을 낮추기 전에 몇일간 사용해보되 최소한 하루는 저혈당 알람이 발생하지 않도록 해봅니다</string>
     <string name="objectives_autosens_objective">필요하면 Basal과 비율을 조절하고, auto-sens를 활성화합니다</string>
     <string name="objectives_autosens_gate">섭취한 탄수화물양을 입력하고 1주일동안 낮시간대에 loop를 성공적으로 사용하여 봅니다</string>
-    <string name="objectives_ama_objective">AMA(Advanced Meal Assist)같은 낮시간대를 위한 추가적인 기능들을 실행하여 봅니다</string>
     <string name="objectives_smb_objective">낮시간대에 SMB(Super Micro Bolus)같은 추가기능을 활성화해 사용해봅니다</string>
+    <string name="objectives_auto_objective">자동화 사용</string>
     <string name="objectives_smb_gate">SMB가 잘 작동하게 하기위해서 wiki를 반드시 읽은 다음 maxIOB 값을 올려보세요! maxIOB=평균 식사 Bolus + 3 x 최대하루 Basal이면 적당한 시작값입니다</string>
+    <string name="objectives_auto_gate">자동화가 어떻게 작동하는지 설명서를 확인하세요. 간단한 첫 번째 규칙을 만들어 보십시오. 실행하기 전에 AAPS가 알림을 보여주도록 설정합니다. 자동화가 적시에 잘 작동하는 것을 확인하면 알림을 실제 실행으로 변경하십시오.
+(https://androidaps.readthedocs.io/en/latest/EN/Usage/Automation.html)</string>
     <string name="objectives_bgavailableinns">NS에서 혈당이 확인 가능합니다</string>
     <string name="objectives_pumpstatusavailableinns">NS에서 펌프상태가 확인 가능합니다</string>
     <string name="objectives_manualenacts">수동 주입</string>
@@ -34,9 +36,11 @@
     <string name="objectives_useloop">Loop 플러그인 내용을 표시합니다</string>
     <string name="objectives_usescale">홈의 혈당 차트를 길게 눌러 차트 시간을 변경하세요</string>
     <string name="objectives_button_enter">입력</string>
+    <string name="enter_code_obtained_from_developers_to_bypass_the_rest_of_objectives">다른 시스템에서 closed loop을 적어도 3개월 동안 사용한 경우 목표를 건너뛸 수 있는 코드를 받을 수 있습니다. 자세한 정보는 https://androidaps.readthedocs.io/en/latest/EN/Usage/Objectives.html#skip-objectives를 참고하십시오.</string>
     <string name="codeaccepted">코드 인증</string>
     <string name="codeinvalid">잘못된 코드</string>
     <string name="objectives_exam_objective">당신의 지식을 확인해봅니다</string>
+    <string name="objectives_exam_gate">문제들에 대한 공부. 각각의 질문에 네 개의 답변이 주어집니다. 한 개 이상의 정답이 있을 수 있습니다. 올바른 것을 모두 체크하고, 확인을 선택하십시오.</string>
     <string name="answerdisabledto">다음 시간까지 답변 불가능: %1$s</string>
     <string name="wronganswer">잘못된 답변!</string>
     <string name="unfinshed_button">다음 미답변</string>
diff --git a/app/src/main/res/values-ko-rKR/strings.xml b/app/src/main/res/values-ko-rKR/strings.xml
index 40430fb863..2aefb9877c 100644
--- a/app/src/main/res/values-ko-rKR/strings.xml
+++ b/app/src/main/res/values-ko-rKR/strings.xml
@@ -6,6 +6,7 @@
     <string name="treatmentssafety_title">관리 안전설정</string>
     <string name="treatmentssafety_maxbolus_title">최대 허용 Bolus [U]</string>
     <string name="treatmentssafety_maxcarbs_title">최대 허용 탄수화물 [g]</string>
+    <string name="nav_preferences_plugin">%1$s 설정</string>
     <string name="nav_preferences">설정</string>
     <string name="nav_refreshtreatments">NS에서 관리 새로고침</string>
     <string name="nav_resetdb">데이터베이스 초기화</string>
@@ -19,6 +20,7 @@
     <string name="description_food">Nightscout에서 정의된 음식 설정을 표시합니다.</string>
     <string name="description_insulin_rapid">휴마로그와 노보래피드에 대한 인슐린 설정</string>
     <string name="description_insulin_ultra_rapid">피아스프에 대한 인슐린 설정</string>
+    <string name="description_insulin_lyumjev">Lyumjev에 대한 인슐린 설정</string>
     <string name="description_insulin_free_peak">인슐린활동의 피크를 직접 정의할 수 있습니다. 고급 사용자만 사용해야 합니다.</string>
     <string name="description_loop">Loop를 활성화 혹은 비활성화합니다.</string>
     <string name="description_ns_client">Nightscout과 데이터 동기화하기</string>
@@ -30,11 +32,13 @@
     <string name="description_pump_mdi">다회요법으로 관리하는 사용자를 위한 설정</string>
     <string name="description_pump_virtual">가상용 펌프를 위한 설정(Open Loop)</string>
     <string name="description_sensitivity_aaps">Oref0와 동일한 방법으로 민감도가 계산되지만, 과거 시간을 지정할 수 있습니다. 최소 탄수화물 흡수는 설정에서 최대 탄수화물 흡수 시간으로 부터 계산됩니다.</string>
+    <string name="description_sensitivity_oref1">민감도가 과거 8시간의 데이터로 부터 계산됩니다. (흡수되지 않은 경우) 탄수화물은 설정에서 설정된 시간이 지나면 없어집니다. UAM(알리지 않은 음식)도 계산합니다.</string>
     <string name="description_sensitivity_weighted_average">민감도가 편차의 가중평균으로 계산됩니다. 최근의 편차가 더 가중됩니다. 최소 탄수화물 흡수는 설정에서 최대 탄수화물 흡수 시간으로 부터 계산됩니다. 이 알고리즘의 민감도가 가장 빠릅니다.</string>
     <string name="description_source_eversense">패치된 Eversense 앱에서 혈당값 받기</string>
     <string name="description_source_glimp">Glimp에서 혈당값 받기</string>
     <string name="description_source_mm640g">600SeriesAndroidUploader에서 혈당값 받기</string>
     <string name="description_source_ns_client">Nightscout에서 다운로드하여 혈당값 받기</string>
+    <string name="description_source_xdrip">xDrip+에서 혈당값 받기</string>
     <string name="description_treatments">모든 관리를 저장합니다.</string>
     <string name="description_wear">WearOS 워치를 이용하여 AndroidAPS를 모니터하고 제어합니다.</string>
     <string name="description_xdrip_status_line">xDrip+ 워치페이스에서 Loop정보 보여주기</string>
@@ -77,8 +81,6 @@
     <string name="careportal">케어포털</string>
     <string name="configbuilder_pump">펌프</string>
     <string name="configbuilder_pump_description">어떤 펌프를 AndroidAPS에서 사용하시겠습니까?</string>
-    <string name="configbuilder_treatments">관리</string>
-    <string name="configbuilder_treatments_description">관리를 위해서 어떤 플러그인을 사용합니까?</string>
     <string name="configbuilder_profile">프로파일</string>
     <string name="configbuilder_profile_description">어떤 프로파일을 AndroidAPS에서 사용합니까?</string>
     <string name="configbuilder_aps">APS</string>
@@ -107,11 +109,14 @@
     <string name="changeyourinput">입력값을 변경하세요!</string>
     <string name="configbuilder_bgsource">혈당 출처</string>
     <string name="configbuilder_bgsource_description">AndroidAPS가 어디에서 데이터를 가져옵니까?</string>
+    <string name="xdrip">xDrip+</string>
     <string name="apsmode_title">APS 모드</string>
     <string name="closedloop">Closed Loop</string>
     <string name="openloop">Open Loop</string>
+    <string name="lowglucosesuspend">저혈당 주입정지</string>
     <string name="disabledloop">Loop 중지됨</string>
     <string name="openloop_newsuggestion">새로운 제안이 있습니다</string>
+    <string name="carbssuggestion">탄수화물 제안</string>
     <string name="unsupportednsversion">지원하지 않는 Nightscout 버전입니다</string>
     <string name="treatments_wizard_basaliob_label">Basal IOB</string>
     <string name="bolusconstraintapplied">Bolus 제한이 적용되었습니다</string>
@@ -126,16 +131,35 @@
     <string name="overview_tempbasal_button">임시Basal</string>
     <string name="overview_extendedbolus_button">확장 Bolus</string>
     <string name="configbuilder_nightscoutversion_label">Nightscout 버전:</string>
+    <string name="missing_carbs">부족 %1$d g</string>
     <string name="exported">설정이 저장되었습니다</string>
+    <string name="ue_exported">사용자 입력 사항들이 저장됨</string>
     <string name="export_to">다음 위치에 설정을 저장하시겠습니까</string>
     <string name="import_from">다음 위치에서 설정을 불러오시겠습니까</string>
     <string name="setting_imported">설정을 불러왔습니다</string>
     <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>
+    <string name="password_preferences_encrypt_prompt">내보낸 preferences 암호화 하기 위해 마스터 비밀번호가 필요합니다.</string>
+    <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>
+    <string name="check_preferences_details_btn">환경설정 가져오기 문제 설명</string>
+    <string name="check_preferences_details_title">환경설정 가져오기 문제의 상세정보</string>
+    <string name="check_preferences_import_btn">가져오기</string>
+    <string name="check_preferences_import_anyway_btn">무시하고 가져오기 (위험!)</string>
     <string name="end_user_license_agreement">최종 사용자 라이선스 동의서</string>
     <string name="end_user_license_agreement_text">이 프로그램을 의학적 결정을 내리는 데 사용해서는 안되며, 여기에 대한 어떠한 보증도 없습니다. 이 프로그램의 품질과 성능에 관한 모든 위험은 사용자에게 있습니다.\nMUST NOT BE USED TO MAKE MEDICAL DECISIONS. THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM “AS IS” WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.</string>
     <string name="end_user_license_agreement_i_understand">모두 이해하였고 동의합니다.</string>
@@ -155,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>
@@ -162,15 +189,25 @@
     <string name="smscommunicator_loophasbeendisabled">Loop가 중지되었습니다.</string>
     <string name="smscommunicator_loophasbeenenabled">Loop가 실행되었습니다.</string>
     <string name="smscommunicator_loopisenabled">Loop가 실행중입니다.</string>
-    <string name="valuelimitedto">%1$.2f, %2$.2f으로 제한됨</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>
@@ -192,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>
@@ -223,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>
@@ -237,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>
@@ -249,6 +292,9 @@
     <string name="smscommunicator_invalidphonennumber">SMS폰번호가 유효하지 않습니다</string>
     <string name="overview_calibration">보정</string>
     <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>
@@ -275,10 +321,17 @@
     <string name="wear_detailedIOB_title">IOB 자세하게 보여주기</string>
     <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>
@@ -287,11 +340,18 @@
     <string name="suspendloopfor2h">2시간동안 Loop 일시중지</string>
     <string name="suspendloopfor3h">3시간동안 Loop 일시중지</string>
     <string name="suspendloopfor10h">10시간동안 Loop 일시중지</string>
+    <string name="disconnectpump">펌프 일시중지</string>
     <string name="disconnectpumpfor15m">15분동안 펌프 일시중지</string>
     <string name="disconnectpumpfor30m">30분동안 펌프 일시중지</string>
     <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>
+    <string name="duration10h">10시간</string>
     <string name="resume">재실행</string>
     <string name="reconnect">펌프 재연결</string>
     <string name="smscommunicator_wrongduration">기간이 잘못되었습니다.</string>
@@ -309,17 +369,45 @@
     <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>
     <string name="overview_extendedbolus_cancel_button">확장Bolus 취소</string>
     <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>
@@ -345,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>
@@ -356,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>
@@ -368,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>
@@ -381,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>
@@ -392,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>
@@ -421,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>
@@ -429,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>
@@ -447,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>
@@ -526,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>
@@ -544,11 +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>
@@ -593,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>
@@ -604,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>
@@ -630,16 +750,19 @@
     <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>
     <string name="age">나이:</string>
+    <string name="weight_label">몸무게:</string>
     <string name="id">ID:</string>
     <string name="submit">확인</string>
     <string name="mostcommonprofile">가장 많이 사용된 프로파일:</string>
     <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>
@@ -651,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>
@@ -661,4 +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-lt-rLT/exam.xml b/app/src/main/res/values-lt-rLT/exam.xml
index a9b24e8fa0..ce9e59dbf1 100644
--- a/app/src/main/res/values-lt-rLT/exam.xml
+++ b/app/src/main/res/values-lt-rLT/exam.xml
@@ -132,7 +132,6 @@
     <string name="wronginsulin_label">Insulino suleidimo / įrašų klaidos</string>
     <string name="wronginsulin_whattodo">Ką turėtumėte daryti, jei buvo suleista mažiau insulino nei rodo pompos istorija, pvz. dėl užsikimšimo, neveikiančios kaniulės ar pamiršus po dušo vėl pritvirtinti pompą? </string>
     <string name="wronginsulin_careportal">Ištrinti insulino suleidimo įrašą per Nightscout Careportal, kad pašalintumėte jį iš pompos istorijos.</string>
-    <string name="wronginsulin_compare">Palyginti įrašus AndroidAPS ir pompos istorijoje.</string>
     <string name="wronginsulin_prime">Susileisti trūkstamą insulino kiekį švirkštu ar naudojantis infuzinės sistemos užpildymo funkcija.</string>
     <string name="wronginsulin_donothing">Nieko nedaryti ir leisti AndroidAPS koreguoti padidėjusį gliukozės kiekį kraujyje.</string>
     <string name="iob_label">Aktyvus insulinas organizme (AIO)</string>
diff --git a/app/src/main/res/values-lt-rLT/objectives.xml b/app/src/main/res/values-lt-rLT/objectives.xml
index e1685d7195..442fbc1c45 100644
--- a/app/src/main/res/values-lt-rLT/objectives.xml
+++ b/app/src/main/res/values-lt-rLT/objectives.xml
@@ -17,7 +17,6 @@
     <string name="objectives_maxiob_gate">Praleiskite keletą dienų ir bent vieną naktį be hipoglikemijos aliarmų</string>
     <string name="objectives_autosens_objective">Jei reikia, paderinkite valandines bazės vertes bei pagrindinius parametrus ir įgalinkite Autosens funkciją</string>
     <string name="objectives_autosens_gate">1 savaitę praleiskite sėkmingai naudodami uždarąjį ciklą dienos metu ir įvesdami visus valgomus angliavandenius</string>
-    <string name="objectives_ama_objective">Dienos metu aktyvuokite papildomas funkcijas, tokias kaip pažangioji maisto skaičiuoklė (AMA Advanced Meal Assist)</string>
     <string name="objectives_smb_objective">Dienos metu aktyvuokite papildomas funkcijas, tokias kaip SMB (Super Mikro Bolusas)</string>
     <string name="objectives_auto_objective">Automatizavimo įjungimas</string>
     <string name="objectives_smb_gate">Norėdami, kad SMB veiktų gerai, turite perskaityti dokumentaciją ir padidinti max AIO! Pradžiai patartina skaičiuoti taip: maxAIO=(didžiausia valandinė bazė x 3) + vidutinis bolusas</string>
diff --git a/app/src/main/res/values-lt-rLT/strings.xml b/app/src/main/res/values-lt-rLT/strings.xml
index 0d6ab9e074..c79ed26966 100644
--- a/app/src/main/res/values-lt-rLT/strings.xml
+++ b/app/src/main/res/values-lt-rLT/strings.xml
@@ -80,8 +80,6 @@
     <string name="careportal">Priežiūra</string>
     <string name="configbuilder_pump">Pompa</string>
     <string name="configbuilder_pump_description">Kokią pompą naudosite su AndroidAPS?</string>
-    <string name="configbuilder_treatments">Terapija</string>
-    <string name="configbuilder_treatments_description">Kuris įskiepis bus naudojamas terapijos tvarkymui?</string>
     <string name="configbuilder_profile">Profilis</string>
     <string name="configbuilder_profile_description">Kurį profilį naudos AndroidAPS?</string>
     <string name="configbuilder_aps">DKS</string>
@@ -188,7 +186,6 @@
     <string name="smscommunicator_loophasbeendisabled">Ciklas buvo išjungtas</string>
     <string name="smscommunicator_loophasbeenenabled">Ciklas buvo įjungtas</string>
     <string name="smscommunicator_loopisenabled">Ciklas įjungtas</string>
-    <string name="valuelimitedto">%1$.2f apribotas iki %2$.2f</string>
     <string name="smscommunicator_pumpconnectwithcode">Pompos prijungimui atsakykite su kodu %1$s</string>
     <string name="smscommunicator_pumpconnectfail">Nepavyko prisijungti prie pompos</string>
     <string name="smscommunicator_pumpdisconnectwithcode">Norėdami atjungti pompą %1$d min., atsakykite kodu %2$s</string>
@@ -812,35 +809,6 @@
     <string name="formatwithweight">Amžius: %1$.0f Svoris: %2$.0f kg</string>
     <string name="basalpctfromtdd_label">% bazės</string>
     <string name="dpvdefaultprofile">Numatytasis profilis</string>
-    <string name="open_humans">Open Humans</string>
-    <string name="finishing_open_humans_setup">Baigiama Open Humans sąranka…</string>
-    <string name="this_may_take_a_while">Tai gali užtrukti. Neišjunkite telefono ar šio papildinio.</string>
-    <string name="setup_finished">Sąranka baigta</string>
-    <string name="your_phone_will_upload_data">Netrukus jūsų telefonas įkels duomenis į Open Human.</string>
-    <string name="your_phone_is_upload_data">Jūsų telefonas įkelia duomenis į Open Human.</string>
-    <string name="setup_failed">Sąranka nepavyko</string>
-    <string name="there_was_an_error">Įvyko klaida. Norėdami tęsti, prisijunkite dar kartą. Atsiprašome &amp; Ačiū!</string>
-    <string name="open_humans_terms">Tai yra atviro kodo įrankis, kuris nukopijuoja jūsų duomenis į Open Humans. Mes neturime teisės perduoti jūsų duomenų trečiosioms šalims be aiškaus jūsų sutikimo. Duomenys, kuriuos gauna projektas ir programa, identifikuojami pagal atsitiktinį vartotojo ID ir tik tada saugiai perkeliami į Open Humans paskyrą, jei sutinkate su šiuo procesu. Galite bet kada sustabdyti įkėlimą ir ištrinti savo įkeltus duomenis apsilankę www.openhumans.org.</string>
-    <string name="i_understand_and_agree">Aš suprantu ir sutinku.</string>
-    <string name="login">Prisijungti</string>
-    <string name="logout">Atsijungti</string>
-    <string name="oh_logout_confirmation">Ar tikrai norite atsisakyti prenumeratos ir nebeteikti duomenų mokslui?</string>
-    <string name="project_member_id">Projekto nario ID: %s</string>
-    <string name="queue_size">Eilės Dydis: %d</string>
-    <string name="terms_of_use">Naudojimosi sąlygos</string>
-    <string name="not_logged_in">Neprisijungęs</string>
-    <string name="you_need_to_accept_the_of_use_first">Jūs turite sutikti su naudojimo sąlygomis.</string>
-    <string name="successfully_logged_in">Sėkmingai prisijungta</string>
-    <string name="setup_will_continue_in_background">Sąranka bus baigta fone. Dėkojame, kad įkėlėte duomenis. \n\n Palaikykite šį papildinį ir telefoną įjungtus, kad būtų galima užbaigti sąranką.</string>
-    <string name="completing_login">Užbaigiamas prisijungimas…</string>
-    <string name="donate_your_data_to_science">Paaukokite savo duomenis mokslui</string>
-    <string name="open_humans_short">OH</string>
-    <string name="you_have_been_signed_out_of_open_humans">Jūs buvote atjungtas iš Open Humans</string>
-    <string name="only_upload_if_connected_to_wifi">Tik įkelti, jei prijungta prie WiFi</string>
-    <string name="only_upload_if_charging">Įkelti tik akumuliatoriaus įkrovimo metu</string>
-    <string name="worker_state">Darbinė Būklė: %s</string>
-    <string name="uploaded_data">Įkelti duomenis</string>
-    <string name="the_following_data_will_be_uploaded_to_your_open_humans_account">Į jūsų Open Humans paskyrą bus įkelti šie duomenys: glikemijos reikšmės, bolusai, angliavandeniai, priežiūros portalo įvykiai (išskyrus pastabas), ištęstiniai bolusai, profilio pakeitimai, visos paros dozės, laikinos valandinės bazės, laikini tikslai, nustatymai, programos versija, įrenginio modelis ir ekrano matmenys. Konfidenciali ar privati ​​informacija, pvz., Jūsų Nightscout URL arba API slaptažodis, nebus įkelta.</string>
     <string name="setupwizard_pump_riley_link_status">RileyLink statusas:</string>
     <string name="filter">Filtruoti</string>
     <string name="copytolocalprofile_invalid">Nepavyksta sukurti vietinio profilio. Profilis neteisingas.</string>
diff --git a/app/src/main/res/values-nl-rNL/exam.xml b/app/src/main/res/values-nl-rNL/exam.xml
index 78d616653e..3eb44eda07 100644
--- a/app/src/main/res/values-nl-rNL/exam.xml
+++ b/app/src/main/res/values-nl-rNL/exam.xml
@@ -132,7 +132,6 @@
     <string name="wronginsulin_label">Insulinetoediening/-invoerfouten</string>
     <string name="wronginsulin_whattodo">Wat moet je doen wanneer je minder insuline toegediend hebt gekregen dan de geschiedenis van de pomp suggereert, bijvoorbeeld vanwege een verstopping, een lekkende canule of door het vergeten de pomp opnieuw aan te koppelen na een douche? </string>
     <string name="wronginsulin_careportal">Verwijder de insulinegegevens uit het Nightscout Careportal om deze uit de pompgeschiedenis te verwijderen.</string>
-    <string name="wronginsulin_compare">Vergelijk de waarden in AndroidAPS met de pompgeschiedenis.</string>
     <string name="wronginsulin_prime">Bolus een deel van je berekende \'gemiste\' insuline door een injectiespuit/pen of door de uitvulfunctie te gebruiken.</string>
     <string name="wronginsulin_donothing">Doe niets en laat AndroidAPS de resulterende hoge bloedglucosespiegel corrigeren.</string>
     <string name="iob_label">Insuline aan boord (IOB)</string>
diff --git a/app/src/main/res/values-nl-rNL/objectives.xml b/app/src/main/res/values-nl-rNL/objectives.xml
index 4ace018591..a54f6c68c6 100644
--- a/app/src/main/res/values-nl-rNL/objectives.xml
+++ b/app/src/main/res/values-nl-rNL/objectives.xml
@@ -17,7 +17,6 @@
     <string name="objectives_maxiob_gate">Test enkele dagen als ook minstens 1 nacht zonder een laag BG alarm voordat je jouw streef BG verlaagt</string>
     <string name="objectives_autosens_objective">Pas het basaal en de ratios aan indien nodig, activeer hierna de auto-sens optie</string>
     <string name="objectives_autosens_gate">Gedurende 1 week succesvol overdag loopen met regelmatige invoer van koolhydraten</string>
-    <string name="objectives_ama_objective">Activeren van extra functies overdag zoals AMA (geavanceerde maaltijdhulp, Advanced Meal Assist)</string>
     <string name="objectives_smb_objective">Activeren van extra functies overdag zoals SMB (super micro bolus)</string>
     <string name="objectives_auto_objective">Automatisering inschakelen</string>
     <string name="objectives_smb_gate">Lees de wiki en verhoog maxIOB om SMB goed werkend te krijgen. Een goed begin is maxIOB=gemiddelde maaltijdbolus + 3 x max dagelijkse basaal</string>
diff --git a/app/src/main/res/values-nl-rNL/strings.xml b/app/src/main/res/values-nl-rNL/strings.xml
index 8f9ba618cd..0ac1a956d4 100644
--- a/app/src/main/res/values-nl-rNL/strings.xml
+++ b/app/src/main/res/values-nl-rNL/strings.xml
@@ -81,8 +81,6 @@
     <string name="careportal">Careportal</string>
     <string name="configbuilder_pump">Pomp</string>
     <string name="configbuilder_pump_description">Welke pomp wil je gaan gebruiken met AndroidAPS?</string>
-    <string name="configbuilder_treatments">Behandelingen</string>
-    <string name="configbuilder_treatments_description">Welke plugin moet worden gebruikt voor de Behandelingen?</string>
     <string name="configbuilder_profile">Profiel</string>
     <string name="configbuilder_profile_description">Welk profiel moet AndroidAPS gebruiken?</string>
     <string name="configbuilder_aps">APS</string>
@@ -135,6 +133,7 @@
     <string name="configbuilder_nightscoutversion_label">Nightscout versie:</string>
     <string name="missing_carbs">Er ontbreekt %1$d g</string>
     <string name="exported">Instellingen geëxporteerd</string>
+    <string name="ue_exported">Gebruikers invoer geëxporteerd</string>
     <string name="export_to">Exporteer instellingen naar</string>
     <string name="import_from">Importeer instellingen van</string>
     <string name="setting_imported">Instellingen geïmporteerd</string>
@@ -190,7 +189,6 @@
     <string name="smscommunicator_loophasbeendisabled">Loop was uitgeschakeld</string>
     <string name="smscommunicator_loophasbeenenabled">Loop was ingeschakeld</string>
     <string name="smscommunicator_loopisenabled">Loop is ingeschakeld</string>
-    <string name="valuelimitedto">%1$.2f gelimiteerd tot %2$.2f</string>
     <string name="smscommunicator_pumpconnectwithcode">Om verbinding te maken met pomp antwoord met code %1$s</string>
     <string name="smscommunicator_pumpconnectfail">Verbinding maken met pomp is mislukt</string>
     <string name="smscommunicator_pumpdisconnectwithcode">Om de pomp te ontkoppelen gedurende %1$d minuten antwoord met code %2$s</string>
@@ -265,6 +263,7 @@
     <string name="openapsma_autosensdata_label">Autosens gegevens</string>
     <string name="openapsma_scriptdebugdata_label">Script debug</string>
     <string name="openapsama_useautosens">Gebruik Autosens functie</string>
+    <string name="refresheventsfromnightscout">Vernieuwen vanaf NS</string>
     <string name="deletefuturetreatments">Verwijder behandelingen in de toekomst</string>
     <string name="actions_shortname">ACT</string>
     <string name="configbuilder_shortname">CONF</string>
@@ -388,6 +387,7 @@
     <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">Over</string>
@@ -555,6 +555,7 @@
     <string name="bolusrecordedonly">Bolus wordt alleen geregistreerd (niet toegediend door pomp)</string>
     <string name="loop_smbsetbypump_label">SMB op de pomp ingesteld</string>
     <string name="overview_show_activity">Activiteit</string>
+    <string name="overview_show_bgi">Bloedglucose impact</string>
     <string name="overview_show_sensitivity">Gevoeligheid</string>
     <string name="overview_show_deviations">Afwijkingen</string>
     <string name="overview_show_cob">Opgenomen Koolhydraten</string>
@@ -829,36 +830,6 @@
     <string name="formatwithweight">Leeftijd: %1$.0f gewicht: %2$.0f kg</string>
     <string name="basalpctfromtdd_label">% van basaal</string>
     <string name="dpvdefaultprofile">DPV Basis profiel</string>
-    <string name="open_humans">Open Humans</string>
-    <string name="finishing_open_humans_setup">Setup van Open Humans voltooien…</string>
-    <string name="this_may_take_a_while">Dit kan even duren. Zet de telefoon of plugin niet uit.</string>
-    <string name="setup_finished">Setup voltooid</string>
-    <string name="your_phone_will_upload_data">Je telefoon zal binnenkort data gaan uploaden naar Open Humans.</string>
-    <string name="your_phone_is_upload_data">Je telefoon is data aan het uploaden naar Open Humans.</string>
-    <string name="setup_failed">Setup mislukt</string>
-    <string name="there_was_an_error">Er is een fout opgetreden. Probeer opnieuw in te loggen. Sorry &amp; bedankt!</string>
-    <string name="open_humans_terms">Dit is een open source tool die je data uploadt naar Open Humans. Wij behouden geen rechten om je gegevens te delen met derden zonder jouw uitdrukkelijke toestemming. De gegevens die het project en de app ontvangen, worden geïdentificeerd aan de hand van een willekeurig gebruikers-ID en worden uitsluitend veilig verzonden naar een Open Humans account met jouw toestemming voor dat proces. Je kunt op elk gewenst moment stoppen met uploaden en je data verwijderen via www.openhumans.org.</string>
-    <string name="i_understand_and_agree">Ik begrijp het en ga akkoord.</string>
-    <string name="login">Inloggen</string>
-    <string name="logout">Uitloggen</string>
-    <string name="oh_logout_confirmation">Weet je zeker dat je uit wilt loggen en wilt stoppen met het doneren van gegevens aan de wetenschap?</string>
-    <string name="project_member_id">Projectlid-ID: %s</string>
-    <string name="queue_size">Grootte wachtrij: %d</string>
-    <string name="terms_of_use">Gebruiksvoorwaarden</string>
-    <string name="not_logged_in">Niet ingelogd</string>
-    <string name="you_need_to_accept_the_of_use_first">Je moet eerst instemmen met de voorwaarden.</string>
-    <string name="successfully_logged_in">Succesvol ingelogd</string>
-    <string name="setup_will_continue_in_background">De setup wordt nu op de achtergrond voltooid. Bedankt voor het uploaden van je gegevens.\n\nHoud deze plugin en je telefoon even ingeschakeld om de setup te voltooien.</string>
-    <string name="completing_login">Login voltooien…</string>
-    <string name="donate_your_data_to_science">Doneer je gegevens aan de wetenschap</string>
-    <string name="open_humans_short">OH</string>
-    <string name="you_have_been_signed_out_of_open_humans">Je bent uitgelogd van Open Humans</string>
-    <string name="click_here_to_sign_in_again_if_this_wasnt_on_purpose">Klik hier om opnieuw in te loggen als dit niet opzettelijk was.</string>
-    <string name="only_upload_if_connected_to_wifi">Alleen uploaden indien verbonden met WiFi</string>
-    <string name="only_upload_if_charging">Alleen uploaden tijdens opladen</string>
-    <string name="worker_state">Werkstatus: %s</string>
-    <string name="uploaded_data">Geüploade gegevens</string>
-    <string name="the_following_data_will_be_uploaded_to_your_open_humans_account">De volgende gegevens worden geüpload naar je Open Humans account: glucosewaarden, bolussen, koolhydraten, careportal-events (met uitzondering van notities), verlengde bolussen, profielwissels, totale dagelijkse doses, tijdelijke basaalstanden, tijdelijke doelen, voorkeuren, app-versie, apparaatmodel en schermafmetingen. Geheime of persoonlijke gegevens zoals je Nightscout-URL of API-secret worden niet geüpload.</string>
     <string name="setupwizard_pump_riley_link_status">RileyLink Status:</string>
     <string name="filter">Filter</string>
     <string name="copytolocalprofile_invalid">Lokaal profiel kan niet worden gemaakt. Profiel is ongeldig.</string>
@@ -876,6 +847,15 @@
     <string name="fabric_upload_disabled">Upload van crashrapporten is uitgeschakeld!</string>
     <string name="graph_menu_divider_header">Grafiek</string>
     <string name="chart_menu">Grafiek menu</string>
+    <string name="clear_filter">Verwijder filter</string>
+    <string name="trend_arrow">Trendpijl</string>
+    <string name="cannula">Canule</string>
+    <string name="userentry">Gebruikersinvoer</string>
+    <string name="common_values">Gebruik de waarden van je grootste maaltijd die je gewoonlijk eet\n</string>
+    <string name="summary_email_for_crash_report">Dit e-mailadres zal gekoppeld worden aan crashrapporten, zodat we in dringende gevallen contact met u kunnen opnemen. Het is optioneel.</string>
+    <string name="email_address">E-mailadres</string>
+    <string name="privacy_settings">Privacyinstellingen</string>
+    <string name="privacy_summary">U kunt optioneel een e-mailadres opgeven als u op de hoogte wilt worden gebracht van applicatie crashes. Dit is geen geautomatiseerde service. De ontwikkelaars zullen contact met u opnemen bij gevaarlijke situaties.</string>
     <string name="full_sync">Volledige synchronisatie</string>
     <string name="prime">Vullen</string>
     <string name="ns_sync_options">Synchronisatie</string>
diff --git a/app/src/main/res/values-no-rNO/exam.xml b/app/src/main/res/values-no-rNO/exam.xml
index 201fca7268..6a5ac6d704 100644
--- a/app/src/main/res/values-no-rNO/exam.xml
+++ b/app/src/main/res/values-no-rNO/exam.xml
@@ -132,7 +132,7 @@
     <string name="wronginsulin_label">Feil i insulin levering/registrering</string>
     <string name="wronginsulin_whattodo">Hva ska du gjøre hvis du har fått mindre insulin enn hva pumpens historikk viser, f.eks. på grunn av okklusjon, feil med kanyle eller om du har glemt å koble på pumpen etter en dusj</string>
     <string name="wronginsulin_careportal">Fjern insulindata fra Nightscout slik at det slettes fra pumpens historikk.</string>
-    <string name="wronginsulin_compare">Sammenligne verdier i AndroidAPS og pumpehistorikk.</string>
+    <string name="wronginsulin_compare">Sammenlign verdiene i AndroidAPS og pumpehistorikken (hvis pumpen støtter dette).</string>
     <string name="wronginsulin_prime">Gi en bolus med en del av det insulinet du mangler enten med penn eller ved å bruke prime funksjonen.</string>
     <string name="wronginsulin_donothing">Ikke gjør noe og la AndroidAPS korrigere eventuelle høye blodsukkerverdier.</string>
     <string name="iob_label">Aktivt insulin (IOB)</string>
diff --git a/app/src/main/res/values-no-rNO/objectives.xml b/app/src/main/res/values-no-rNO/objectives.xml
index f2830c8026..fcd81bbc3f 100644
--- a/app/src/main/res/values-no-rNO/objectives.xml
+++ b/app/src/main/res/values-no-rNO/objectives.xml
@@ -17,7 +17,6 @@
     <string name="objectives_maxiob_gate">Kjør i noen dager og opplev minst en natt uten lavt BS alarmer før du begynner å redusere målverdi for BS</string>
     <string name="objectives_autosens_objective">Juster om nødvendig basal og forholdstall, og deretter aktiverer du autosens</string>
     <string name="objectives_autosens_gate">1 uke vellykket looping på dagtid hvor alle måltider (KH) angis</string>
-    <string name="objectives_ama_objective">Aktiver ekstra funksjoner for bruk på dagtid, slik som avansert måltidsassistent (AMA)</string>
     <string name="objectives_smb_objective">Aktiver ekstra funksjoner for bruk på dagtid, slik som SMB (Super Micro Bolus)</string>
     <string name="objectives_auto_objective">Aktiver Automatisering</string>
     <string name="objectives_smb_gate">Du må lese wiki og øke din maxIOB for å få SMB til å fungere. Et godt utgangspunkt er maxIOB = gjennomsnittlig måltidsbolus + 3*max daglig basal</string>
diff --git a/app/src/main/res/values-no-rNO/strings.xml b/app/src/main/res/values-no-rNO/strings.xml
index 0f85c408c7..f6abab1541 100644
--- a/app/src/main/res/values-no-rNO/strings.xml
+++ b/app/src/main/res/values-no-rNO/strings.xml
@@ -81,8 +81,6 @@
     <string name="careportal">Careportal</string>
     <string name="configbuilder_pump">Pumpe</string>
     <string name="configbuilder_pump_description">Hvilken pumpe ønsker du å bruke sammen med AndroidAPS?</string>
-    <string name="configbuilder_treatments">Behandlinger</string>
-    <string name="configbuilder_treatments_description">Hvilken plugin burde brukes til håndtering av behandlinger?</string>
     <string name="configbuilder_profile">Profil</string>
     <string name="configbuilder_profile_description">Hvilken profil bør AndroidAPS bruke?</string>
     <string name="configbuilder_aps">APS</string>
@@ -191,8 +189,6 @@
     <string name="smscommunicator_loophasbeendisabled">Loop har blitt deaktivert</string>
     <string name="smscommunicator_loophasbeenenabled">Loop har blitt aktivert</string>
     <string name="smscommunicator_loopisenabled">Loop er aktivert</string>
-    <string name="valuelimitedto">%1$.2f begrenset til %2$.2f</string>
-    <string name="valueoutofrange">»%1$s« er utenfor lovlige grenseverdier</string>
     <string name="smscommunicator_pumpconnectwithcode">For å koble til pumpen, svar med kode %1$s</string>
     <string name="smscommunicator_pumpconnectfail">Tilkobling til pumpen mislyktes</string>
     <string name="smscommunicator_pumpdisconnectwithcode">For å koble fra pumpen i %1$d minutter, svar med koden %2$s</string>
@@ -778,6 +774,7 @@
     <string name="randombg_short">BS</string>
     <string name="tools">Verktøy</string>
     <string name="show_calculation">Vis beregning</string>
+    <string name="show_removed">Vis slettede</string>
     <string name="clearqueueconfirm">Slett køen? All data i køen vil gå tapt!</string>
     <string name="ebstopsloop">Bruk av forlenget bolus funksjon vil deaktivere lukket loop i perioden med forlenget bolus. Vil du virkelig dette?</string>
     <string name="closed_loop_disabled_with_eb">Lukket loop deaktivert på grunn av forlenget bolus</string>
@@ -833,36 +830,6 @@
     <string name="formatwithweight">Alder: %1$.0f Vekt: %2$.0f kg</string>
     <string name="basalpctfromtdd_label">% av basal</string>
     <string name="dpvdefaultprofile">DPV standardprofil</string>
-    <string name="open_humans">Open Humans</string>
-    <string name="finishing_open_humans_setup">Avslutter oppsett av Open Humans…</string>
-    <string name="this_may_take_a_while">Dette kan ta litt tid. Ikke slå av telefonen eller avbryt prosessen.</string>
-    <string name="setup_finished">Oppsett ferdig</string>
-    <string name="your_phone_will_upload_data">Telefonen vil laste opp data til Open Humans snart.</string>
-    <string name="your_phone_is_upload_data">Telefonen laster opp data til Open Humans nå.</string>
-    <string name="setup_failed">Installasjonen mislyktes</string>
-    <string name="there_was_an_error">Det oppstod en feil. Prøv å logge inn igjen for å fortsette. Beklager &amp; Takk!</string>
-    <string name="open_humans_terms">Dette er et verktøy med åpen kildekode som vil kopiere data til Open Humans. Vi har ingen rettigheter til å dele dine data med tredjeparter uten din eksplisitte godkjenning. Alle data som app og prosjektet mottar vil ha en vilkårlig ID som bare vil bli oversendt Open Humans kontoen med din godkjennelse. Du kan avslutte opplasting og slette opplastede data når som helst via www.openhumans.org.</string>
-    <string name="i_understand_and_agree">Jeg forstår og godkjenner.</string>
-    <string name="login">Innlogging</string>
-    <string name="logout">Utlogging</string>
-    <string name="oh_logout_confirmation">Vil du virkelig logge ut og slutte å donere dine data til vitenskapen?</string>
-    <string name="project_member_id">Prosjektmedlems ID: %s</string>
-    <string name="queue_size">Kø størrelse: %d</string>
-    <string name="terms_of_use">Vilkår for bruk</string>
-    <string name="not_logged_in">Ikke logget inn</string>
-    <string name="you_need_to_accept_the_of_use_first">Du må først godta vilkårene for bruk.</string>
-    <string name="successfully_logged_in">Innlogging vellykket</string>
-    <string name="setup_will_continue_in_background">Oppsettet vil bli fullført i bakgrunnen nå. Takk for at du laster opp dine data.\n\nSørg for at AndroidAPS og telefonen er slått på i en kort periode for å fullføre oppsettet.</string>
-    <string name="completing_login">Fullfører innlogging…</string>
-    <string name="donate_your_data_to_science">Doner dine data til vitenskapen</string>
-    <string name="open_humans_short">OH</string>
-    <string name="you_have_been_signed_out_of_open_humans">Du har blitt logget ut fra Open Humans</string>
-    <string name="click_here_to_sign_in_again_if_this_wasnt_on_purpose">Klikk her for å logge inn igjen hvis dette ikke var hensikten.</string>
-    <string name="only_upload_if_connected_to_wifi">Last opp kun dersom du er koblet til WiFi</string>
-    <string name="only_upload_if_charging">Last opp kun ved mobillading</string>
-    <string name="worker_state">Fremdrift: %s</string>
-    <string name="uploaded_data">Opplastede data</string>
-    <string name="the_following_data_will_be_uploaded_to_your_open_humans_account">Følgende data vil bli lastet opp til din Open Humans konto: glukoseverdier, boluser, karbohydrater, careportalhendelser (bortsett fra merknader), forlengede boluser, profilbytter, totale daglige doser, temp basaler, endringer i BS mål, innstillinger, app versjon, mobilmerke og skjermstørrelser. Hemmelig eller privat informasjon som din Nightscout URL eller API secret vil ikke bli lastet opp.</string>
     <string name="setupwizard_pump_riley_link_status">RileyLink status:</string>
     <string name="filter">Filter</string>
     <string name="copytolocalprofile_invalid">Klarte ikke å opprette lokal profil. Profilen er ikke gyldig.</string>
@@ -889,14 +856,28 @@
     <string name="email_address">E-postadresse</string>
     <string name="privacy_settings">Personverninnstillinger</string>
     <string name="privacy_summary">Du kan oppgi valgfri e-postadresse hvis du ønsker å bli varslet om krasj. Dette er ikke en automatisert tjeneste. Du vil bli kontaktet av utviklere ved farlige hendelser.</string>
-    <string name="profile_low_target">Profil lavt blodsukkermål</string>
-    <string name="profile_high_target">Profil høyt blodsukkermål</string>
-    <string name="temp_target_low_target">Midlertidig mål bunnverdi</string>
-    <string name="temp_target_high_target">Midlertidig mål toppverdi</string>
-    <string name="temp_target_value">Midlertidig målverdi</string>
-    <string name="profile_dia">Profil insulinvarighet (DIA)</string>
-    <string name="profile_sensitivity_value">Profil sensitivitetsverdi (IF)</string>
-    <string name="profile_max_daily_basal_value">Profil maksimal basal dose</string>
-    <string name="current_basal_value">Aktiv basal dose</string>
-    <string name="profile_carbs_ratio_value">Profil karbohydratfaktor (IK)</string>
+    <string name="full_sync">Full synkronisering</string>
+    <string name="prime">Prime</string>
+    <string name="ns_sync_options">Synkronisering</string>
+    <string name="ns_upload_summary">Profiler, boluser, karbohydrater, midlertidige basaler lastes opp til NS</string>
+    <string name="ns_upload">Last opp data til NS</string>
+    <string name="ns_receive_profile_store">Hent lagrede profiler</string>
+    <string name="ns_receive_profile_store_summary">Synkroniser profiler fra NS til lokal profil</string>
+    <string name="ns_receive_temp_target">Motta midlertidige BS mål</string>
+    <string name="ns_receive_temp_target_summary">Aksepter midlertidige mål angitt med NS eller NSClient</string>
+    <string name="ns_receive_profile_switch">Motta profilbytter</string>
+    <string name="ns_receive_profile_switch_summary">Aksepter profilbytter som er angitt via NS eller NSClient</string>
+    <string name="ns_receive_offline_event">Motta APS offline hendelser</string>
+    <string name="ns_receive_offline_event_summary">Aksepter APS offline hendelser lagt inn gjennom NS eller NSKlient</string>
+    <string name="ns_receive_insulin">Motta insulin</string>
+    <string name="ns_receive_insulin_summary">Aksepter insulin angitt via NS eller NSClient (enhetene er ikke dosert, kun beregnet mot IOB)</string>
+    <string name="ns_receive_carbs">Motta karbohydrater</string>
+    <string name="ns_receive_carbs_summary">Aksepter karbohydrater angitt med NS eller NSClient</string>
+    <string name="ns_receive_therapy_events">Motta behandlingshendelser</string>
+    <string name="ns_receive_therapy_events_summary">Godta behandlingshendelser (kanyle, insulin, batteribytte osv.) som er lagt inn gjennom NS eller NSClient</string>
+    <string name="ns_receive_cgm">Motta/tilbakefyll CGM data</string>
+    <string name="ns_receive_cgm_summary">Aksepter CGM data fra NS</string>
+    <string name="sms_timeout_while_wating">Tidsavbrudd fordi vi ventet på avslutning av forrige pumpekommunikasjon</string>
+    <string name="smscommunicator_another_bolus_in_queue">Det ligger en annen bolus i køen. Prøv igjen senere.</string>
+    <string name="calculation_in_progress">Beregning pågår</string>
 </resources>
diff --git a/app/src/main/res/values-pl-rPL/exam.xml b/app/src/main/res/values-pl-rPL/exam.xml
index cd25886c64..486ee32dbf 100644
--- a/app/src/main/res/values-pl-rPL/exam.xml
+++ b/app/src/main/res/values-pl-rPL/exam.xml
@@ -129,7 +129,6 @@
     <string name="wronginsulin_label">Błędy w dostarczaniu/wpisywaniu insuliny</string>
     <string name="wronginsulin_whattodo">Co należy zrobić, jeśli otrzymano mniej insuliny niż sugeruje historia pompy, np. z powodu niedrożności, uszkodzonej kaniuli lub zapomnienia o ponownym podłączeniu pompy po prysznicu? </string>
     <string name="wronginsulin_careportal">Usuń dane insuliny z portalu Nightscout aby usunąć je z historii pompy.</string>
-    <string name="wronginsulin_compare">Porównaj wartości w AndroidAPS i historii pompy.</string>
     <string name="wronginsulin_prime">Podaj obliczoną dawkę „pominiętej” insuliny za pomocą strzykawki / wstrzykiwacza lub za pomocą pompy funkcji wypełnienia.</string>
     <string name="wronginsulin_donothing">Nie rób nic i pozwól AndroidAPS na skorygowanie każdego uzyskanego wysokiego stężenia glukozy we krwi.</string>
     <string name="iob_label">Aktywna insulina (IOB)</string>
diff --git a/app/src/main/res/values-pl-rPL/objectives.xml b/app/src/main/res/values-pl-rPL/objectives.xml
index caf00353e4..4fbfd3cd4e 100644
--- a/app/src/main/res/values-pl-rPL/objectives.xml
+++ b/app/src/main/res/values-pl-rPL/objectives.xml
@@ -17,7 +17,6 @@
     <string name="objectives_maxiob_gate">Używaj pętli przez kilka dni i przynajmniej jedną noc bez żadnego alarmu niskiego poziomu, przed obniżeniem docelowego poziomu cukru</string>
     <string name="objectives_autosens_objective">Dostosuj bazę i wartości parametrów jeśli jest to potrzebne, i wtedy uruchom funkcję autosens</string>
     <string name="objectives_autosens_gate">1 tydzień sukcesu w działaniu pętli w ciągu dnia z regularnym wprowadzaniem spożywanych węglowodanów</string>
-    <string name="objectives_ama_objective">Włączanie dodatkowych funkcji do użytku, jak AMA</string>
     <string name="objectives_smb_objective">Włączanie dodatkowych funkcji do użytku, jak SMB (Super Mikro Bolusy)</string>
     <string name="objectives_auto_objective">Włączanie automatyzacji</string>
     <string name="objectives_smb_gate">Musisz przeczytać wiki i zwiększyć maxIOB, aby SMB działało dobrze! Dobrym początkiem jest maxIOB = średni bolus + 3 x maks. dzienna dawka bazowa</string>
diff --git a/app/src/main/res/values-pl-rPL/strings.xml b/app/src/main/res/values-pl-rPL/strings.xml
index 1b2c1b26b2..f52ab95fe6 100644
--- a/app/src/main/res/values-pl-rPL/strings.xml
+++ b/app/src/main/res/values-pl-rPL/strings.xml
@@ -81,8 +81,6 @@
     <string name="careportal">PortalOpieki</string>
     <string name="configbuilder_pump">Pompa</string>
     <string name="configbuilder_pump_description">Którą pompę chcesz wykorzystać do AndroidAPS?</string>
-    <string name="configbuilder_treatments">Terapia</string>
-    <string name="configbuilder_treatments_description">Która wtyczka powinna być używana do obsługi leczenia?</string>
     <string name="configbuilder_profile">Profil</string>
     <string name="configbuilder_profile_description">Który profil będzie używany w AndroidAPS?</string>
     <string name="configbuilder_aps">APS</string>
@@ -190,7 +188,6 @@
     <string name="smscommunicator_loophasbeendisabled">Pętla (Loop) została wyłączona</string>
     <string name="smscommunicator_loophasbeenenabled">Pętla (Loop) została włączona</string>
     <string name="smscommunicator_loopisenabled">Pętla (Loop) jest włączona</string>
-    <string name="valuelimitedto">%1$.2f ograniczone do %2$.2f</string>
     <string name="smscommunicator_pumpconnectwithcode">Aby podłączyć pompę odpowiedz kodem %1$s</string>
     <string name="smscommunicator_pumpconnectfail">Połączenie z pompą nie powiodło się</string>
     <string name="smscommunicator_pumpdisconnectwithcode">Aby odłączyć pompę na %1$d minut odpowiedz kodem %2$s</string>
@@ -827,36 +824,6 @@
     <string name="formatwithweight">Wiek: %1$.0f Waga: %2$.0f kg</string>
     <string name="basalpctfromtdd_label">% bazy</string>
     <string name="dpvdefaultprofile">Domyślny profil DPV</string>
-    <string name="open_humans">Open Humans</string>
-    <string name="finishing_open_humans_setup">Kończenie konfiguracji Open Humans…</string>
-    <string name="this_may_take_a_while">To może chwilę potrwać. Nie wyłączaj telefonu ani tej wtyczki.</string>
-    <string name="setup_finished">Konfiguracja zakończona</string>
-    <string name="your_phone_will_upload_data">Twój telefon wkrótce prześle dane do Open Humans.</string>
-    <string name="your_phone_is_upload_data">Twój telefon przesyła teraz dane do Open Humans.</string>
-    <string name="setup_failed">Konfiguracja nie powiodła się</string>
-    <string name="there_was_an_error">Wystąpił błąd. Spróbuj zalogować się ponownie, aby kontynuować. Przepraszamy &amp; dziękujemy!</string>
-    <string name="open_humans_terms">To jest narzędzie open source, które skopiuje Twoje dane do projektu Open Humans. Nie zachowujemy żadnych praw do dzielenia się Twoimi danymi z osobami trzecimi bez Twojej wyraźnej zgody. Dane, które otrzymują projekt i aplikacja są identyfikowane za pomocą losowego identyfikatora użytkownika i będą bezpiecznie przesyłane na konto Open Humans za Twoją zgodą dla tego procesu. Możesz zatrzymać przesyłanie i usunąć swoje już przesłane dane w dowolnym momencie za pośrednictwem strony www.openhumans.org.</string>
-    <string name="i_understand_and_agree">Rozumiem i zgadzam się.</string>
-    <string name="login">Zaloguj się</string>
-    <string name="logout">Wyloguj się</string>
-    <string name="oh_logout_confirmation">Czy na pewno chcesz się wylogować i zaprzestać przekazywania danych na rzecz nauki?</string>
-    <string name="project_member_id">Identyfikator członka projektu: %s</string>
-    <string name="queue_size">Rozmiar kolejki: %d</string>
-    <string name="terms_of_use">Warunki użytkowania</string>
-    <string name="not_logged_in">Nie zalogowano</string>
-    <string name="you_need_to_accept_the_of_use_first">Najpierw musisz zaakceptować warunki użytkowania.</string>
-    <string name="successfully_logged_in">Pomyślnie zalogowano</string>
-    <string name="setup_will_continue_in_background">Konfiguracja zostanie teraz zakończona w tle. Dziękujemy za przesłanie swoich danych.\n\nProszę nie wyłączaj telefonu ani tej wtyczki jeszcze przez chwilę, aby umożliwić dokończenie się konfiguracji.</string>
-    <string name="completing_login">Kończenie logowania…</string>
-    <string name="donate_your_data_to_science">Przekaż swoje dane na rzecz nauki</string>
-    <string name="open_humans_short">OH</string>
-    <string name="you_have_been_signed_out_of_open_humans">Zostałeś wylogowany z Open Humans</string>
-    <string name="click_here_to_sign_in_again_if_this_wasnt_on_purpose">Kliknij tutaj, aby zalogować się ponownie, jeśli wylogowanie nie było celowe.</string>
-    <string name="only_upload_if_connected_to_wifi">Prześlij tylko jeśli połączono poprzez WiFi</string>
-    <string name="only_upload_if_charging">Prześlij tylko gdy telefon jest ładowany</string>
-    <string name="worker_state">Stan procesu: %s</string>
-    <string name="uploaded_data">Przesłane dane</string>
-    <string name="the_following_data_will_be_uploaded_to_your_open_humans_account">Następujące dane zostaną przesłane na konto Open Humans: wartości Glikemii, bolusy, węglowodany, zdarzenia z portalu opieki (z wyjątkiem notatek), rozszerzone bolusy, przełączenia profilu, całkowite dawki dobowe, bazy tymczasowe, cele tymczasowe, preferencje, wersja aplikacji, model urządzenia i wymiary ekranu. Dane niejawne lub prywatne, takie jak adres URL strony Nightscout lub klucz autoryzacji API, nie zostaną przesłane.</string>
     <string name="setupwizard_pump_riley_link_status">Stan RileyLink:</string>
     <string name="filter">Filtr</string>
     <string name="copytolocalprofile_invalid">Nie można utworzyć profilu lokalnego. Profil jest niepoprawny.</string>
diff --git a/app/src/main/res/values-pt-rBR/objectives.xml b/app/src/main/res/values-pt-rBR/objectives.xml
index 64490f271b..a42d8779a3 100644
--- a/app/src/main/res/values-pt-rBR/objectives.xml
+++ b/app/src/main/res/values-pt-rBR/objectives.xml
@@ -17,7 +17,6 @@
     <string name="objectives_maxiob_gate">Utilizar por alguns dias e pelo menos uma noite sem alarmes de Glic baixa, antes de baixar Glic</string>
     <string name="objectives_autosens_objective">Ajuste as basais e os rácios, se necessário, e, em seguida, active o auto-sens</string>
     <string name="objectives_autosens_gate">1 semana de looping durante o dia com sucesso com entrada regular de hidratos de carbono</string>
-    <string name="objectives_ama_objective">A ativar recursos adicionais para uso durante o dia, como assistente avançado de refeição</string>
     <string name="objectives_smb_objective">Ativando recursos adicionais para uso durante o dia, como SMB</string>
     <string name="objectives_auto_objective">A ativar a automação</string>
     <string name="objectives_smb_gate">Deverá ler a wiki e aumentar a IOB máx para que os SMBs funcionem devidamente! Inicialmente poderá considerar maxIOB=média dos bólus + 3 x a basal máxima</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index e75601545e..b7b9c8c480 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -78,8 +78,6 @@
     <string name="careportal">Careportal</string>
     <string name="configbuilder_pump">Bomba</string>
     <string name="configbuilder_pump_description">Qual a bomba que gostaria de usar com AndroidAPS?</string>
-    <string name="configbuilder_treatments">Tratamentos</string>
-    <string name="configbuilder_treatments_description">Qual o plugin que deve ser usado para os tratamentos?</string>
     <string name="configbuilder_profile">Perfil</string>
     <string name="configbuilder_profile_description">Qual perfil o AndroidAPS deve usar?</string>
     <string name="configbuilder_aps">APS</string>
@@ -177,7 +175,6 @@
     <string name="smscommunicator_loophasbeendisabled">Loop foi desativado</string>
     <string name="smscommunicator_loophasbeenenabled">Loop foi ativado</string>
     <string name="smscommunicator_loopisenabled">Loop ativado</string>
-    <string name="valuelimitedto">%1$.2f limitado a %2$.2f</string>
     <string name="smscommunicator_pumpdisconnected">Bomba desconectada</string>
     <string name="smscommunicator_reconnect">Bomba reconectada</string>
     <string name="smscommunicator_remotecommandnotallowed">O comando remoto não é permitido</string>
diff --git a/app/src/main/res/values-pt-rPT/exam.xml b/app/src/main/res/values-pt-rPT/exam.xml
index 602c5f314d..75a4aa0d5e 100644
--- a/app/src/main/res/values-pt-rPT/exam.xml
+++ b/app/src/main/res/values-pt-rPT/exam.xml
@@ -132,7 +132,6 @@
     <string name="wronginsulin_label">Erros de entrada/administração de insulina</string>
     <string name="wronginsulin_whattodo">O que deve fazer se receber menos insulina do que o histórico da bomba sugere por exemplo devido a uma oclusão, uma cânula danificada ou esquecer-se de reanexar a bomba após um banho? </string>
     <string name="wronginsulin_careportal">Elimine dados de insulina do Nightscout Careportal para removê-lo do histórico da bomba.</string>
-    <string name="wronginsulin_compare">Compare valores no AndroidAPS e no histórico da bomba.</string>
     <string name="wronginsulin_prime">Bólus uma proporção de insulina calculada \'não administrada\' ou com seringa/caneta ou purgando.</string>
     <string name="wronginsulin_donothing">Faça nada e permita que o AndroidAPS corrija qualquer nível de glicose elevado que daí resulte.</string>
     <string name="iob_label">Insulina ativa (IA )</string>
diff --git a/app/src/main/res/values-pt-rPT/objectives.xml b/app/src/main/res/values-pt-rPT/objectives.xml
index 6c2c3e1e45..fc379dd686 100644
--- a/app/src/main/res/values-pt-rPT/objectives.xml
+++ b/app/src/main/res/values-pt-rPT/objectives.xml
@@ -17,7 +17,6 @@
     <string name="objectives_maxiob_gate">Utilizar por alguns dias e pelo menos uma noite sem alarmes de GLIC baixa, antes de baixar GLIC</string>
     <string name="objectives_autosens_objective">Ajuste as basais e os rácios, se necessário, e, em seguida, active o auto-sens</string>
     <string name="objectives_autosens_gate">1 semana de looping durante o dia com sucesso com entrada regular de hidratos de carbono</string>
-    <string name="objectives_ama_objective">A activar recursos adicionais para uso durante o dia, como assistente avançado de refeição</string>
     <string name="objectives_smb_objective">Activando recursos adicionais para uso durante o dia, como SMB</string>
     <string name="objectives_auto_objective">A ativar a automatização</string>
     <string name="objectives_smb_gate">Deverá ler a wiki e aumentar a IA máx para que os SMBs funcionem devidamente! Inicialmente poderá considerar maxIA=média dos bólus + 3 x a basal máxima</string>
diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml
index aa36535290..05032c9a19 100644
--- a/app/src/main/res/values-pt-rPT/strings.xml
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@@ -81,8 +81,6 @@
     <string name="careportal">Careportal</string>
     <string name="configbuilder_pump">Bomba</string>
     <string name="configbuilder_pump_description">Qual a bomba que gostaria de utilizar com AndroidAPS?</string>
-    <string name="configbuilder_treatments">Tratamentos</string>
-    <string name="configbuilder_treatments_description">Qual o plugin que deve ser usado para os tratamentos?</string>
     <string name="configbuilder_profile">Perfil</string>
     <string name="configbuilder_profile_description">Que perfil deverá ser usado pelo AndroidAPS?</string>
     <string name="configbuilder_aps">APS</string>
@@ -191,8 +189,6 @@
     <string name="smscommunicator_loophasbeendisabled">Loop foi desactivado</string>
     <string name="smscommunicator_loophasbeenenabled">Loop foi activado</string>
     <string name="smscommunicator_loopisenabled">Loop activado</string>
-    <string name="valuelimitedto">%1$.2f limitado a %2$.2f</string>
-    <string name="valueoutofrange">»%1$s« está fora dos limites máximos</string>
     <string name="smscommunicator_pumpconnectwithcode">Para ligar a bomba responda com o código %1$s</string>
     <string name="smscommunicator_pumpconnectfail">Ligação à bomba falhou</string>
     <string name="smscommunicator_pumpdisconnectwithcode">Para remover a bomba por %1$d minutos responda com o código %2$s</string>
@@ -833,36 +829,6 @@
     <string name="formatwithweight">Idade: %1$.0f Peso: %2$.0f kg</string>
     <string name="basalpctfromtdd_label">% de basal</string>
     <string name="dpvdefaultprofile">Perfil Padrão DPV</string>
-    <string name="open_humans">Open Humans</string>
-    <string name="finishing_open_humans_setup">A terminar configuração Open Humans...</string>
-    <string name="this_may_take_a_while">Pode demorar um pouco. Não desligue o telefone ou este plugin.</string>
-    <string name="setup_finished">Configuração terminada</string>
-    <string name="your_phone_will_upload_data">Seu telefone fará o envio de dados para Open Humans em breve.</string>
-    <string name="your_phone_is_upload_data">Seu telefone está enviar dados para Open Humans agora.</string>
-    <string name="setup_failed">Falha na configuração</string>
-    <string name="there_was_an_error">Houve um erro. Tente efetuar o login novamente a fim de prosseguir. Desculpe &amp; Obrigado!</string>
-    <string name="open_humans_terms">Esta é uma ferramenta de código aberto que vai copiar seus dados para Open Humans. Nós não retemos direitos de compartilhar seus dados com terceiros sem a sua autorização explícita. Os dados que o projecto e a app recebem são identificados através de um ID de usuário aleatório e só serão transmitidos de forma segura para uma conta Open Humans com a sua autorização desse processo. Pode parar de fazer o envio e excluir seus dados enviados a qualquer momento via www.openhumans.org.</string>
-    <string name="i_understand_and_agree">Compreendo e concordo.</string>
-    <string name="login">Login</string>
-    <string name="logout">Terminar Sessão</string>
-    <string name="oh_logout_confirmation">Deseja realmente encerrar sessão e parar de doar dados para a ciência?</string>
-    <string name="project_member_id">ID Membro do Projecto: %s</string>
-    <string name="queue_size">Tamanho da Fila: %d</string>
-    <string name="terms_of_use">Termos de Utilização</string>
-    <string name="not_logged_in">Não tem sessão iniciada</string>
-    <string name="you_need_to_accept_the_of_use_first">Tem de aceitar os Termos de Utilização.</string>
-    <string name="successfully_logged_in">Login bem sucedido</string>
-    <string name="setup_will_continue_in_background">A configuração será concluída em segundo plano agora. Obrigado por fazer o envio dos seus dados.\n\nPor favor, mantenha este plugin e o telefone ligado por um curto tempo para que a configuração seja concluída.</string>
-    <string name="completing_login">A completar o login…</string>
-    <string name="donate_your_data_to_science">Doar seus dados para a ciência</string>
-    <string name="open_humans_short">OH</string>
-    <string name="you_have_been_signed_out_of_open_humans">Sessão do Open Humans foi encerrada</string>
-    <string name="click_here_to_sign_in_again_if_this_wasnt_on_purpose">Clique aqui para entrar novamente, se não era de propósito.</string>
-    <string name="only_upload_if_connected_to_wifi">Apenas enviar se ligado ao Wi-Fi</string>
-    <string name="only_upload_if_charging">Apenas enviar se estiver a carregar</string>
-    <string name="worker_state">Estado Trabalhador: %s</string>
-    <string name="uploaded_data">Dados Enviados</string>
-    <string name="the_following_data_will_be_uploaded_to_your_open_humans_account">Os seguintes dados serão enviados para sua conta Open Humans: valores de Glicose, bólus, hidratos, eventos do careportal (excepto notas), bólus estendidos, mudanças de perfil, doses diárias totais, basais temporárias, alvos temp, preferências, versão da aplicação, modelo de dispositivo e dimensões da tela. Informações secretas ou privadas como sua URL de Nightscout ou senha de API não serão enviadas.</string>
     <string name="setupwizard_pump_riley_link_status">Estado RileyLink:</string>
     <string name="filter">Filtro</string>
     <string name="copytolocalprofile_invalid">Não é possível criar perfil local. Perfil é inválido.</string>
@@ -889,14 +855,4 @@
     <string name="email_address">Endereço de email</string>
     <string name="privacy_settings">Definições de privacidade</string>
     <string name="privacy_summary">Opcionalmente pode fornecer um endereço de e-mail se quiser ser notificado sobre os erros da app. Este não é um serviço automatizado. Será contactado por desenvolvedores em situações perigosas.</string>
-    <string name="profile_low_target">Perfil Alvo Baixo</string>
-    <string name="profile_high_target">Perfil Alvo Alto</string>
-    <string name="temp_target_low_target">Valor Alvo Temporário Inferior</string>
-    <string name="temp_target_high_target">Valor Alvo Temporário Superior</string>
-    <string name="temp_target_value">Valor Alvo Temporário</string>
-    <string name="profile_dia">Valor Perfil DIA</string>
-    <string name="profile_sensitivity_value">Valor Perfil Sensibilidade</string>
-    <string name="profile_max_daily_basal_value">Valor Perfil Basal Máxima</string>
-    <string name="current_basal_value">Valor Actual Basal</string>
-    <string name="profile_carbs_ratio_value">Valor Perfil Rácio Hidratos</string>
 </resources>
diff --git a/app/src/main/res/values-ro-rRO/exam.xml b/app/src/main/res/values-ro-rRO/exam.xml
index c705d644a5..38b0f74872 100644
--- a/app/src/main/res/values-ro-rRO/exam.xml
+++ b/app/src/main/res/values-ro-rRO/exam.xml
@@ -132,7 +132,6 @@
     <string name="wronginsulin_label">Erori de livrare/introducere insulină</string>
     <string name="wronginsulin_whattodo">Ce trebuie să faci dacă ai primit mai putină insulină decât sugerează istoricul pompei, de exemplu datorită unei ocluzii, a unei canule defecte sau pentru ca ai uitat sa reatașezi pompa după un dus? </string>
     <string name="wronginsulin_careportal">Șterge datele despre insulină din Nightscout Careportal pentru a le înlătura din istoricul pompei.</string>
-    <string name="wronginsulin_compare">Compară valorile din AndroidAPS cu cele din istoricul pompei.</string>
     <string name="wronginsulin_prime">Bolusati o cantitate parțiala de insulina din insulina calculata ca fiind lipsa utilizând seringa/penul sau amorsarea.</string>
     <string name="wronginsulin_donothing">Nu faceți nimic și permiteți AndroidAPS să corecteze valorile mari ale glicemiei.</string>
     <string name="iob_label">Insulină activă (IOB)</string>
diff --git a/app/src/main/res/values-ro-rRO/objectives.xml b/app/src/main/res/values-ro-rRO/objectives.xml
index e42622a963..7d68ac47e5 100644
--- a/app/src/main/res/values-ro-rRO/objectives.xml
+++ b/app/src/main/res/values-ro-rRO/objectives.xml
@@ -17,7 +17,6 @@
     <string name="objectives_maxiob_gate">Se rulează pentru câteva zile și cel puțin o noapte fără a avea alarme de glicemie mică înainte de scăderea țintei</string>
     <string name="objectives_autosens_objective">Ajustarea bazalelor și a factorilor dacă este necesar și apoi activarea auto-sens</string>
     <string name="objectives_autosens_gate">O săptămână de buclă închisă încheiată cu succes în condițiile introducerii regulate a carbohidraților</string>
-    <string name="objectives_ama_objective">Activarea unor facilități adiționale pentru funcționarea în timpul zilei, cum ar fi advanced meal assist</string>
     <string name="objectives_smb_objective">Se activează opțiuni pentru uzul în timpul zilei, cum ar fi SMB</string>
     <string name="objectives_auto_objective">Activarea automatizării</string>
     <string name="objectives_smb_gate">Trebuie sa citiți wiki și să măriți maxIOB pentru a obține SMB corect! Un start bun este maxIOB=media bolusurilor + 3x maxima bazalei din zi</string>
diff --git a/app/src/main/res/values-ro-rRO/strings.xml b/app/src/main/res/values-ro-rRO/strings.xml
index eeb6707fdd..48f9e922ee 100644
--- a/app/src/main/res/values-ro-rRO/strings.xml
+++ b/app/src/main/res/values-ro-rRO/strings.xml
@@ -81,8 +81,6 @@
     <string name="careportal">Careportal</string>
     <string name="configbuilder_pump">Pompă</string>
     <string name="configbuilder_pump_description">Ce pompă doriți să folosiți cu AndroidAPS?</string>
-    <string name="configbuilder_treatments">Tratamente</string>
-    <string name="configbuilder_treatments_description">Ce plugin doriți să folosiți pentru gestionarea tratamentelor?</string>
     <string name="configbuilder_profile">Profil</string>
     <string name="configbuilder_profile_description">Ce profil doriți să folosească AndroidAPS?</string>
     <string name="configbuilder_aps">APS</string>
@@ -190,7 +188,6 @@
     <string name="smscommunicator_loophasbeendisabled">Bucla a fost dezactivată</string>
     <string name="smscommunicator_loophasbeenenabled">Bucla a fost activată</string>
     <string name="smscommunicator_loopisenabled">Bucla este activată</string>
-    <string name="valuelimitedto">%1$.2f este limitată la %2$.2f</string>
     <string name="smscommunicator_pumpconnectwithcode">Pentru a conecta pompa raspundeti cu codul %1$s</string>
     <string name="smscommunicator_pumpconnectfail">Conectarea cu pompa a esuat</string>
     <string name="smscommunicator_pumpdisconnectwithcode">Pentru a deconecta pompa timp de %1$d minute, răspundeți cu: %2$s</string>
@@ -830,36 +827,6 @@
     <string name="formatwithweight">Vârstă: %1$.0f Greutate: %2$.0f kg</string>
     <string name="basalpctfromtdd_label">% din bazală</string>
     <string name="dpvdefaultprofile">Profil implicit DPV</string>
-    <string name="open_humans">Open Humans</string>
-    <string name="finishing_open_humans_setup">Finalizare configurare Open Humans…</string>
-    <string name="this_may_take_a_while">Acest lucru poate dura un timp. Nu opriți telefonul și nici acest plugin.</string>
-    <string name="setup_finished">Configurare terminată</string>
-    <string name="your_phone_will_upload_data">Telefonul tău va încărca date către Open Humans în curând.</string>
-    <string name="your_phone_is_upload_data">Telefonul tău încarcă date în Open Humans acum.</string>
-    <string name="setup_failed">Configurare eșuată</string>
-    <string name="there_was_an_error">A apărut o eroare. Te rugăm să încerci să te autentifici din nou pentru a continua. Ne pare rău. Mulțumim!</string>
-    <string name="open_humans_terms">Aceasta este un instrument open source care va copia datele tale în Open Humans. Nu avem dreptul sa împărtășim datele tale cu terțe părți fără autorizație explicită. Datele pe care le primesc proiectul și aplicația sunt identificate printr-un ID de utilizator aleatoriu și vor fi transmise în siguranță într-un cont Open Humans numai cu autorizarea acestui proces. Poți înceta încărcarea și șterge datele oricând folosind www.openhumans.org.</string>
-    <string name="i_understand_and_agree">Înţeleg şi sunt de acord.</string>
-    <string name="login">Autentificare</string>
-    <string name="logout">Deconectare</string>
-    <string name="oh_logout_confirmation">Sigur doriți să vă deconectați și să încetați să donați date in scopuri științifice?</string>
-    <string name="project_member_id">ID Membru proiect: %s</string>
-    <string name="queue_size">Dimensiunea cozii: %d</string>
-    <string name="terms_of_use">Condiții de utilizare</string>
-    <string name="not_logged_in">Nu ești autentificat(ă)</string>
-    <string name="you_need_to_accept_the_of_use_first">Trebuie mai întâi să acceptați condițiile de utilizare.</string>
-    <string name="successfully_logged_in">Conectare reușită</string>
-    <string name="setup_will_continue_in_background">Setarea va fi finalizată în fundal acum. Vă mulțumim pentru încărcarea datelor.\n\nVă rugăm să păstrați acest plugin și telefonul pornit pentru o scurtă perioadă de timp astfel încât setarea să se finalizeze.</string>
-    <string name="completing_login">Finalizare autentificare…</string>
-    <string name="donate_your_data_to_science">Donează datele în scopuri științifice</string>
-    <string name="open_humans_short">OH</string>
-    <string name="you_have_been_signed_out_of_open_humans">Ai fost deconectat de la Open Humans</string>
-    <string name="click_here_to_sign_in_again_if_this_wasnt_on_purpose">Dați click aici pentru a vă conecta din nou, dacă a fost din greșeală.</string>
-    <string name="only_upload_if_connected_to_wifi">Încarcă numai pe conexiune WiFi</string>
-    <string name="only_upload_if_charging">Încărca numai dacă telefonul este la încărcat</string>
-    <string name="worker_state">Stare prelucrare: %s</string>
-    <string name="uploaded_data">Date încărcate</string>
-    <string name="the_following_data_will_be_uploaded_to_your_open_humans_account">Următoarele date vor fi încărcate în contul Open Humans: glicemii, evenimente careportal (cu excepția notelor), bolusuri extinse, schimbări de profil, doze zilnice totale, bazale temporare, ținte temporare, preferințe, versiunea aplicației, model dispozitiv și dimensiunile ecranului. Informațiile secrete sau private, cum ar fi URL-ul Nightscout sau secretul API, nu vor fi încărcate.</string>
     <string name="setupwizard_pump_riley_link_status">Stare RileyLink:</string>
     <string name="filter">Filtru</string>
     <string name="copytolocalprofile_invalid">Nu se poate crea profilul local. Profilul este invalid.</string>
diff --git a/app/src/main/res/values-ru-rRU/exam.xml b/app/src/main/res/values-ru-rRU/exam.xml
index d5556fbaf4..676869654a 100644
--- a/app/src/main/res/values-ru-rRU/exam.xml
+++ b/app/src/main/res/values-ru-rRU/exam.xml
@@ -134,7 +134,7 @@ Context | Edit Context</string>
     <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_compare">Сравните значения в истории AndroidAPS и помпы (если помпа это поддерживает).</string>
     <string name="wronginsulin_prime">Рассчитать и ввести «пропущенный» вами инсулин шприцем/ручкой или через кнопку заполнения канюли.</string>
     <string name="wronginsulin_donothing">Ничего не делать и позволить AndroidAPS исправить возможный высокий уровень ГК.</string>
     <string name="iob_label">Активный инсулин (IOB)</string>
diff --git a/app/src/main/res/values-ru-rRU/objectives.xml b/app/src/main/res/values-ru-rRU/objectives.xml
index 53d36c9095..65f4dd716f 100644
--- a/app/src/main/res/values-ru-rRU/objectives.xml
+++ b/app/src/main/res/values-ru-rRU/objectives.xml
@@ -17,7 +17,6 @@
     <string name="objectives_maxiob_gate">Работа несколько дней и по кр мере одну ночь без срабатывания оповещений о низкой ГК</string>
     <string name="objectives_autosens_objective">Настраиваем базал и коэффициенты с последующей активацией auto-sens</string>
     <string name="objectives_autosens_gate">1 неделя успешной дневной работы с регулярным введением углеводов</string>
-    <string name="objectives_ama_objective">Активация таких доп функций для дневного времени как расширенный калькулятор болюса advanced meal assist</string>
     <string name="objectives_smb_objective">Активация таких доп функций для дневного времени как супер микро болюс SMB</string>
     <string name="objectives_auto_objective">Включение автоматизации</string>
     <string name="objectives_smb_gate">Прочтите wiki и увеличьте maxIOB чтобы супер микро болюс SMB заработал как положено! Хорошее начало – maxIOB = средний болюс на еду + троекратный максимальный суточный базал</string>
diff --git a/app/src/main/res/values-ru-rRU/strings.xml b/app/src/main/res/values-ru-rRU/strings.xml
index b9edc29846..6804c6672a 100644
--- a/app/src/main/res/values-ru-rRU/strings.xml
+++ b/app/src/main/res/values-ru-rRU/strings.xml
@@ -81,8 +81,6 @@
     <string name="careportal">Портал лечения / назначений</string>
     <string name="configbuilder_pump">помпа</string>
     <string name="configbuilder_pump_description">Какой помпой вы хотели бы пользоваться с AndroidAPS?</string>
-    <string name="configbuilder_treatments">назначения</string>
-    <string name="configbuilder_treatments_description">Каким плагином пользоваться для выполнения назначений?</string>
     <string name="configbuilder_profile">профиль</string>
     <string name="configbuilder_profile_description">Какой профиль следует использовать в AndroidAPS?</string>
     <string name="configbuilder_aps">система ИПЖ</string>
@@ -191,8 +189,6 @@
     <string name="smscommunicator_loophasbeendisabled">зцикл был деактивирован</string>
     <string name="smscommunicator_loophasbeenenabled">зцикл был активирован</string>
     <string name="smscommunicator_loopisenabled">зцикл работает</string>
-    <string name="valuelimitedto">%1$.2f ограничено до %2$.2f</string>
-    <string name="valueoutofrange">»%1$s«за пределами жестких ограничений</string>
     <string name="smscommunicator_pumpconnectwithcode">Чтобы подсоединить помпу ответьте кодом %1$s</string>
     <string name="smscommunicator_pumpconnectfail">Ошибка подключения к помпе</string>
     <string name="smscommunicator_pumpdisconnectwithcode">Для разъединения с помпой на %1$d мин ответьте кодом %2$s</string>
@@ -836,36 +832,6 @@ Context | Edit Context</string>
     <string name="formatwithweight">Возраст: %1$.0f Вес: %2$.0f кг</string>
     <string name="basalpctfromtdd_label">% базального</string>
     <string name="dpvdefaultprofile">Значение для профиля по умолчанию</string>
-    <string name="open_humans">Проект Open Humans</string>
-    <string name="finishing_open_humans_setup">Завершение установки Open Humans…</string>
-    <string name="this_may_take_a_while">Это может занять некоторое время. Не выключайте телефон или этот плагин.</string>
-    <string name="setup_finished">Установка завершена</string>
-    <string name="your_phone_will_upload_data">Ваш телефон скоро загрузит данные на Open Humans.</string>
-    <string name="your_phone_is_upload_data">Ваш телефон сейчас загружает данные на Open Humans.</string>
-    <string name="setup_failed">Установка не выполнена</string>
-    <string name="there_was_an_error">Произошла ошибка. &amp; для продолжения попробуйте заново войти в систему!</string>
-    <string name="open_humans_terms">Это проект с открытым исходным кодом, который будет копировать ваши данные на Open Humans. Мы не будем обмениваться вашими данными с третьими лицами без вашего явного разрешения. Данные, отправляемые на проект и приложение, идентифицируются с помощью случайного идентификатора и будут безопасно передаваться на учетную запись Open Humans при вашем одобрении этого процесса. Вы можете остановить загрузку и удалить загруженные данные в любое время здесь: www.openhumans.org.</string>
-    <string name="i_understand_and_agree">Я понимаю и соглашаюсь.</string>
-    <string name="login">Вход</string>
-    <string name="logout">Выход</string>
-    <string name="oh_logout_confirmation">Вы действительно хотите выйти из системы и перестать отправлять данные исследователям?</string>
-    <string name="project_member_id">Идентификатор участника проекта: %s</string>
-    <string name="queue_size">Объем данных в очереди на отправку %d</string>
-    <string name="terms_of_use">Условия пользования</string>
-    <string name="not_logged_in">Не выполнен вход</string>
-    <string name="you_need_to_accept_the_of_use_first">Сначала нужно принять условия использования.</string>
-    <string name="successfully_logged_in">Вход выполнен успешно</string>
-    <string name="setup_will_continue_in_background">Настройка будет завершена в фоновом режиме. Спасибо, что загрузила ваши данные.\n\nНе выключайте этот плагин и телефон до завершения установки.</string>
-    <string name="completing_login">Завершение входа в систему…</string>
-    <string name="donate_your_data_to_science">Передайте свои данные исследователям</string>
-    <string name="open_humans_short">OH</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="only_upload_if_connected_to_wifi">Загружать только при подключении к WiFi</string>
-    <string name="only_upload_if_charging">Загружать только при зарядке</string>
-    <string name="worker_state">Рабочее состояние: %s</string>
-    <string name="uploaded_data">Загруженные данные</string>
-    <string name="the_following_data_will_be_uploaded_to_your_open_humans_account">На ваш аккаунт Open Humans будут загружены следующие данные: значения ГК, события careportal (за исключением примечаний), пролонгированные болюсы, переключения профиля, суммарные суточные дозы, временные базалы, временные цели, настройки, версии приложения, модель устройства и размеры экрана. Секретная или конфиденциальная информация, такая как адрес вашего сайта Nightscout или API secret, не будет загружена.</string>
     <string name="setupwizard_pump_riley_link_status">Статус RileyLink:</string>
     <string name="filter">Фильтр</string>
     <string name="copytolocalprofile_invalid">Не удается создать локальный профиль. Настройки профиля неправильны.</string>
@@ -892,16 +858,6 @@ Context | Edit Context</string>
     <string name="email_address">Адрес электронной почты</string>
     <string name="privacy_settings">Настройки конфиденцальности</string>
     <string name="privacy_summary">Вы можете указать дополнительно адрес электронной почты, если хотите получать уведомления о сбоях приложения; что является не автоматизированной рассылкой, а способом связи с разработчиками в опасных ситуациях.</string>
-    <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">Максимальное значение базала в профиле</string>
-    <string name="current_basal_value">Текущее значение базала</string>
-    <string name="profile_carbs_ratio_value">Коэффициент углеводов в профиле</string>
     <string name="full_sync">Полная синхронизация</string>
     <string name="prime">Заполнение инфузионной системы</string>
     <string name="ns_sync_options">Синхронизация</string>
@@ -913,6 +869,8 @@ Context | Edit Context</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">Принимать события APS введенные через NS или клиент NS автономно</string>
     <string name="ns_receive_insulin">Принимать инсулин</string>
     <string name="ns_receive_insulin_summary">Принимать инсулин, введенный через NS или NSClient (не подается, только рассчитывается как активный IOB)</string>
     <string name="ns_receive_carbs">Принимать углеводы</string>
@@ -921,4 +879,7 @@ Context | Edit Context</string>
     <string name="ns_receive_therapy_events_summary">Принимать события терапии (катетер, инсулин, изменение батареи и т. д.) через NS или NSClient</string>
     <string name="ns_receive_cgm">Получать/заполнять данные мониторинга CGM</string>
     <string name="ns_receive_cgm_summary">Принимать данные мониторинга CGM из NS</string>
+    <string name="sms_timeout_while_wating">Таймаут во время ожидания окончания предыдущего соединения с помпой</string>
+    <string name="smscommunicator_another_bolus_in_queue">В очереди есть еще один болюс. Повторите попытку позже.</string>
+    <string name="calculation_in_progress">Идет подсчет</string>
 </resources>
diff --git a/app/src/main/res/values-sk-rSK/exam.xml b/app/src/main/res/values-sk-rSK/exam.xml
index 57b0fca5d7..2b31360e17 100644
--- a/app/src/main/res/values-sk-rSK/exam.xml
+++ b/app/src/main/res/values-sk-rSK/exam.xml
@@ -132,7 +132,7 @@
     <string name="wronginsulin_label">Chyby pri podávaní inzulínu</string>
     <string name="wronginsulin_whattodo">Čo by ste mali urobiť, pokiaľ ste dostali menej inzulínu, než ukazuje história pumpy, napr. v dôsledku oklúzie, vadnej kanyly, alebo zabudnutia na opätovné pripojenie pumpy po sprche?</string>
     <string name="wronginsulin_careportal">Odstráňte dáta z Nightscoutu pre odstránenie z histórie pumpy.</string>
-    <string name="wronginsulin_compare">Porovnajte hodnoty v AndroidAPS a histórii pumpy.</string>
+    <string name="wronginsulin_compare">Porovnaj hodnoty v AndroidAPS z históriou v tvojej pumpe (ak pumpa má túto funkciu).</string>
     <string name="wronginsulin_prime">Pošlite bolus na vypočítaný „chýbajúci“ inzulín buď injekčnou striekačkou, alebo perom, alebo pomocou plnenia na pumpe.</string>
     <string name="wronginsulin_donothing">Nerobte nič a dovoľte AndroidAPS upraviť akúkoľvek výslednú vysokú hladinu glukózy v krvi.</string>
     <string name="iob_label">Aktívny inzulín (IOB)</string>
diff --git a/app/src/main/res/values-sk-rSK/objectives.xml b/app/src/main/res/values-sk-rSK/objectives.xml
index a89964c316..8960f81abd 100644
--- a/app/src/main/res/values-sk-rSK/objectives.xml
+++ b/app/src/main/res/values-sk-rSK/objectives.xml
@@ -17,7 +17,6 @@
     <string name="objectives_maxiob_gate">Používať uzavretý okruh niekoľko dní s aspoň jednou nocou bez alarmov na nízku glykémiu</string>
     <string name="objectives_autosens_objective">Upraviť bazály a pomery, ak je to potrebné, a povoliť automatickú detekciu citlivosti na inzulín</string>
     <string name="objectives_autosens_gate">Jeden týždeň úspešného používania s bežným príjmom sacharidov</string>
-    <string name="objectives_ama_objective">Povolenie doplnkových funkcií pre každodenné použitie, ako napr. pokročilý asistent jedál (AMA)</string>
     <string name="objectives_smb_objective">Povoliť ďalšie funkcie pre bežné používanie ako SMB</string>
     <string name="objectives_auto_objective">Povolenie automatiky</string>
     <string name="objectives_smb_gate">Prečítať si dokumentáciu a zvýšiť maximálne IOB, aby mohlo správne fungovať SMB! Pre začiatok sa dá použiť veľkosť bežného bolusu + 3x maximálny denný bazál</string>
diff --git a/app/src/main/res/values-sk-rSK/strings.xml b/app/src/main/res/values-sk-rSK/strings.xml
index 936d9a2b36..a935d2f922 100644
--- a/app/src/main/res/values-sk-rSK/strings.xml
+++ b/app/src/main/res/values-sk-rSK/strings.xml
@@ -81,8 +81,6 @@
     <string name="careportal">Starostlivosť</string>
     <string name="configbuilder_pump">Pumpa</string>
     <string name="configbuilder_pump_description">Akú pumpu chcete používať s AndroidAPS?</string>
-    <string name="configbuilder_treatments">Ošetrenia</string>
-    <string name="configbuilder_treatments_description">Aký modul chcete používať pre spracovanie ošetrení?</string>
     <string name="configbuilder_profile">Profil</string>
     <string name="configbuilder_profile_description">Aký profil má používať AndroidAPS?</string>
     <string name="configbuilder_aps">APS</string>
@@ -191,8 +189,6 @@
     <string name="smscommunicator_loophasbeendisabled">Uzavretý okruh bol deaktivovaný</string>
     <string name="smscommunicator_loophasbeenenabled">Uzavretý okruh bol aktivovaný</string>
     <string name="smscommunicator_loopisenabled">Uzavretý okruh je aktivovaný</string>
-    <string name="valuelimitedto">%1$.2f obmedzené na %2$.2f</string>
-    <string name="valueoutofrange">»%1$s« je mimo pevne nastavené limity</string>
     <string name="smscommunicator_pumpconnectwithcode">Ak chcete pripojiť pumpu, odpovedzte pomocou SMS s kódom %1$s</string>
     <string name="smscommunicator_pumpconnectfail">Pripojenie k pumpe zlyhalo</string>
     <string name="smscommunicator_pumpdisconnectwithcode">Ak chcete odpojiť pumpu na %1$d minút, odpovedzte pomocou SMS s kódom %2$s</string>
@@ -834,36 +830,6 @@
     <string name="formatwithweight">Vek: %1$.0f Hmotnosť: %2$.0f kg</string>
     <string name="basalpctfromtdd_label">% bazálu</string>
     <string name="dpvdefaultprofile">Predvolený DPV profil</string>
-    <string name="open_humans">Open Humans</string>
-    <string name="finishing_open_humans_setup">Dokončovanie nastavenia Open Humans...</string>
-    <string name="this_may_take_a_while">Môže to chvíľu trvať. Nevypínajte Váš telefón ani tento modul.</string>
-    <string name="setup_finished">Nastavenie dokončené</string>
-    <string name="your_phone_will_upload_data">Váš telefón čoskoro nahrá dáta na Open Humans.</string>
-    <string name="your_phone_is_upload_data">Váš telefón práve nahráva dáta na Open Humans.</string>
-    <string name="setup_failed">Nastavenie zlyhalo</string>
-    <string name="there_was_an_error">Vyskytla sa chyba. Prosím, skúste sa znova prihlásiť, aby ste mohli pokračovať. Prepáčte &amp; Ďakujem!</string>
-    <string name="open_humans_terms">Jedná sa o open source nástroj, ktorý skopíruje vaše dáta do Open Humans. Zachovávame práva na zdieľanie vašich údajov s tretími stranami bez vašeho výslovného povolenia. Dáta, ktoré projekt a aplikácia obdržia, sú identifikované pomocou náhodného ID užívateľa a budú bezpečne prenášané iba na účet Open Humans a len s vaším povolením. Môžete kedykoľvek zastaviť odosielanie a zmazať Vaše dáta prostredníctvom adresy www.openhumans.org.</string>
-    <string name="i_understand_and_agree">Rozumiem a potvrdzujem.</string>
-    <string name="login">Prihlásenie</string>
-    <string name="logout">Odhlásiť</string>
-    <string name="oh_logout_confirmation">Naozaj sa chceš odhlásiť a prestať tak prispievať údajmi vede?</string>
-    <string name="project_member_id">ID člena projektu: %s</string>
-    <string name="queue_size">Veľkosť fronty: %d</string>
-    <string name="terms_of_use">Podmienky používania</string>
-    <string name="not_logged_in">Neprihlásený</string>
-    <string name="you_need_to_accept_the_of_use_first">Musíte najskôr akceptovať podmienky používania.</string>
-    <string name="successfully_logged_in">Prihlásenie úspešné</string>
-    <string name="setup_will_continue_in_background">Nastavenie bude teraz dokončené na pozadí. Vďaka za odoslanie vašich údajov.\n\nProsím, ponechajte tento modul a Váš telefón na chvíľu zapnutý, kým sa dokončí nastavenie.</string>
-    <string name="completing_login">Dokončuje sa prihlasovanie…</string>
-    <string name="donate_your_data_to_science">Darujte svoje údaje vede</string>
-    <string name="open_humans_short">OH</string>
-    <string name="you_have_been_signed_out_of_open_humans">Boli ste odhlásený z Open Humans</string>
-    <string name="click_here_to_sign_in_again_if_this_wasnt_on_purpose">Kliknite sem, ak sa chcete prihlásiť znova, v prípade, že sa to stalo nedopatrením.</string>
-    <string name="only_upload_if_connected_to_wifi">Odoslať iba ak ste pripojený k Wi-Fi</string>
-    <string name="only_upload_if_charging">Odoslať iba pri nabíjaní</string>
-    <string name="worker_state">Stav procesu: %s</string>
-    <string name="uploaded_data">Odoslané údaje</string>
-    <string name="the_following_data_will_be_uploaded_to_your_open_humans_account">Následujúce dáta budú nahraté do vašeho účtu Open Humans: hodnoty glykémie, bolusy, sacharidy, udalosti starostlivosti (okrem poznámok), rozložené bolusy, prepnutia profilov, celkové denné dávky, dočasné bazály, nastavenia, verzia aplikácie, model zariadenia a rozmery obrazovky. Tajné, alebo súkromné informácie, ako je URL, alebo API heslo vašeho Nightscoutu, nahraté nebudú.</string>
     <string name="setupwizard_pump_riley_link_status">Stav RileyLinku:</string>
     <string name="filter">Filter</string>
     <string name="copytolocalprofile_invalid">Nie je možné vytvoriť lokálny profil. Profil je neplatný.</string>
@@ -890,16 +856,6 @@
     <string name="email_address">Emailová adresa</string>
     <string name="privacy_settings">Nastavenia súkromia</string>
     <string name="privacy_summary">Pokiaľ chcete byť upozornení na zlyhanie aplikácie, môžete zadať voliteľne e-mailovú adresu. Toto nie je automatizovaná služba. Vývojári vás budú kontaktovať v nebezpečných situáciách.</string>
-    <string name="profile_low_target">Dolný cieľ profilu</string>
-    <string name="profile_high_target">Horný cieľ profilu</string>
-    <string name="temp_target_low_target">Dolná hodnota dočasného cieľa</string>
-    <string name="temp_target_high_target">Horná hodnota dočasného cieľa</string>
-    <string name="temp_target_value">Hodnota dočasného cieľa</string>
-    <string name="profile_dia">Profilová hodnota DIA</string>
-    <string name="profile_sensitivity_value">Profilová hodnota citlivosti</string>
-    <string name="profile_max_daily_basal_value">Profilová maximálna hodnota bazálu</string>
-    <string name="current_basal_value">Aktuálna hodnota bazálu</string>
-    <string name="profile_carbs_ratio_value">Profilový inzulino-sacharidový pomer</string>
     <string name="full_sync">Úplná synchronizácia</string>
     <string name="prime">Plnenie</string>
     <string name="ns_sync_options">Synchronizácia</string>
@@ -911,6 +867,8 @@
     <string name="ns_receive_temp_target_summary">Prijať dočasné ciele zadané prostredníctvom NS, alebo NSClienta</string>
     <string name="ns_receive_profile_switch">Prijímať prepnutia profilov</string>
     <string name="ns_receive_profile_switch_summary">Prijať prepnutia profilov zadané prostredníctvom NS, alebo NSClienta</string>
+    <string name="ns_receive_offline_event">Prijímať udalosti APS offline</string>
+    <string name="ns_receive_offline_event_summary">Prijať APS offline udalosti zadané prostredníctvom NS, alebo NSClienta</string>
     <string name="ns_receive_insulin">Prijímať inzulín</string>
     <string name="ns_receive_insulin_summary">Prijať inzulín vložený cez NS, alebo NSClient (nie je dodaný, iba započítaný do IOB)</string>
     <string name="ns_receive_carbs">Prijímať sacharidy</string>
@@ -919,4 +877,7 @@
     <string name="ns_receive_therapy_events_summary">Prijať liečebné udalosti (výmena setu, inzulínu, batérie atď.) zadané prostredníctvom NS, alebo NSClienta</string>
     <string name="ns_receive_cgm">Prijímať/doplňovať glykémie</string>
     <string name="ns_receive_cgm_summary">Prijať CGM dáta z NS</string>
+    <string name="sms_timeout_while_wating">Vypršal časový limit pri čakaní na dokončenie predchádzajúcej komunikácie s pumpou</string>
+    <string name="smscommunicator_another_bolus_in_queue">Vo fronte je ďalší bolus. Skúste to znovu neskôr.</string>
+    <string name="calculation_in_progress">Prebieha výpočet</string>
 </resources>
diff --git a/app/src/main/res/values-sv-rSE/exam.xml b/app/src/main/res/values-sv-rSE/exam.xml
index 8882927073..8812d30b60 100644
--- a/app/src/main/res/values-sv-rSE/exam.xml
+++ b/app/src/main/res/values-sv-rSE/exam.xml
@@ -132,7 +132,6 @@
     <string name="wronginsulin_label">Fel i bolusinmatning</string>
     <string name="wronginsulin_whattodo">Vad ska du göra om du fått mindre insulin än vad pumpens historik visar, t.ex. på grund av en ocklusion, en felaktig kanyl eller om du glömt att sätta fast pumpen efter en dusch? </string>
     <string name="wronginsulin_careportal">Ta bort insulindata från Nightscout för att ta bort den från pumpens historik.</string>
-    <string name="wronginsulin_compare">Jämför värden i AndroidAPS och pumphistoriken.</string>
     <string name="wronginsulin_prime">Ge en bolus med en del av det insulin du saknar antingen med penna eller genom att använda förfyllningsfunktionen.</string>
     <string name="wronginsulin_donothing">Gör ingenting och låt AndroidAPS korrigera eventuella höga blodglukosnivåer.</string>
     <string name="iob_label">Aktivt Insulin (IOB)</string>
diff --git a/app/src/main/res/values-sv-rSE/objectives.xml b/app/src/main/res/values-sv-rSE/objectives.xml
index 669c70e38e..a6b3f3e1b4 100644
--- a/app/src/main/res/values-sv-rSE/objectives.xml
+++ b/app/src/main/res/values-sv-rSE/objectives.xml
@@ -17,7 +17,6 @@
     <string name="objectives_maxiob_gate">Kör några dagar och åtminstone en natt utan larm för lågt BG innan du sänker målvärdet för BG</string>
     <string name="objectives_autosens_objective">Justera basaler och kvoter om det behövs. Aktivera sedan autosens</string>
     <string name="objectives_autosens_gate">1 veckas lyckad looping dagtid, där alla måltider lagts in</string>
-    <string name="objectives_ama_objective">Aktiverar extra funktioner som kan användas dagtid, såsom avancerad måltidsassistans, AMA</string>
     <string name="objectives_smb_objective">Aktiverar ytterligare funktioner för användning dagtid, t ex SMB</string>
     <string name="objectives_auto_objective">Aktivera automatisering</string>
     <string name="objectives_smb_gate">Du måste läsa på wikin och öka max IOB för att få SMB att fungera bra. En bra start är att sätta max IOB till din genomsnittliga måltidsbolus plus 3 gånger den högsta basalen du har under ett dygn</string>
diff --git a/app/src/main/res/values-sv-rSE/strings.xml b/app/src/main/res/values-sv-rSE/strings.xml
index f86149ac29..3a808d3a30 100644
--- a/app/src/main/res/values-sv-rSE/strings.xml
+++ b/app/src/main/res/values-sv-rSE/strings.xml
@@ -82,8 +82,6 @@ Eversense-appen.</string>
     <string name="careportal">Careportal</string>
     <string name="configbuilder_pump">Pump</string>
     <string name="configbuilder_pump_description">Vilken pump vill du använda med AndroidAPS?</string>
-    <string name="configbuilder_treatments">Behandlingar</string>
-    <string name="configbuilder_treatments_description">Vilket insticksprogram ska användas för att hantera behandlingar?</string>
     <string name="configbuilder_profile">Profil</string>
     <string name="configbuilder_profile_description">Vilken profil ska AndroidAPS använda?</string>
     <string name="configbuilder_aps">APS</string>
@@ -192,8 +190,6 @@ Eversense-appen.</string>
     <string name="smscommunicator_loophasbeendisabled">Loop inaktiverad.</string>
     <string name="smscommunicator_loophasbeenenabled">Loop aktiverad</string>
     <string name="smscommunicator_loopisenabled">Loop är aktiverad</string>
-    <string name="valuelimitedto">%1$.2f begränsat till %2$.2f</string>
-    <string name="valueoutofrange">»%1$s« är utanför de hårda gränserna</string>
     <string name="smscommunicator_pumpconnectwithcode">För att ansluta pumpen, svara med kod %1$s</string>
     <string name="smscommunicator_pumpconnectfail">Anslutning till pump misslyckades</string>
     <string name="smscommunicator_pumpdisconnectwithcode">För att koppla från pumpen i %1$d minuter, svara med kod %2$s</string>
@@ -779,6 +775,7 @@ Eversense-appen.</string>
     <string name="randombg_short">BG</string>
     <string name="tools">Verktyg</string>
     <string name="show_calculation">Visa beräkning</string>
+    <string name="show_removed">Visa borttagna</string>
     <string name="clearqueueconfirm">Allt data som inte synkats kommer att kastas bort. Är du säker på att du vill tömma kön?</string>
     <string name="ebstopsloop">OBS! Om du använder förlängd bolus, kommer du inte längre vara i Closed Loop under den tiden som den förlängda bolusen är igång. Vill du fortsätta?</string>
     <string name="closed_loop_disabled_with_eb">Closed Loop-läget inaktiverat pga att en förlängd bolus är aktiv</string>
@@ -834,36 +831,6 @@ Eversense-appen.</string>
     <string name="formatwithweight">Ålder: %1$.0f Vikt: %2$.0f kg</string>
     <string name="basalpctfromtdd_label">% av basal</string>
     <string name="dpvdefaultprofile">DPV-standardprofil</string>
-    <string name="open_humans">Open Humans</string>
-    <string name="finishing_open_humans_setup">Slutför Open Humans-konfiguration…</string>
-    <string name="this_may_take_a_while">Det här kan ta ett tag. Avbryt inte den här processen.</string>
-    <string name="setup_finished">Konfigurationen slutförd</string>
-    <string name="your_phone_will_upload_data">Din telefon kommer att ladda upp data till Open Humans snart.</string>
-    <string name="your_phone_is_upload_data">Din telefon laddar upp data till Open Humans nu.</string>
-    <string name="setup_failed">Konfiguration misslyckades</string>
-    <string name="there_was_an_error">Ett fel uppstod. Försök att logga in igen för att fortsätta. Tack!</string>
-    <string name="open_humans_terms">Detta är ett open source-verktyg som kommer att ladda upp dina data till Open Humans. Vi förbehåller oss inga rättigheter att dela dina uppgifter med tredje part utan ditt uttryckliga tillstånd. De data som projektet och appen tar emot identifieras via ett slumpmässigt användar-ID och kommer endast att överföras på ett säkert sätt till ett Open Humans-konto om du tillåter det. Du kan när som helst sluta ladda upp och radera dina uppladdningsdata via www.openhumans.org.</string>
-    <string name="i_understand_and_agree">Jag förstår och instämmer.</string>
-    <string name="login">Logga in</string>
-    <string name="logout">Logga ut</string>
-    <string name="oh_logout_confirmation">Vill du verkligen logga ut och sluta donera data till vetenskapen?</string>
-    <string name="project_member_id">Projektmedlems-ID: %s</string>
-    <string name="queue_size">Köstorlek: %d</string>
-    <string name="terms_of_use">Användarvillkor</string>
-    <string name="not_logged_in">Inte inloggad</string>
-    <string name="you_need_to_accept_the_of_use_first">Du måste acceptera användarvillkoren först.</string>
-    <string name="successfully_logged_in">Inloggning lyckades</string>
-    <string name="setup_will_continue_in_background">Konfigurationen kommer att slutföras i bakgrunden nu. Tack för att du laddade upp dina data.\n\nBehåll det här appen och din telefon påslagen en stund till för installationen ska slutföras helt.</string>
-    <string name="completing_login">Slutför inloggning…</string>
-    <string name="donate_your_data_to_science">Donera dina data till vetenskapen</string>
-    <string name="open_humans_short">OH</string>
-    <string name="you_have_been_signed_out_of_open_humans">Du har loggats ut från Open Humans</string>
-    <string name="click_here_to_sign_in_again_if_this_wasnt_on_purpose">Klicka här om du vill logga in igen.</string>
-    <string name="only_upload_if_connected_to_wifi">Ladda bara upp om ansluten till WiFi</string>
-    <string name="only_upload_if_charging">Ladda bara upp vid laddning</string>
-    <string name="worker_state">Jobbstatus: %s</string>
-    <string name="uploaded_data">Uppladdad data</string>
-    <string name="the_following_data_will_be_uploaded_to_your_open_humans_account">Följande data kommer att överföras till ditt Open Humans-konto: Glukosvärden, careportalhändelser (utom anteckningar), utökade bolusar, profilbyten, totala dagliga doser, temp basaler, temp mål, inställningar, appversion, enhetsmodell och skärmstorlek. Hemlig eller privat information, t. ex. din Nightscout-adress eller API-hemlighet, kommer inte att överföras.</string>
     <string name="setupwizard_pump_riley_link_status">Riley Link-status:</string>
     <string name="filter">Filter</string>
     <string name="copytolocalprofile_invalid">Kan inte att skapa den lokala profilen. Profilen är ogiltig.</string>
@@ -890,14 +857,28 @@ Eversense-appen.</string>
     <string name="email_address">E-postadress</string>
     <string name="privacy_settings">Sekretessinställningar</string>
     <string name="privacy_summary">Du kan ange valfri e-postadress om du vill få meddelanden om appkrascher. Det här är ingen automatiserad tjänst. Du kommer att kontaktas av utvecklare i farliga situationer.</string>
-    <string name="profile_low_target">Nedre målvärde för profilen</string>
-    <string name="profile_high_target">Övre målvärde för profilen</string>
-    <string name="temp_target_low_target">Nedre värde för temp mål</string>
-    <string name="temp_target_high_target">Övre värde för temp mål</string>
-    <string name="temp_target_value">Temp målvärde</string>
-    <string name="profile_dia">Profilens DIA</string>
-    <string name="profile_sensitivity_value">Profilens insulinkänslighetsvärde</string>
-    <string name="profile_max_daily_basal_value">Maximal basaldos för profil</string>
-    <string name="current_basal_value">Nuvarande basaldos</string>
-    <string name="profile_carbs_ratio_value">Profilens KH-kvot</string>
+    <string name="full_sync">Full synkronisering</string>
+    <string name="prime">Förfyllning</string>
+    <string name="ns_sync_options">Synkronisering</string>
+    <string name="ns_upload_summary">Profiler, bolus, kolhydrater och temp basaler laddas upp till NS</string>
+    <string name="ns_upload">Ladda upp data till NS</string>
+    <string name="ns_receive_profile_store">Ladda ner profiler</string>
+    <string name="ns_receive_profile_store_summary">Skapa/synka lokala profiler från NS</string>
+    <string name="ns_receive_temp_target">Ladda ner temporära mål</string>
+    <string name="ns_receive_temp_target_summary">Godkänn temp mål som anges genom NS eller NSClient</string>
+    <string name="ns_receive_profile_switch">Ladda ner profilbyten</string>
+    <string name="ns_receive_profile_switch_summary">Acceptera profilbyten som matats in via NS eller NSClient</string>
+    <string name="ns_receive_offline_event">Ladda ner APS offline händelser</string>
+    <string name="ns_receive_offline_event_summary">Acceptera APS Offline-händelser som matas in via NS eller NSClient</string>
+    <string name="ns_receive_insulin">Ladda ner loggade insulindoser</string>
+    <string name="ns_receive_insulin_summary">Acceptera loggat insulin som matats in via NS eller NSClient (den levereras inte, endast beräknad mot IOB)</string>
+    <string name="ns_receive_carbs">Ladda ner loggade kolhydrater</string>
+    <string name="ns_receive_carbs_summary">Acceptera kolhydrater som matats in via NS eller NSClient</string>
+    <string name="ns_receive_therapy_events">Ladda ner loggade behandlingar</string>
+    <string name="ns_receive_therapy_events_summary">Acceptera händelser (kanyl-, insulin-, batteribyte etc) som angetts via NS eller NSClient</string>
+    <string name="ns_receive_cgm">Ladda ner CGM-data</string>
+    <string name="ns_receive_cgm_summary">Acceptera CGM-data från NS</string>
+    <string name="sms_timeout_while_wating">Föregående pumpkommunikation har inte bekräftats/avslutats i tid</string>
+    <string name="smscommunicator_another_bolus_in_queue">Det finns en annan bolus i kö. Försök igen senare.</string>
+    <string name="calculation_in_progress">Beräkning pågår</string>
 </resources>
diff --git a/app/src/main/res/values-tr-rTR/strings.xml b/app/src/main/res/values-tr-rTR/strings.xml
index 2e9efe6091..2099fdcdc0 100644
--- a/app/src/main/res/values-tr-rTR/strings.xml
+++ b/app/src/main/res/values-tr-rTR/strings.xml
@@ -73,8 +73,6 @@
     <string name="careportal">Careportal</string>
     <string name="configbuilder_pump">Pompa</string>
     <string name="configbuilder_pump_description">Hangi pompa ile AndroidAPS kullanmak istersiniz?</string>
-    <string name="configbuilder_treatments">Tedaviler</string>
-    <string name="configbuilder_treatments_description">Hangi eklenti tedavi işleme için kullanılsın?</string>
     <string name="configbuilder_profile">Profil</string>
     <string name="configbuilder_profile_description">Hangi profili AndroidAPS kullanmalı?</string>
     <string name="configbuilder_aps">APS (YPS)</string>
@@ -147,7 +145,6 @@
     <string name="smscommunicator_loophasbeendisabled">Döngü devre dışı bırakıldı</string>
     <string name="smscommunicator_loophasbeenenabled">Döngü etkinleştirildi</string>
     <string name="smscommunicator_loopisenabled">Döngü etkin</string>
-    <string name="valuelimitedto">%1$.2f dan %2$.2f olarak sınırlı</string>
     <string name="smscommunicator_remotecommandnotallowed">Uzaktan komuta izin verilmez</string>
     <string name="smscommunicator_suspendreplywithcode">%1$d dakika için Döngü\'yü askıya almak için %2$s kodunu yanıtla</string>
     <string name="smscommunicator_tempbasalset">Geçici bazal %1$.2fÜ/s %2$d dakika için başarıyla başlatıldı</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 76ef7ce813..b82944f112 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -74,8 +74,6 @@
     <string name="careportal">护理记录</string>
     <string name="configbuilder_pump">胰岛素泵</string>
     <string name="configbuilder_pump_description">你想用 AndroidAPS连接哪个胰岛素泵？</string>
-    <string name="configbuilder_treatments">治疗</string>
-    <string name="configbuilder_treatments_description">什么插件应该用于治疗处理？</string>
     <string name="configbuilder_profile">配置文件</string>
     <string name="configbuilder_profile_description">AndroidAPS 应该使用哪个配置文件？</string>
     <string name="configbuilder_aps">APS</string>
@@ -148,7 +146,6 @@
     <string name="smscommunicator_loophasbeendisabled">闭环已经被禁用</string>
     <string name="smscommunicator_loophasbeenenabled">闭环已经被启用</string>
     <string name="smscommunicator_loopisenabled">闭环被启用</string>
-    <string name="valuelimitedto">%1$.2f 超过 %2$.2f的限制</string>
     <string name="smscommunicator_remotecommandnotallowed">远程命令没有被允许</string>
     <string name="smscommunicator_remotebolusnotallowed">远程大剂量不可用。请稍后再试。</string>
     <string name="smscommunicator_profilereplywithcode">要切换配置文件到 %1$s %2$d%% 请回复代码 %3$s</string>
diff --git a/app/src/main/res/values/exam.xml b/app/src/main/res/values/exam.xml
index b5505d5f38..778e865cbf 100644
--- a/app/src/main/res/values/exam.xml
+++ b/app/src/main/res/values/exam.xml
@@ -132,7 +132,7 @@
     <string name="wronginsulin_label">Insulin delivery/entry errors</string>
     <string name="wronginsulin_whattodo">What should you do if you received less insulin than the pump history suggests e.g. due to an occlusion, a failed cannula or forgetting to reattach the pump after a shower? </string>
     <string name="wronginsulin_careportal">Delete insulin data from Nightscout Careportal to remove it from the pump history.</string>
-    <string name="wronginsulin_compare">Compare values in AndroidAPS and pump history.</string>
+    <string name="wronginsulin_compare">Compare values in AndroidAPS and pump history (if pump supports this).</string>
     <string name="wronginsulin_prime">Bolus a proportion of your calculated ‘missed’ insulin by either syringe/pen or using a prime.</string>
     <string name="wronginsulin_donothing">Do nothing and allow AndroidAPS to correct any resulting high blood glucose level.</string>
     <string name="iob_label">Insulin on Board (IOB)</string>
diff --git a/app/src/main/res/values/objectives.xml b/app/src/main/res/values/objectives.xml
index cf4dfd2c7a..7c1c4486a4 100644
--- a/app/src/main/res/values/objectives.xml
+++ b/app/src/main/res/values/objectives.xml
@@ -29,7 +29,6 @@
     <string name="objectives_maxiob_gate">Run for a few days, and at least one night with no low BG alarms, before dropping BG</string>
     <string name="objectives_autosens_objective">Adjust basals and ratios if needed, and then enable auto-sens</string>
     <string name="objectives_autosens_gate">1 week successful daytime looping with regular carb entry</string>
-    <string name="objectives_ama_objective">Enabling additional features for daytime use, such as advanced meal assist</string>
     <string name="objectives_smb_objective">Enabling additional features for daytime use, such as SMB</string>
     <string name="objectives_auto_objective">Enabling automation</string>
     <string name="objectives_smb_gate">You must read the wiki and rise maxIOB to get SMBs working fine! A good start is maxIOB=average mealbolus + 3 x max daily basal</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index af198dc3e4..e0fa882c68 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -29,7 +29,6 @@
 
     <string name="key_email_for_crash_report" translatable="false">email_for_crash_report</string>
     <string name="key_smscommunicator_settings" translatable="false">smscommunicator</string>
-    <string name="key_open_humans_settings" translatable="false">open_humans</string>
     <string name="key_protection_settings" translatable="false">protection</string>
     <string name="key_absorption_category_settings" translatable="false">absorption_category_settings</string>
     <string name="key_insulin_oref_peak_settings" translatable="false">insulin_oref_peak_settings</string>
@@ -47,6 +46,8 @@
     <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>
 
@@ -134,8 +135,6 @@
 
     <string name="configbuilder_pump">Pump</string>
     <string name="configbuilder_pump_description">Which pump would you like to use with AndroidAPS?</string>
-    <string name="configbuilder_treatments">Treatments</string>
-    <string name="configbuilder_treatments_description">Which plugin should be used for treatment handling?</string>
     <string name="configbuilder_profile">Profile</string>
     <string name="configbuilder_profile_description">Which profile should AndroidAPS use?</string>
     <string name="configbuilder_aps">APS</string>
@@ -252,8 +251,6 @@
     <string name="smscommunicator_loophasbeendisabled">Loop has been disabled</string>
     <string name="smscommunicator_loophasbeenenabled">Loop has been enabled</string>
     <string name="smscommunicator_loopisenabled">Loop is enabled</string>
-    <string name="valuelimitedto">%1$.2f limited to %2$.2f</string>
-    <string name="valueoutofrange">»%1$s« is out of hard limits</string>
     <string name="smscommunicator_pumpconnectwithcode">To connect pump reply with code %1$s</string>
     <string name="smscommunicator_pumpconnectfail">Connection to pump failed</string>
     <string name="smscommunicator_pumpdisconnectwithcode">To disconnect pump for %1$d minutes reply with code %2$s</string>
@@ -402,12 +399,6 @@
     <string name="adult">Adult</string>
     <string name="resistantadult">Insulin resistant adult</string>
     <string name="pregnant">Pregnancy</string>
-    <string name="key_age" translatable="false">age</string>
-    <string name="key_child" translatable="false">child</string>
-    <string name="key_teenage" translatable="false">teenage</string>
-    <string name="key_adult" translatable="false">adult</string>
-    <string name="key_resistantadult" translatable="false">resistantadult</string>
-    <string name="key_pregnant" translatable="false">pregnant</string>
     <string name="patientage_summary">Please select patient type to setup safety limits</string>
     <string name="patient_name">Patient name</string>
     <string name="patient_name_summary">Please provide patient name or nickname to differentiate among multiple setups</string>
@@ -614,6 +605,7 @@
     <string name="key_dexcomg5_xdripupload" translatable="false">dexcomg5_xdripupload</string>
     <string name="dexcomg5_xdripupload_summary">In xDrip+ select 640g/Eversense data source</string>
     <string name="nsclientbg">NSClient BG</string>
+    <string name="nsclientbgshort">NS BG</string>
     <string name="overview_editquickwizard_usebg">BG calculation</string>
     <string name="overview_editquickwizard_usebolusiob">Bolus IOB calculation</string>
     <string name="overview_editquickwizard_usebasaliob">Basal IOB calculation</string>
@@ -1056,36 +1048,6 @@
     <string name="basalpctfromtdd_label">% of basal</string>
     <string name="dpvdefaultprofile">DPV Default profile</string>
 
-    <string name="open_humans">Open Humans</string>
-    <string name="finishing_open_humans_setup">Finishing Open Humans setup…</string>
-    <string name="this_may_take_a_while">This may take a while. Do not turn your phone or this plugin off.</string>
-    <string name="setup_finished">Setup finished</string>
-    <string name="your_phone_will_upload_data">Your phone will upload data to Open Humans soon.</string>
-    <string name="your_phone_is_upload_data">Your phone is uploading data to Open Humans now.</string>
-    <string name="setup_failed">Setup failed</string>
-    <string name="there_was_an_error">There was an error. Please try to log in again in order to proceed. Sorry &amp; Thank you!</string>
-    <string name="open_humans_terms">This is an open source tool that will copy your data to Open Humans. We retain no rights to share your data with third parties without your explicit authorization. The data the project and app receive are identified via a random user ID and will only be securely transmitted to an Open Humans account with your authorization of that process. You can stop uploading and delete your upload data at any time via www.openhumans.org.</string>
-    <string name="i_understand_and_agree">I understand and agree.</string>
-    <string name="login">Login</string>
-    <string name="logout">Logout</string>
-    <string name="oh_logout_confirmation">Do you really want to log out and stop donating data to science?</string>
-    <string name="project_member_id">Project Member ID: %s</string>
-    <string name="queue_size">Queue Size: %d</string>
-    <string name="terms_of_use">Terms of Use</string>
-    <string name="not_logged_in">Not logged in</string>
-    <string name="you_need_to_accept_the_of_use_first">You need to accept the terms of use first.</string>
-    <string name="successfully_logged_in">Successfully logged in</string>
-    <string name="setup_will_continue_in_background">The setup will be completed in background now. Thanks for uploading your data.\n\nPlease keep this plugin and your phone turned on for a short while for the setup to complete.</string>
-    <string name="completing_login">Completing login…</string>
-    <string name="donate_your_data_to_science">Donate your data to science</string>
-    <string name="open_humans_short">OH</string>
-    <string name="you_have_been_signed_out_of_open_humans">You have been signed out of Open Humans</string>
-    <string name="click_here_to_sign_in_again_if_this_wasnt_on_purpose">Click here to sign in again if this wasn\'t on purpose.</string>
-    <string name="only_upload_if_connected_to_wifi">Only upload if connected to WiFi</string>
-    <string name="only_upload_if_charging">Only upload if charging</string>
-    <string name="worker_state">Worker State: %s</string>
-    <string name="uploaded_data">Uploaded Data</string>
-    <string name="the_following_data_will_be_uploaded_to_your_open_humans_account">The following data will be uploaded to your Open Humans account: Glucose values, boluses, carbs, careportal events (except notes), extended boluses, profile switches, total daily doses, temporary basals, temp targets, preferences, application version, device model and screen dimensions. Secret or private information such as your Nightscout URL or API secret will not be uploaded.</string>
     <string name="setupwizard_pump_riley_link_status">RileyLink status:</string>
     <string name="filter">Filter</string>
     <string name="copytolocalprofile_invalid">Unable to create local profile. Profile is invalid.</string>
@@ -1114,16 +1076,6 @@
     <string name="email_address">Email address</string>
     <string name="privacy_settings">Privacy setting</string>
     <string name="privacy_summary">You can provide optional email address if you want to be notified about app crashes. This is not an automated service. You will be contacted by developers in dangerous situations.</string>
-    <string name="profile_low_target">Profile low target</string>
-    <string name="profile_high_target">Profile high target</string>
-    <string name="temp_target_low_target">Temporary target bottom value</string>
-    <string name="temp_target_high_target">Temporary target top value</string>
-    <string name="temp_target_value">Temporary target value</string>
-    <string name="profile_dia">Profile DIA value</string>
-    <string name="profile_sensitivity_value">Profile sensitivity value</string>
-    <string name="profile_max_daily_basal_value">Maximal profile basal value</string>
-    <string name="current_basal_value">Current basal value</string>
-    <string name="profile_carbs_ratio_value">Profile carbs ratio value</string>
     <string name="full_sync">Full sync</string>
     <string name="prime">Prime</string>
     <string name="ns_sync_options">Synchronization</string>
@@ -1137,8 +1089,11 @@
     <string name="ns_receive_temp_target">Receive temporary targets</string>
     <string name="ns_receive_temp_target_summary">Accept temporary targets entered through NS or NSClient</string>
     <string name="key_ns_receive_profile_switch" translatable="false">ns_receive_profile_switch</string>
+    <string name="key_ns_receive_offline_event" translatable="false">ns_receive_offline_event</string>
     <string name="ns_receive_profile_switch">Receive profile switches</string>
     <string name="ns_receive_profile_switch_summary">Accept profile switches entered through NS or NSClient</string>
+    <string name="ns_receive_offline_event">Receive APS offline events</string>
+    <string name="ns_receive_offline_event_summary">Accept APS Offline events entered through NS or NSClient</string>
     <string name="key_ns_receive_insulin" translatable="false">ns_receive_insulin</string>
     <string name="ns_receive_insulin">Receive insulin</string>
     <string name="ns_receive_insulin_summary">Accept insulin entered through NS or NSClient (it\'s not delivered, only calculated towards IOB)</string>
@@ -1151,5 +1106,8 @@
     <string name="key_ns_receive_cgm" translatable="false">ns_receive_cgm</string>
     <string name="ns_receive_cgm">Receive/backfill CGM data</string>
     <string name="ns_receive_cgm_summary">Accept CGM data from NS</string>
+    <string name="sms_timeout_while_wating">Timeout while waiting for finish of previous pump communication</string>
+    <string name="smscommunicator_another_bolus_in_queue">There is another bolus in queue. Try again later.</string>
+    <string name="calculation_in_progress">Calculation in progress</string>
 
 </resources>
diff --git a/app/src/main/res/xml/filepaths.xml b/app/src/main/res/xml/filepaths.xml
index c9f65d8f56..65599ccdd0 100644
--- a/app/src/main/res/xml/filepaths.xml
+++ b/app/src/main/res/xml/filepaths.xml
@@ -1,4 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <paths>
-    <external-files-path name="exports" path="exports/" />
+    <external-path
+        name="external"
+        path="." />
+    <external-files-path
+        name="external_files"
+        path="." />
+    <cache-path
+        name="cache"
+        path="." />
+    <external-cache-path
+        name="external_cache"
+        path="." />
+    <files-path
+        name="files"
+        path="." />
 </paths>
\ No newline at end of file
diff --git a/app/src/main/res/xml/pref_nsclientinternal.xml b/app/src/main/res/xml/pref_nsclientinternal.xml
index 9056aaf8d9..c9dbe2d1e5 100644
--- a/app/src/main/res/xml/pref_nsclientinternal.xml
+++ b/app/src/main/res/xml/pref_nsclientinternal.xml
@@ -43,7 +43,7 @@
                 android:title="@string/ns_receive_cgm" />
 
             <SwitchPreference
-                android:defaultValue="false"
+                android:defaultValue="true"
                 android:key="@string/key_ns_receive_profile_store"
                 android:summary="@string/ns_receive_profile_store_summary"
                 android:title="@string/ns_receive_profile_store" />
@@ -78,6 +78,12 @@
                 android:summary="@string/ns_receive_therapy_events_summary"
                 android:title="@string/ns_receive_therapy_events" />
 
+            <SwitchPreference
+                android:defaultValue="false"
+                android:key="@string/key_ns_receive_offline_event"
+                android:summary="@string/ns_receive_offline_event_summary"
+                android:title="@string/ns_receive_offline_event" />
+
         </androidx.preference.PreferenceScreen>>
 
         <androidx.preference.PreferenceScreen
diff --git a/app/src/main/res/xml/pref_overview.xml b/app/src/main/res/xml/pref_overview.xml
index a8192da144..ad2367c9ee 100644
--- a/app/src/main/res/xml/pref_overview.xml
+++ b/app/src/main/res/xml/pref_overview.xml
@@ -180,7 +180,7 @@
                 android:inputType="numberDecimal"
                 android:key="@string/key_activity_target"
                 android:title="@string/activity_target"
-                validate:floatmaxNumber="220.0"
+                validate:floatmaxNumber="180.0"
                 validate:floatminNumber="6.0"
                 validate:testType="floatNumericRange" />
 
@@ -198,7 +198,7 @@
                 android:inputType="numberDecimal"
                 android:key="@string/key_hypo_target"
                 android:title="@string/hypo_target"
-                validate:floatmaxNumber="220.0"
+                validate:floatmaxNumber="180.0"
                 validate:floatminNumber="6.0"
                 validate:testType="floatNumericRange" />
 
diff --git a/app/src/test/java/info/nightscout/androidaps/TestBaseWithProfile.kt b/app/src/test/java/info/nightscout/androidaps/TestBaseWithProfile.kt
index fad417344b..ccbb41c2ba 100644
--- a/app/src/test/java/info/nightscout/androidaps/TestBaseWithProfile.kt
+++ b/app/src/test/java/info/nightscout/androidaps/TestBaseWithProfile.kt
@@ -7,7 +7,11 @@ import info.nightscout.androidaps.data.ProfileSealed
 import info.nightscout.androidaps.database.embedments.InsulinConfiguration
 import info.nightscout.androidaps.database.entities.EffectiveProfileSwitch
 import info.nightscout.androidaps.extensions.pureProfileFromJson
-import info.nightscout.androidaps.interfaces.*
+import info.nightscout.androidaps.interfaces.ActivePlugin
+import info.nightscout.androidaps.interfaces.Config
+import info.nightscout.androidaps.interfaces.IobCobCalculator
+import info.nightscout.androidaps.interfaces.ProfileFunction
+import info.nightscout.androidaps.interfaces.ProfileStore
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.utils.FabricPrivacy
@@ -15,15 +19,12 @@ import info.nightscout.androidaps.utils.resources.ResourceHelper
 import org.json.JSONObject
 import org.junit.Before
 import org.mockito.Mock
-import org.powermock.core.classloader.annotations.PrepareForTest
 
 @Suppress("SpellCheckingInspection")
-@PrepareForTest(FabricPrivacy::class)
 open class TestBaseWithProfile : TestBase() {
 
     @Mock lateinit var activePluginProvider: ActivePlugin
     @Mock lateinit var resourceHelper: ResourceHelper
-    @Mock lateinit var treatmentsInterface: TreatmentsInterface
     @Mock lateinit var iobCobCalculator: IobCobCalculator
     @Mock lateinit var fabricPrivacy: FabricPrivacy
     @Mock lateinit var profileFunction: ProfileFunction
diff --git a/app/src/test/java/info/nightscout/androidaps/data/QuickWizardTest.kt b/app/src/test/java/info/nightscout/androidaps/data/QuickWizardTest.kt
index 8bd8c49739..61f30ea92e 100644
--- a/app/src/test/java/info/nightscout/androidaps/data/QuickWizardTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/data/QuickWizardTest.kt
@@ -15,7 +15,6 @@ import org.junit.Before
 import org.junit.Test
 import org.mockito.Mock
 import org.mockito.Mockito.`when`
-import org.powermock.api.mockito.PowerMockito
 
 class QuickWizardTest : TestBase() {
 
@@ -44,7 +43,7 @@ class QuickWizardTest : TestBase() {
 
     @Before
     fun mock() {
-        PowerMockito.`when`(profileFunction.secondsFromMidnight()).thenReturn(0)
+        `when`(profileFunction.secondsFromMidnight()).thenReturn(0)
         `when`(sp.getString(R.string.key_quickwizard, "[]")).thenReturn("[]")
         quickWizard = QuickWizard(sp, injector)
     }
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 8569bdc726..0e086f2957 100644
--- a/app/src/test/java/info/nightscout/androidaps/interfaces/ConstraintsCheckerTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/interfaces/ConstraintsCheckerTest.kt
@@ -1,6 +1,5 @@
 package info.nightscout.androidaps.interfaces
 
-import android.content.Context
 import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.R
@@ -19,7 +18,7 @@ import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
 import info.nightscout.androidaps.plugins.constraints.objectives.ObjectivesPlugin
 import info.nightscout.androidaps.plugins.constraints.objectives.objectives.Objective
 import info.nightscout.androidaps.plugins.constraints.safety.SafetyPlugin
-import info.nightscout.androidaps.plugins.general.maintenance.LoggerUtils
+import info.nightscout.androidaps.plugins.general.maintenance.PrefFileListProvider
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatusProvider
 import info.nightscout.androidaps.plugins.pump.combo.ComboPlugin
 import info.nightscout.androidaps.plugins.pump.common.bolusInfo.DetailedBolusInfoStorage
@@ -28,32 +27,21 @@ import info.nightscout.androidaps.plugins.pump.insight.LocalInsightPlugin
 import info.nightscout.androidaps.plugins.pump.virtual.VirtualPumpPlugin
 import info.nightscout.androidaps.plugins.sensitivity.SensitivityOref1Plugin
 import info.nightscout.androidaps.plugins.source.GlimpPlugin
-import info.nightscout.androidaps.plugins.treatments.TreatmentService
-import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin
 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
 import org.junit.Before
 import org.junit.Test
-import org.junit.runner.RunWith
 import org.mockito.Mock
 import org.mockito.Mockito.`when`
-import org.powermock.core.classloader.annotations.PrepareForTest
-import org.powermock.modules.junit4.PowerMockRunner
 import java.util.*
 
 /**
  * Created by mike on 18.03.2018.
  */
-@RunWith(PowerMockRunner::class)
-@PrepareForTest(
-    ConstraintChecker::class, SP::class, Context::class,
-    OpenAPSAMAPlugin::class, OpenAPSSMBPlugin::class, TreatmentsPlugin::class, TreatmentService::class,
-    VirtualPumpPlugin::class, DetailedBolusInfoStorage::class, TemporaryBasalStorage::class, GlimpPlugin::class, Profiler::class,
-    UserEntryLogger::class, LoggerUtils::class, AppRepository::class, InsightDatabaseDao::class)
 class ConstraintsCheckerTest : TestBaseWithProfile() {
 
     @Mock lateinit var activePlugin: ActivePlugin
@@ -66,7 +54,7 @@ class ConstraintsCheckerTest : TestBaseWithProfile() {
     @Mock lateinit var sensitivityOref1Plugin: SensitivityOref1Plugin
     @Mock lateinit var profiler: Profiler
     @Mock lateinit var uel: UserEntryLogger
-    @Mock lateinit var loggerUtils: LoggerUtils
+    @Mock lateinit var fileListProvider: PrefFileListProvider
     @Mock lateinit var repository: AppRepository
     @Mock lateinit var pumpSync: PumpSync
     @Mock lateinit var insightDatabaseDao: InsightDatabaseDao
@@ -100,7 +88,6 @@ class ConstraintsCheckerTest : TestBaseWithProfile() {
     fun prepare() {
         `when`(resourceHelper.gs(R.string.closed_loop_disabled_on_dev_branch)).thenReturn("Running dev version. Closed loop is disabled.")
         `when`(resourceHelper.gs(R.string.closedmodedisabledinpreferences)).thenReturn("Closed loop mode disabled in preferences")
-        `when`(resourceHelper.gs(R.string.objectivenotstarted)).thenReturn("Objective %d not started")
         `when`(resourceHelper.gs(R.string.novalidbasalrate)).thenReturn("No valid basal rate read from pump")
         `when`(resourceHelper.gs(R.string.autosensdisabledinpreferences)).thenReturn("Autosens disabled in preferences")
         `when`(resourceHelper.gs(R.string.smbdisabledinpreferences)).thenReturn("SMB disabled in preferences")
@@ -127,6 +114,10 @@ class ConstraintsCheckerTest : TestBaseWithProfile() {
         `when`(resourceHelper.gs(R.string.limitingbasalratio, 0.8, "pump limit")).thenReturn("")
         `when`(resourceHelper.gs(R.string.limitingpercentrate, 200, "pump limit")).thenReturn("")
         `when`(resourceHelper.gs(R.string.combo_pump_unsupported_operation)).thenReturn("Requested operation not supported by pump")
+        `when`(resourceHelper.gs(R.string.objectivenotstarted, 9)).thenReturn("Objective 9 not started")
+        `when`(resourceHelper.gs(R.string.objectivenotstarted, 8)).thenReturn("Objective 8 not started")
+        `when`(resourceHelper.gs(R.string.objectivenotstarted, 6)).thenReturn("Objective 6 not started")
+        `when`(resourceHelper.gs(R.string.objectivenotstarted, 1)).thenReturn("Objective 1 not started")
 
         // RS constructor
         `when`(sp.getString(R.string.key_danars_address, "")).thenReturn("")
@@ -147,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(), loggerUtils), 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)
@@ -200,16 +194,6 @@ class ConstraintsCheckerTest : TestBaseWithProfile() {
         Assert.assertEquals(java.lang.Boolean.FALSE, c.value())
     }
 
-    // Objectives
-    @Test
-    fun isAMAModeEnabledTest() {
-        objectivesPlugin.objectives[ObjectivesPlugin.AMA_OBJECTIVE].startedOn = 0
-        val c = constraintChecker.isAMAModeEnabled()
-        Assert.assertEquals(true, c.reasonList.size == 1) // Objectives
-        Assert.assertEquals(true, c.mostLimitedReasonList.size == 1) // Objectives
-        Assert.assertEquals(java.lang.Boolean.FALSE, c.value())
-    }
-
     // Safety
     @Test
     fun isAdvancedFilteringEnabledTest() {
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/aps/loop/LoopPluginTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/aps/loop/LoopPluginTest.kt
index f6ec5e4687..270414aae3 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/aps/loop/LoopPluginTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/aps/loop/LoopPluginTest.kt
@@ -4,7 +4,6 @@ import android.app.NotificationManager
 import android.content.Context
 import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.utils.buildHelper.ConfigImpl
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.TestBase
 import info.nightscout.androidaps.database.AppRepository
@@ -14,23 +13,18 @@ import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
 import info.nightscout.androidaps.plugins.configBuilder.RunningConfiguration
 import info.nightscout.androidaps.plugins.pump.virtual.VirtualPumpPlugin
-import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin
 import info.nightscout.androidaps.receivers.ReceiverStatusStore
 import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.utils.FabricPrivacy
+import info.nightscout.androidaps.utils.buildHelper.ConfigImpl
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import info.nightscout.androidaps.utils.sharedPreferences.SP
 import org.junit.Assert
 import org.junit.Before
 import org.junit.Test
-import org.junit.runner.RunWith
 import org.mockito.Mock
 import org.mockito.Mockito.`when`
-import org.powermock.core.classloader.annotations.PrepareForTest
-import org.powermock.modules.junit4.PowerMockRunner
 
-@RunWith(PowerMockRunner::class)
-@PrepareForTest(ConstraintChecker::class, ReceiverStatusStore::class, RunningConfiguration::class, UserEntryLogger::class, DateUtil::class)
 class LoopPluginTest : TestBase() {
 
     @Mock lateinit var sp: SP
@@ -41,7 +35,6 @@ class LoopPluginTest : TestBase() {
     @Mock lateinit var context: Context
     @Mock lateinit var commandQueue: CommandQueueProvider
     @Mock lateinit var activePlugin: ActivePlugin
-    @Mock lateinit var treatmentsPlugin: TreatmentsPlugin
     @Mock lateinit var virtualPumpPlugin: VirtualPumpPlugin
     @Mock lateinit var iobCobCalculator: IobCobCalculator
     @Mock lateinit var fabricPrivacy: FabricPrivacy
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/configBuilder/ConfigBuilderPluginTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/configBuilder/ConfigBuilderPluginTest.kt
index fa4d5196a2..9b6a5fde7d 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/configBuilder/ConfigBuilderPluginTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/configBuilder/ConfigBuilderPluginTest.kt
@@ -11,13 +11,8 @@ import info.nightscout.androidaps.utils.resources.ResourceHelper
 import info.nightscout.androidaps.utils.sharedPreferences.SP
 import org.junit.Before
 import org.junit.Test
-import org.junit.runner.RunWith
 import org.mockito.Mock
-import org.powermock.core.classloader.annotations.PrepareForTest
-import org.powermock.modules.junit4.PowerMockRunner
 
-@RunWith(PowerMockRunner::class)
-@PrepareForTest(UserEntryLogger::class)
 class ConfigBuilderPluginTest : TestBase() {
 
     @Mock lateinit var sp: SP
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/constraints/dstHelper/DstHelperPluginTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/constraints/dstHelper/DstHelperPluginTest.kt
index da4192d33d..829ca48d4e 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/constraints/dstHelper/DstHelperPluginTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/constraints/dstHelper/DstHelperPluginTest.kt
@@ -11,14 +11,11 @@ import info.nightscout.androidaps.utils.sharedPreferences.SP
 import org.junit.Assert
 import org.junit.Before
 import org.junit.Test
-import org.junit.runner.RunWith
 import org.mockito.Mock
-import org.powermock.modules.junit4.PowerMockRunner
 import java.text.DateFormat
 import java.text.SimpleDateFormat
 import java.util.*
 
-@RunWith(PowerMockRunner::class)
 class DstHelperPluginTest : TestBase() {
 
     @Mock lateinit var resourceHelper: ResourceHelper
@@ -42,31 +39,31 @@ class DstHelperPluginTest : TestBase() {
         var cal = Calendar.getInstance(tz, Locale.ITALIAN)
         val df: DateFormat = SimpleDateFormat("yyyy-MM-dd HH:mm", Locale.ITALIAN)
         var dateBeforeDST = df.parse("2018-03-25 01:55")
-        cal.time = dateBeforeDST
+        cal.time = dateBeforeDST!!
         Assert.assertEquals(false, plugin.wasDST(cal))
         Assert.assertEquals(true, plugin.willBeDST(cal))
         TimeZone.setDefault(tz)
         cal = Calendar.getInstance(tz, Locale.ITALIAN)
         dateBeforeDST = df.parse("2018-03-25 03:05")
-        cal.time = dateBeforeDST
+        cal.time = dateBeforeDST!!
         Assert.assertEquals(true, plugin.wasDST(cal))
         Assert.assertEquals(false, plugin.willBeDST(cal))
         TimeZone.setDefault(tz)
         cal = Calendar.getInstance(tz, Locale.ITALIAN)
         dateBeforeDST = df.parse("2018-03-25 02:05") //Cannot happen!!!
-        cal.time = dateBeforeDST
+        cal.time = dateBeforeDST!!
         Assert.assertEquals(true, plugin.wasDST(cal))
         Assert.assertEquals(false, plugin.willBeDST(cal))
         TimeZone.setDefault(tz)
         cal = Calendar.getInstance(tz, Locale.ITALIAN)
         dateBeforeDST = df.parse("2018-03-25 05:55") //Cannot happen!!!
-        cal.time = dateBeforeDST
+        cal.time = dateBeforeDST!!
         Assert.assertEquals(true, plugin.wasDST(cal))
         Assert.assertEquals(false, plugin.willBeDST(cal))
         TimeZone.setDefault(tz)
         cal = Calendar.getInstance(tz, Locale.ITALIAN)
         dateBeforeDST = df.parse("2018-03-25 06:05") //Cannot happen!!!
-        cal.time = dateBeforeDST
+        cal.time = dateBeforeDST!!
         Assert.assertEquals(false, plugin.wasDST(cal))
         Assert.assertEquals(false, plugin.willBeDST(cal))
     }
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/constraints/objectives/ObjectivesPluginTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/constraints/objectives/ObjectivesPluginTest.kt
index 270753e9a4..795a677695 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/constraints/objectives/ObjectivesPluginTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/constraints/objectives/ObjectivesPluginTest.kt
@@ -2,7 +2,6 @@ package info.nightscout.androidaps.plugins.constraints.objectives
 
 import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.utils.buildHelper.ConfigImpl
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.TestBase
 import info.nightscout.androidaps.interfaces.ActivePlugin
@@ -10,19 +9,15 @@ import info.nightscout.androidaps.interfaces.Constraint
 import info.nightscout.androidaps.logging.UserEntryLogger
 import info.nightscout.androidaps.plugins.constraints.objectives.objectives.Objective
 import info.nightscout.androidaps.utils.DateUtil
+import info.nightscout.androidaps.utils.buildHelper.ConfigImpl
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import info.nightscout.androidaps.utils.sharedPreferences.SP
 import org.junit.Assert
 import org.junit.Before
 import org.junit.Test
-import org.junit.runner.RunWith
 import org.mockito.Mock
 import org.mockito.Mockito.`when`
-import org.powermock.core.classloader.annotations.PrepareForTest
-import org.powermock.modules.junit4.PowerMockRunner
 
-@RunWith(PowerMockRunner::class)
-@PrepareForTest(UserEntryLogger::class, DateUtil::class)
 class ObjectivesPluginTest : TestBase() {
 
     @Mock lateinit var resourceHelper: ResourceHelper
@@ -46,7 +41,10 @@ class ObjectivesPluginTest : TestBase() {
     @Before fun prepareMock() {
         objectivesPlugin = ObjectivesPlugin(injector, aapsLogger, resourceHelper, activePlugin, sp, ConfigImpl(), dateUtil, uel)
         objectivesPlugin.onStart()
-        `when`(resourceHelper.gs(R.string.objectivenotstarted)).thenReturn("Objective %1\$d not started")
+        `when`(resourceHelper.gs(R.string.objectivenotstarted, 9)).thenReturn("Objective 9 not started")
+        `when`(resourceHelper.gs(R.string.objectivenotstarted, 8)).thenReturn("Objective 8 not started")
+        `when`(resourceHelper.gs(R.string.objectivenotstarted, 6)).thenReturn("Objective 6 not started")
+        `when`(resourceHelper.gs(R.string.objectivenotstarted, 1)).thenReturn("Objective 1 not started")
     }
 
     @Test fun notStartedObjectivesShouldLimitLoopInvocation() {
@@ -74,19 +72,11 @@ class ObjectivesPluginTest : TestBase() {
         Assert.assertEquals(false, c.value())
     }
 
-    @Test fun notStartedObjective9ShouldLimitAMAMode() {
-        objectivesPlugin.objectives[ObjectivesPlugin.AMA_OBJECTIVE].startedOn = 0
-        var c = Constraint(true)
-        c = objectivesPlugin.isAMAModeEnabled(c)
-        Assert.assertEquals(true, c.getReasons(aapsLogger).contains("Objective 9 not started"))
-        Assert.assertEquals(false, c.value())
-    }
-
     @Test fun notStartedObjective10ShouldLimitSMBMode() {
         objectivesPlugin.objectives[ObjectivesPlugin.SMB_OBJECTIVE].startedOn = 0
         var c = Constraint(true)
         c = objectivesPlugin.isSMBModeEnabled(c)
-        Assert.assertEquals(true, c.getReasons(aapsLogger).contains("Objective 10 not started"))
+        Assert.assertEquals(true, c.getReasons(aapsLogger).contains("Objective 9 not started"))
         Assert.assertEquals(false, c.value())
     }
 }
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/constraints/safety/SafetyPluginTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/constraints/safety/SafetyPluginTest.kt
index 209e7d2da6..bc54c57e09 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/constraints/safety/SafetyPluginTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/constraints/safety/SafetyPluginTest.kt
@@ -2,7 +2,6 @@ package info.nightscout.androidaps.plugins.constraints.safety
 
 import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.utils.buildHelper.ConfigImpl
 import info.nightscout.androidaps.Constants
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.TestBaseWithProfile
@@ -18,18 +17,14 @@ 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.buildHelper.BuildHelper
+import info.nightscout.androidaps.utils.buildHelper.ConfigImpl
 import info.nightscout.androidaps.utils.sharedPreferences.SP
 import org.junit.Assert
 import org.junit.Before
 import org.junit.Test
-import org.junit.runner.RunWith
 import org.mockito.Mock
 import org.mockito.Mockito.`when`
-import org.powermock.core.classloader.annotations.PrepareForTest
-import org.powermock.modules.junit4.PowerMockRunner
 
-@RunWith(PowerMockRunner::class)
-@PrepareForTest(ConstraintChecker::class, BuildHelper::class, VirtualPumpPlugin::class, GlimpPlugin::class)
 class SafetyPluginTest : TestBaseWithProfile() {
 
     @Mock lateinit var sp: SP
@@ -231,17 +226,18 @@ class SafetyPluginTest : TestBaseWithProfile() {
     }
 
     @Test fun iobShouldBeLimited() {
+        `when`(openAPSSMBPlugin.isEnabled()).thenReturn(true)
+        `when`(openAPSAMAPlugin.isEnabled()).thenReturn(false)
         `when`(sp.getString(R.string.key_aps_mode, "open")).thenReturn("closed")
         `when`(sp.getDouble(R.string.key_openapsma_max_iob, 1.5)).thenReturn(1.5)
+        `when`(sp.getDouble(R.string.key_openapssmb_max_iob, 3.0)).thenReturn(3.0)
         `when`(sp.getString(R.string.key_age, "")).thenReturn("teenage")
 
         // Apply all limits
         var d = Constraint(Constants.REALLYHIGHIOB)
         d = safetyPlugin.applyMaxIOBConstraints(d)
-        Assert.assertEquals(1.5, d.value(), 0.01)
-        Assert.assertEquals("""
-    Safety: Limiting IOB to 1.5 U because of max value in preferences
-    """.trimIndent(), d.getReasons(aapsLogger))
-        Assert.assertEquals("Safety: Limiting IOB to 1.5 U because of max value in preferences", d.getMostLimitedReasons(aapsLogger))
+        Assert.assertEquals(3.0, d.value(), 0.01)
+        Assert.assertEquals("Safety: Limiting IOB to 3.0 U because of max value in preferences\nSafety: Limiting IOB to 12.0 U because of hard limit", d.getReasons(aapsLogger))
+        Assert.assertEquals("Safety: Limiting IOB to 3.0 U because of max value in preferences", d.getMostLimitedReasons(aapsLogger))
     }
 }
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/constraints/signatureVerifier/SignatureVerifierPluginTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/constraints/signatureVerifier/SignatureVerifierPluginTest.kt
index 5c847314ba..b54fd71efd 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/constraints/signatureVerifier/SignatureVerifierPluginTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/constraints/signatureVerifier/SignatureVerifierPluginTest.kt
@@ -11,7 +11,6 @@ import org.junit.Assert
 import org.junit.Test
 import org.mockito.Mock
 
-@kotlin.ExperimentalStdlibApi
 class SignatureVerifierPluginTest : TestBase() {
 
     @Mock lateinit var resourceHelper: ResourceHelper
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/constraints/storage/StorageConstraintPluginTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/constraints/storage/StorageConstraintPluginTest.kt
index 6be468634c..780fc29a0a 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/constraints/storage/StorageConstraintPluginTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/constraints/storage/StorageConstraintPluginTest.kt
@@ -10,14 +10,11 @@ import info.nightscout.androidaps.utils.resources.ResourceHelper
 import org.junit.Assert
 import org.junit.Before
 import org.junit.Test
-import org.junit.runner.RunWith
 import org.mockito.Mock
 import org.mockito.Mockito.`when`
 import org.mockito.Mockito.anyInt
 import org.mockito.Mockito.anyLong
-import org.powermock.modules.junit4.PowerMockRunner
 
-@RunWith(PowerMockRunner::class)
 class StorageConstraintPluginTest : TestBase() {
 
     @Mock lateinit var resourceHelper: ResourceHelper
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/general/maintenance/MaintenancePluginTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/general/maintenance/MaintenancePluginTest.kt
index d0d965961b..14ab61d104 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/general/maintenance/MaintenancePluginTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/general/maintenance/MaintenancePluginTest.kt
@@ -2,24 +2,19 @@ package info.nightscout.androidaps.plugins.general.maintenance
 
 import android.content.Context
 import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.utils.buildHelper.ConfigImpl
 import info.nightscout.androidaps.TestBase
 import info.nightscout.androidaps.plugins.general.nsclient.data.NSSettingsStatus
 import info.nightscout.androidaps.utils.buildHelper.BuildHelper
+import info.nightscout.androidaps.utils.buildHelper.ConfigImpl
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import info.nightscout.androidaps.utils.sharedPreferences.SP
 import org.junit.Assert
 import org.junit.Before
 import org.junit.Test
-import org.junit.runner.RunWith
 import org.mockito.Mock
 import org.mockito.Mockito.`when`
-import org.powermock.core.classloader.annotations.PrepareForTest
-import org.powermock.modules.junit4.PowerMockRunner
 import java.io.File
 
-@RunWith(PowerMockRunner::class)
-@PrepareForTest(NSSettingsStatus::class, BuildHelper::class, LoggerUtils::class)
 class MaintenancePluginTest : TestBase() {
 
     @Mock lateinit var injector: HasAndroidInjector
@@ -29,14 +24,16 @@ class MaintenancePluginTest : TestBase() {
     @Mock lateinit var nsSettingsStatus: NSSettingsStatus
     @Mock lateinit var buildHelper: BuildHelper
     @Mock lateinit var loggerUtils: LoggerUtils
+    @Mock lateinit var fileListProvider: PrefFileListProvider
 
     lateinit var sut: MaintenancePlugin
 
     @Before
     fun mock() {
-        sut = MaintenancePlugin(injector, context, resourceHelper, sp, nsSettingsStatus, aapsLogger, buildHelper, ConfigImpl(), loggerUtils)
+        sut = MaintenancePlugin(injector, context, resourceHelper, sp, nsSettingsStatus, aapsLogger, buildHelper, ConfigImpl(), fileListProvider, loggerUtils)
         `when`(loggerUtils.suffix).thenReturn(".log.zip")
         `when`(loggerUtils.logDirectory).thenReturn("src/test/res/logger")
+        `when`(fileListProvider.ensureTempDirExists()).thenReturn(File("src/test/res/logger"))
     }
 
     @Test fun logFilesTest() {
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/general/nsclient/NsClientReceiverDelegateTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/general/nsclient/NsClientReceiverDelegateTest.kt
index 74751fe5f5..c4ae16c2d7 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/general/nsclient/NsClientReceiverDelegateTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/general/nsclient/NsClientReceiverDelegateTest.kt
@@ -12,19 +12,13 @@ import info.nightscout.androidaps.utils.sharedPreferences.SP
 import org.junit.Assert
 import org.junit.Before
 import org.junit.Test
-import org.junit.runner.RunWith
 import org.mockito.ArgumentMatchers.anyBoolean
 import org.mockito.ArgumentMatchers.anyInt
 import org.mockito.ArgumentMatchers.anyLong
 import org.mockito.ArgumentMatchers.anyString
 import org.mockito.Mock
 import org.mockito.Mockito.`when`
-import org.powermock.api.mockito.PowerMockito
-import org.powermock.core.classloader.annotations.PrepareForTest
-import org.powermock.modules.junit4.PowerMockRunner
 
-@RunWith(PowerMockRunner::class)
-@PrepareForTest(SP::class, Context::class)
 class NsClientReceiverDelegateTest : TestBase() {
 
     @Mock lateinit var context: Context
@@ -47,7 +41,6 @@ class NsClientReceiverDelegateTest : TestBase() {
     }
 
     @Test fun testCalculateStatusChargingState() {
-        PowerMockito.mockStatic(SP::class.java)
         `when`(sp.getBoolean(anyInt(), anyBoolean())).thenReturn(false)
         var ev = EventChargingState(true, 0)
         Assert.assertTrue(sut!!.calculateStatus(ev))
@@ -61,7 +54,6 @@ class NsClientReceiverDelegateTest : TestBase() {
     }
 
     @Test fun testCalculateStatusNetworkState() {
-        PowerMockito.mockStatic(SP::class.java)
         // wifiOnly = false
         // allowRoaming = false as well
         `when`(sp.getBoolean(anyInt(), anyBoolean())).thenReturn(false)
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/general/smsCommunicator/AuthRequestTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/general/smsCommunicator/AuthRequestTest.kt
index dcc14fabfc..228c4aa802 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/general/smsCommunicator/AuthRequestTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/general/smsCommunicator/AuthRequestTest.kt
@@ -13,17 +13,12 @@ import info.nightscout.androidaps.utils.resources.ResourceHelper
 import org.junit.Assert
 import org.junit.Before
 import org.junit.Test
-import org.junit.runner.RunWith
 import org.mockito.Mock
 import org.mockito.Mockito.`when`
+import org.mockito.Mockito.doAnswer
 import org.mockito.invocation.InvocationOnMock
 import org.mockito.stubbing.Answer
-import org.powermock.api.mockito.PowerMockito
-import org.powermock.core.classloader.annotations.PrepareForTest
-import org.powermock.modules.junit4.PowerMockRunner
 
-@RunWith(PowerMockRunner::class)
-@PrepareForTest(SmsCommunicatorPlugin::class, DateUtil::class, OneTimePassword::class)
 class AuthRequestTest : TestBase() {
 
     @Mock lateinit var smsCommunicatorPlugin: SmsCommunicatorPlugin
@@ -48,7 +43,7 @@ class AuthRequestTest : TestBase() {
 
     @Before fun prepareTests() {
         `when`(resourceHelper.gs(R.string.sms_wrongcode)).thenReturn("Wrong code. Command cancelled.")
-        PowerMockito.doAnswer(Answer { invocation: InvocationOnMock ->
+        doAnswer(Answer { invocation: InvocationOnMock ->
             sentSms = invocation.getArgument(0)
             null
         } as Answer<*>).`when`(smsCommunicatorPlugin).sendSMS(anyObject())
@@ -56,7 +51,7 @@ class AuthRequestTest : TestBase() {
 
     @Test fun doTests() {
         val requester = Sms("aNumber", "aText")
-        val action: SmsAction = object : SmsAction() {
+        val action: SmsAction = object : SmsAction(false) {
             override fun run() {
                 actionCalled = true
             }
@@ -87,11 +82,10 @@ class AuthRequestTest : TestBase() {
 
         // test timed out message
         val now: Long = 10000
-        PowerMockito.mockStatic(DateUtil::class.java)
-        PowerMockito.`when`(dateUtil.now()).thenReturn(now)
+        `when`(dateUtil.now()).thenReturn(now)
         authRequest = AuthRequest(injector, requester, "Request text", "ABC", action)
         actionCalled = false
-        PowerMockito.`when`(dateUtil.now()).thenReturn(now + T.mins(Constants.SMS_CONFIRM_TIMEOUT).msecs() + 1)
+        `when`(dateUtil.now()).thenReturn(now + T.mins(Constants.SMS_CONFIRM_TIMEOUT).msecs() + 1)
         authRequest.action("ABC")
         Assert.assertFalse(actionCalled)
     }
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsActionTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsActionTest.kt
index 29fa359f51..e0563c27c9 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsActionTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsActionTest.kt
@@ -2,22 +2,19 @@ package info.nightscout.androidaps.plugins.general.smsCommunicator
 
 import org.junit.Assert
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.powermock.modules.junit4.PowerMockRunner
 
-@RunWith(PowerMockRunner::class)
 class SmsActionTest {
 
     var result = ""
     @Test fun doTests() {
-        var smsAction: SmsAction = object : SmsAction() {
+        var smsAction: SmsAction = object : SmsAction(false) {
             override fun run() {
                 result = "A"
             }
         }
         smsAction.run()
         Assert.assertEquals(result, "A")
-        smsAction = object : SmsAction(1.0) {
+        smsAction = object : SmsAction(false, 1.0) {
             override fun run() {
                 result = "B"
             }
@@ -25,7 +22,7 @@ class SmsActionTest {
         smsAction.run()
         Assert.assertEquals(result, "B")
         Assert.assertEquals(smsAction.aDouble(), 1.0, 0.000001)
-        smsAction = object : SmsAction(1.0, 2) {
+        smsAction = object : SmsAction(false, 1.0, 2) {
             override fun run() {
                 result = "C"
             }
@@ -34,7 +31,7 @@ class SmsActionTest {
         Assert.assertEquals(result, "C")
         Assert.assertEquals(smsAction.aDouble(), 1.0, 0.000001)
         Assert.assertEquals(smsAction.secondInteger().toLong(), 2)
-        smsAction = object : SmsAction("aString", 3) {
+        smsAction = object : SmsAction(false, "aString", 3) {
             override fun run() {
                 result = "D"
             }
@@ -43,7 +40,7 @@ class SmsActionTest {
         Assert.assertEquals(result, "D")
         Assert.assertEquals(smsAction.aString(), "aString")
         Assert.assertEquals(smsAction.secondInteger().toLong(), 3)
-        smsAction = object : SmsAction(4) {
+        smsAction = object : SmsAction(false, 4) {
             override fun run() {
                 result = "E"
             }
@@ -51,7 +48,7 @@ class SmsActionTest {
         smsAction.run()
         Assert.assertEquals(result, "E")
         Assert.assertEquals(smsAction.anInteger().toLong(), 4)
-        smsAction = object : SmsAction(5, 6) {
+        smsAction = object : SmsAction(false, 5, 6) {
             override fun run() {
                 result = "F"
             }
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsCommunicatorPluginTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsCommunicatorPluginTest.kt
index 7214884f59..a56824dd4c 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsCommunicatorPluginTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsCommunicatorPluginTest.kt
@@ -1,11 +1,8 @@
-@file:Suppress("SpellCheckingInspection")
-
 package info.nightscout.androidaps.plugins.general.smsCommunicator
 
 import android.telephony.SmsManager
 import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.utils.buildHelper.ConfigImpl
 import info.nightscout.androidaps.Constants
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.TestBaseWithProfile
@@ -13,7 +10,10 @@ import info.nightscout.androidaps.data.IobTotal
 import info.nightscout.androidaps.data.PumpEnactResult
 import info.nightscout.androidaps.database.AppRepository
 import info.nightscout.androidaps.database.entities.GlucoseValue
-import info.nightscout.androidaps.database.transactions.InsertTemporaryTargetAndCancelCurrentTransaction
+import info.nightscout.androidaps.database.transactions.CancelCurrentOfflineEventIfAnyTransaction
+import info.nightscout.androidaps.database.transactions.InsertAndCancelCurrentOfflineEventTransaction
+import info.nightscout.androidaps.database.transactions.InsertAndCancelCurrentTemporaryTargetTransaction
+import info.nightscout.androidaps.database.transactions.Transaction
 import info.nightscout.androidaps.interfaces.*
 import info.nightscout.androidaps.logging.UserEntryLogger
 import info.nightscout.androidaps.plugins.aps.loop.LoopPlugin
@@ -26,38 +26,25 @@ import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatusProv
 import info.nightscout.androidaps.plugins.profile.local.LocalProfilePlugin
 import info.nightscout.androidaps.plugins.pump.common.defs.PumpType
 import info.nightscout.androidaps.plugins.pump.virtual.VirtualPumpPlugin
-import info.nightscout.androidaps.plugins.treatments.TreatmentService
 import info.nightscout.androidaps.queue.Callback
-import info.nightscout.androidaps.queue.CommandQueue
 import info.nightscout.androidaps.utils.DateUtil
-import info.nightscout.androidaps.utils.FabricPrivacy
 import info.nightscout.androidaps.utils.T
 import info.nightscout.androidaps.utils.XdripCalibrations
+import info.nightscout.androidaps.utils.buildHelper.ConfigImpl
 import info.nightscout.androidaps.utils.sharedPreferences.SP
 import io.reactivex.Single
 import org.junit.Assert
 import org.junit.Before
 import org.junit.Test
-import org.junit.runner.RunWith
 import org.mockito.ArgumentMatchers
 import org.mockito.Mock
 import org.mockito.Mockito
 import org.mockito.Mockito.`when`
 import org.mockito.Mockito.anyLong
 import org.mockito.invocation.InvocationOnMock
-import org.mockito.stubbing.Answer
-import org.powermock.api.mockito.PowerMockito
-import org.powermock.core.classloader.annotations.PrepareForTest
-import org.powermock.modules.junit4.PowerMockRunner
 import java.util.*
 
-@RunWith(PowerMockRunner::class)
-@PrepareForTest(
-    ConstraintChecker::class, FabricPrivacy::class, VirtualPumpPlugin::class, XdripCalibrations::class,
-    SmsManager::class, CommandQueue::class, LocalProfilePlugin::class, DateUtil::class,
-    OneTimePassword::class, UserEntryLogger::class, LoopPlugin::class,
-    AppRepository::class, DateUtil::class, AutosensDataStore::class)
-@kotlin.ExperimentalStdlibApi
+@Suppress("SpellCheckingInspection")
 class SmsCommunicatorPluginTest : TestBaseWithProfile() {
 
     @Mock lateinit var sp: SP
@@ -73,6 +60,7 @@ class SmsCommunicatorPluginTest : TestBaseWithProfile() {
     @Mock lateinit var repository: AppRepository
     @Mock lateinit var dateUtilMocked: DateUtil
     @Mock lateinit var autosensDataStore: AutosensDataStore
+    @Mock lateinit var smsManager: SmsManager
 
     var injector: HasAndroidInjector = HasAndroidInjector {
         AndroidInjector {
@@ -85,6 +73,7 @@ class SmsCommunicatorPluginTest : TestBaseWithProfile() {
                 it.resourceHelper = resourceHelper
                 it.otp = otp
                 it.dateUtil = dateUtil
+                it.commandQueue = commandQueue
             }
         }
     }
@@ -97,22 +86,19 @@ class SmsCommunicatorPluginTest : TestBaseWithProfile() {
         val bgList: MutableList<GlucoseValue> = ArrayList()
         bgList.add(reading)
 
-        `when`(iobCobCalculator.getCobInfo(false, "SMS COB")).thenReturn(CobInfo(10.0, 2.0))
+        `when`(iobCobCalculator.getCobInfo(false, "SMS COB")).thenReturn(CobInfo(0, 10.0, 2.0))
         `when`(iobCobCalculator.ads).thenReturn(autosensDataStore)
         `when`(autosensDataStore.lastBg()).thenReturn(reading)
 
-        PowerMockito.mockStatic(SmsManager::class.java)
-        val smsManager = PowerMockito.mock(SmsManager::class.java)
-        `when`(SmsManager.getDefault()).thenReturn(smsManager)
         `when`(sp.getString(R.string.key_smscommunicator_allowednumbers, "")).thenReturn("1234;5678")
 
         `when`(
-            repository.runTransactionForResult(anyObject<InsertTemporaryTargetAndCancelCurrentTransaction>())
-        ).thenReturn(Single.just(InsertTemporaryTargetAndCancelCurrentTransaction.TransactionResult().apply {
+            repository.runTransactionForResult(anyObject<InsertAndCancelCurrentTemporaryTargetTransaction>())
+        ).thenReturn(Single.just(InsertAndCancelCurrentTemporaryTargetTransaction.TransactionResult().apply {
         }))
         val glucoseStatusProvider = GlucoseStatusProvider(aapsLogger = aapsLogger, iobCobCalculator = iobCobCalculator, dateUtil = dateUtilMocked)
 
-        smsCommunicatorPlugin = SmsCommunicatorPlugin(injector, aapsLogger, resourceHelper, aapsSchedulers, sp, constraintChecker, rxBus, profileFunction, fabricPrivacy, activePlugin, commandQueue, loopPlugin, iobCobCalculator, xdripCalibrations, otp, ConfigImpl(), dateUtilMocked, uel, glucoseStatusProvider, repository)
+        smsCommunicatorPlugin = SmsCommunicatorPlugin(injector, aapsLogger, resourceHelper, smsManager, aapsSchedulers, sp, constraintChecker, rxBus, profileFunction, fabricPrivacy, activePlugin, commandQueue, loopPlugin, iobCobCalculator, xdripCalibrations, otp, ConfigImpl(), dateUtilMocked, uel, glucoseStatusProvider, repository)
         smsCommunicatorPlugin.setPluginEnabled(PluginType.GENERAL, true)
         Mockito.doAnswer { invocation: InvocationOnMock ->
             val callback = invocation.getArgument<Callback>(1)
@@ -261,7 +247,7 @@ class SmsCommunicatorPluginTest : TestBaseWithProfile() {
         Assert.assertTrue(smsCommunicatorPlugin.isCommand("BOLUS", ""))
         smsCommunicatorPlugin.messageToConfirm = null
         Assert.assertFalse(smsCommunicatorPlugin.isCommand("BLB", ""))
-        smsCommunicatorPlugin.messageToConfirm = AuthRequest(injector, Sms("1234", "ddd"), "RequestText", "ccode", object : SmsAction() {
+        smsCommunicatorPlugin.messageToConfirm = AuthRequest(injector, Sms("1234", "ddd"), "RequestText", "ccode", object : SmsAction(false) {
             override fun run() {}
         })
         Assert.assertTrue(smsCommunicatorPlugin.isCommand("BLB", "1234"))
@@ -309,7 +295,7 @@ class SmsCommunicatorPluginTest : TestBaseWithProfile() {
         `when`(sp.getBoolean(R.string.key_smscommunicator_remotecommandsallowed, false)).thenReturn(true)
 
         //LOOP STATUS : disabled
-        PowerMockito.`when`(loopPlugin.isEnabled(PluginType.LOOP)).thenReturn(false)
+        `when`(loopPlugin.enabled).thenReturn(false)
         smsCommunicatorPlugin.messages = ArrayList()
         sms = Sms("1234", "LOOP STATUS")
         smsCommunicatorPlugin.processSms(sms)
@@ -317,9 +303,9 @@ class SmsCommunicatorPluginTest : TestBaseWithProfile() {
         Assert.assertEquals("Loop is disabled", smsCommunicatorPlugin.messages[1].text)
 
         //LOOP STATUS : suspended
-        PowerMockito.`when`(loopPlugin.minutesToEndOfSuspend()).thenReturn(10)
-        PowerMockito.`when`(loopPlugin.isEnabled(PluginType.LOOP)).thenReturn(true)
-        PowerMockito.`when`(loopPlugin.isSuspended).thenReturn(true)
+        `when`(loopPlugin.minutesToEndOfSuspend()).thenReturn(10)
+        `when`(loopPlugin.enabled).thenReturn(true)
+        `when`(loopPlugin.isSuspended).thenReturn(true)
         smsCommunicatorPlugin.messages = ArrayList()
         sms = Sms("1234", "LOOP STATUS")
         smsCommunicatorPlugin.processSms(sms)
@@ -327,8 +313,8 @@ class SmsCommunicatorPluginTest : TestBaseWithProfile() {
         Assert.assertEquals("Suspended (10 m)", smsCommunicatorPlugin.messages[1].text)
 
         //LOOP STATUS : enabled
-        PowerMockito.`when`(loopPlugin.isEnabled(PluginType.LOOP)).thenReturn(true)
-        PowerMockito.`when`(loopPlugin.isSuspended).thenReturn(false)
+        `when`(loopPlugin.enabled).thenReturn(true)
+        `when`(loopPlugin.isSuspended).thenReturn(false)
         smsCommunicatorPlugin.messages = ArrayList()
         sms = Sms("1234", "LOOP STATUS")
         smsCommunicatorPlugin.processSms(sms)
@@ -337,7 +323,7 @@ class SmsCommunicatorPluginTest : TestBaseWithProfile() {
         Assert.assertEquals("Loop is enabled", smsCommunicatorPlugin.messages[1].text)
 
         //LOOP : wrong format
-        PowerMockito.`when`(loopPlugin.isEnabled(PluginType.LOOP)).thenReturn(true)
+        `when`(loopPlugin.enabled).thenReturn(true)
         smsCommunicatorPlugin.messages = ArrayList()
         sms = Sms("1234", "LOOP")
         smsCommunicatorPlugin.processSms(sms)
@@ -346,7 +332,7 @@ class SmsCommunicatorPluginTest : TestBaseWithProfile() {
         Assert.assertEquals("Wrong format", smsCommunicatorPlugin.messages[1].text)
 
         //LOOP DISABLE : already disabled
-        PowerMockito.`when`(loopPlugin.isEnabled(PluginType.LOOP)).thenReturn(false)
+        `when`(loopPlugin.enabled).thenReturn(false)
         smsCommunicatorPlugin.messages = ArrayList()
         sms = Sms("1234", "LOOP DISABLE")
         smsCommunicatorPlugin.processSms(sms)
@@ -356,11 +342,11 @@ class SmsCommunicatorPluginTest : TestBaseWithProfile() {
 
         //LOOP DISABLE : from enabled
         hasBeenRun = false
-        PowerMockito.`when`(loopPlugin.isEnabled(PluginType.LOOP)).thenReturn(true)
-        PowerMockito.doAnswer(Answer {
-            hasBeenRun = true
-            null
-        } as Answer<*>).`when`(loopPlugin).setPluginEnabled(PluginType.LOOP, false)
+        `when`(loopPlugin.enabled).thenReturn(true)
+        // PowerMockito.doAnswer(Answer {
+        //     hasBeenRun = true
+        //     null
+        // } as Answer<*>).`when`(loopPlugin).setPluginEnabled(PluginType.LOOP, false)
         smsCommunicatorPlugin.messages = ArrayList()
         sms = Sms("1234", "LOOP DISABLE")
         smsCommunicatorPlugin.processSms(sms)
@@ -371,10 +357,10 @@ class SmsCommunicatorPluginTest : TestBaseWithProfile() {
         smsCommunicatorPlugin.processSms(Sms("1234", passCode))
         Assert.assertEquals(passCode, smsCommunicatorPlugin.messages[2].text)
         Assert.assertEquals("Loop has been disabled Temp basal canceled", smsCommunicatorPlugin.messages[3].text)
-        Assert.assertTrue(hasBeenRun)
+        //Assert.assertTrue(hasBeenRun)
 
         //LOOP ENABLE : already enabled
-        PowerMockito.`when`(loopPlugin.isEnabled(PluginType.LOOP)).thenReturn(true)
+        `when`(loopPlugin.enabled).thenReturn(true)
         smsCommunicatorPlugin.messages = ArrayList()
         sms = Sms("1234", "LOOP ENABLE")
         smsCommunicatorPlugin.processSms(sms)
@@ -384,11 +370,11 @@ class SmsCommunicatorPluginTest : TestBaseWithProfile() {
 
         //LOOP ENABLE : from disabled
         hasBeenRun = false
-        PowerMockito.`when`(loopPlugin.isEnabled(PluginType.LOOP)).thenReturn(false)
-        PowerMockito.doAnswer(Answer {
-            hasBeenRun = true
-            null
-        } as Answer<*>).`when`(loopPlugin).setPluginEnabled(PluginType.LOOP, true)
+        `when`(loopPlugin.enabled).thenReturn(false)
+        // PowerMockito.doAnswer(Answer {
+        //     hasBeenRun = true
+        //     null
+        // } as Answer<*>).`when`(loopPlugin).setPluginEnabled(PluginType.LOOP, true)
         smsCommunicatorPlugin.messages = ArrayList()
         sms = Sms("1234", "LOOP ENABLE")
         smsCommunicatorPlugin.processSms(sms)
@@ -399,9 +385,13 @@ class SmsCommunicatorPluginTest : TestBaseWithProfile() {
         smsCommunicatorPlugin.processSms(Sms("1234", passCode))
         Assert.assertEquals(passCode, smsCommunicatorPlugin.messages[2].text)
         Assert.assertEquals("Loop has been enabled", smsCommunicatorPlugin.messages[3].text)
-        Assert.assertTrue(hasBeenRun)
+        //Assert.assertTrue(hasBeenRun)
 
         //LOOP RESUME : already enabled
+        `when`(
+            repository.runTransactionForResult(anyObject<Transaction<CancelCurrentOfflineEventIfAnyTransaction.TransactionResult>>())
+        ).thenReturn(Single.just(CancelCurrentOfflineEventIfAnyTransaction.TransactionResult().apply {
+        }))
         smsCommunicatorPlugin.messages = ArrayList()
         sms = Sms("1234", "LOOP RESUME")
         smsCommunicatorPlugin.processSms(sms)
@@ -430,6 +420,10 @@ class SmsCommunicatorPluginTest : TestBaseWithProfile() {
         Assert.assertEquals("Wrong duration", smsCommunicatorPlugin.messages[1].text)
 
         //LOOP SUSPEND 100 : suspend for 100 min + correct answer
+        `when`(
+            repository.runTransactionForResult(anyObject<Transaction<InsertAndCancelCurrentOfflineEventTransaction.TransactionResult>>())
+        ).thenReturn(Single.just(InsertAndCancelCurrentOfflineEventTransaction.TransactionResult().apply {
+        }))
         smsCommunicatorPlugin.messages = ArrayList()
         sms = Sms("1234", "LOOP SUSPEND 100")
         smsCommunicatorPlugin.processSms(sms)
@@ -470,8 +464,8 @@ class SmsCommunicatorPluginTest : TestBaseWithProfile() {
         Assert.assertEquals("Wrong format", smsCommunicatorPlugin.messages[1].text)
 
         //NSCLIENT RESTART
-        PowerMockito.`when`(loopPlugin.isEnabled(PluginType.LOOP)).thenReturn(true)
-        PowerMockito.`when`(loopPlugin.isSuspended).thenReturn(false)
+        `when`(loopPlugin.isEnabled(PluginType.LOOP)).thenReturn(true)
+        `when`(loopPlugin.isSuspended).thenReturn(false)
         smsCommunicatorPlugin.messages = ArrayList()
         sms = Sms("1234", "NSCLIENT RESTART")
         smsCommunicatorPlugin.processSms(sms)
@@ -480,8 +474,8 @@ class SmsCommunicatorPluginTest : TestBaseWithProfile() {
         Assert.assertTrue(smsCommunicatorPlugin.messages[1].text.contains("NSCLIENT RESTART"))
 
         //NSCLIENT BLA BLA
-        PowerMockito.`when`(loopPlugin.isEnabled(PluginType.LOOP)).thenReturn(true)
-        PowerMockito.`when`(loopPlugin.isSuspended).thenReturn(false)
+        `when`(loopPlugin.isEnabled(PluginType.LOOP)).thenReturn(true)
+        `when`(loopPlugin.isSuspended).thenReturn(false)
         smsCommunicatorPlugin.messages = ArrayList()
         sms = Sms("1234", "NSCLIENT BLA BLA")
         smsCommunicatorPlugin.processSms(sms)
@@ -490,8 +484,8 @@ class SmsCommunicatorPluginTest : TestBaseWithProfile() {
         Assert.assertEquals("Wrong format", smsCommunicatorPlugin.messages[1].text)
 
         //NSCLIENT BLABLA
-        PowerMockito.`when`(loopPlugin.isEnabled(PluginType.LOOP)).thenReturn(true)
-        PowerMockito.`when`(loopPlugin.isSuspended).thenReturn(false)
+        `when`(loopPlugin.isEnabled(PluginType.LOOP)).thenReturn(true)
+        `when`(loopPlugin.isSuspended).thenReturn(false)
         smsCommunicatorPlugin.messages = ArrayList()
         sms = Sms("1234", "NSCLIENT BLABLA")
         smsCommunicatorPlugin.processSms(sms)
@@ -523,7 +517,11 @@ class SmsCommunicatorPluginTest : TestBaseWithProfile() {
         Assert.assertEquals("Wrong format", smsCommunicatorPlugin.messages[1].text)
 
         //PUMP CONNECT
-        PowerMockito.`when`(loopPlugin.isEnabled(PluginType.LOOP)).thenReturn(true)
+        `when`(
+            repository.runTransactionForResult(anyObject<Transaction<CancelCurrentOfflineEventIfAnyTransaction.TransactionResult>>())
+        ).thenReturn(Single.just(CancelCurrentOfflineEventIfAnyTransaction.TransactionResult().apply {
+        }))
+        `when`(loopPlugin.enabled).thenReturn(true)
         smsCommunicatorPlugin.messages = ArrayList()
         sms = Sms("1234", "PUMP CONNECT")
         smsCommunicatorPlugin.processSms(sms)
@@ -551,6 +549,7 @@ class SmsCommunicatorPluginTest : TestBaseWithProfile() {
         Assert.assertEquals("Wrong duration", smsCommunicatorPlugin.messages[1].text)
 
         //PUMP DISCONNECT 30
+        `when`(profileFunction.getProfile()).thenReturn(validProfile)
         smsCommunicatorPlugin.messages = ArrayList()
         sms = Sms("1234", "PUMP DISCONNECT 30")
         smsCommunicatorPlugin.processSms(sms)
@@ -888,7 +887,7 @@ class SmsCommunicatorPluginTest : TestBaseWithProfile() {
         Assert.assertEquals("BOLUS", smsCommunicatorPlugin.messages[0].text)
         Assert.assertEquals("Wrong format", smsCommunicatorPlugin.messages[1].text)
         `when`(constraintChecker.applyBolusConstraints(anyObject())).thenReturn(Constraint(1.0))
-        PowerMockito.`when`(dateUtilMocked.now()).thenReturn(1000L)
+        `when`(dateUtilMocked.now()).thenReturn(1000L)
         `when`(sp.getLong(R.string.key_smscommunicator_remotebolusmindistance, T.msecs(Constants.remoteBolusMinDistance).mins())).thenReturn(15L)
         //BOLUS 1
         smsCommunicatorPlugin.messages = ArrayList()
@@ -897,7 +896,7 @@ class SmsCommunicatorPluginTest : TestBaseWithProfile() {
         Assert.assertEquals("BOLUS 1", smsCommunicatorPlugin.messages[0].text)
         Assert.assertEquals("Remote bolus not available. Try again later.", smsCommunicatorPlugin.messages[1].text)
         `when`(constraintChecker.applyBolusConstraints(anyObject())).thenReturn(Constraint(0.0))
-        PowerMockito.`when`(dateUtilMocked.now()).thenReturn(Constants.remoteBolusMinDistance + 1002L)
+        `when`(dateUtilMocked.now()).thenReturn(Constants.remoteBolusMinDistance + 1002L)
 
         //BOLUS 0
         smsCommunicatorPlugin.messages = ArrayList()
@@ -928,13 +927,13 @@ class SmsCommunicatorPluginTest : TestBaseWithProfile() {
 
         //BOLUS 1 (Suspended pump)
         smsCommunicatorPlugin.lastRemoteBolusTime = 0
-        PowerMockito.`when`(virtualPumpPlugin.isSuspended()).thenReturn(true)
+        `when`(virtualPumpPlugin.isSuspended()).thenReturn(true)
         smsCommunicatorPlugin.messages = ArrayList()
         sms = Sms("1234", "BOLUS 1")
         smsCommunicatorPlugin.processSms(sms)
         Assert.assertEquals("BOLUS 1", smsCommunicatorPlugin.messages[0].text)
         Assert.assertEquals("Pump suspended", smsCommunicatorPlugin.messages[1].text)
-        PowerMockito.`when`(virtualPumpPlugin.isSuspended()).thenReturn(false)
+        `when`(virtualPumpPlugin.isSuspended()).thenReturn(false)
 
         //BOLUS 1 a
         smsCommunicatorPlugin.messages = ArrayList()
@@ -979,7 +978,7 @@ class SmsCommunicatorPluginTest : TestBaseWithProfile() {
         smsCommunicatorPlugin.processSms(sms)
         Assert.assertEquals("CAL 0", smsCommunicatorPlugin.messages[0].text)
         Assert.assertEquals("Wrong format", smsCommunicatorPlugin.messages[1].text)
-        PowerMockito.`when`(xdripCalibrations.sendIntent(ArgumentMatchers.anyDouble())).thenReturn(true)
+        `when`(xdripCalibrations.sendIntent(ArgumentMatchers.anyDouble())).thenReturn(true)
         //CAL 1
         smsCommunicatorPlugin.messages = ArrayList()
         sms = Sms("1234", "CAL 1")
@@ -993,7 +992,7 @@ class SmsCommunicatorPluginTest : TestBaseWithProfile() {
     }
 
     @Test fun processCarbsTest() {
-        PowerMockito.`when`(dateUtilMocked.now()).thenReturn(1000000L)
+        `when`(dateUtilMocked.now()).thenReturn(1000000L)
         `when`(sp.getBoolean(R.string.key_smscommunicator_remotecommandsallowed, false)).thenReturn(false)
         //CAL
         smsCommunicatorPlugin.messages = ArrayList()
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsTest.kt
index 8224865402..75e2d0b602 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsTest.kt
@@ -4,19 +4,15 @@ import android.telephony.SmsMessage
 import info.nightscout.androidaps.TestBase
 import org.junit.Assert
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.powermock.api.mockito.PowerMockito
-import org.powermock.core.classloader.annotations.PrepareForTest
-import org.powermock.modules.junit4.PowerMockRunner
+import org.mockito.Mockito
+import org.mockito.Mockito.`when`
 
-@RunWith(PowerMockRunner::class)
-@PrepareForTest(SmsMessage::class)
 class SmsTest : TestBase() {
 
     @Test fun doTests() {
-        val smsMessage = PowerMockito.mock(SmsMessage::class.java)
-        PowerMockito.`when`(smsMessage.originatingAddress).thenReturn("aNumber")
-        PowerMockito.`when`(smsMessage.messageBody).thenReturn("aBody")
+        val smsMessage = Mockito.mock(SmsMessage::class.java)
+        `when`(smsMessage.originatingAddress).thenReturn("aNumber")
+        `when`(smsMessage.messageBody).thenReturn("aBody")
         var sms = Sms(smsMessage)
         Assert.assertEquals(sms.phoneNumber, "aNumber")
         Assert.assertEquals(sms.text, "aBody")
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/general/tidepool/comm/SessionTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/general/tidepool/comm/SessionTest.kt
index b172447cec..f7af8d995b 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/general/tidepool/comm/SessionTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/general/tidepool/comm/SessionTest.kt
@@ -5,10 +5,7 @@ import info.nightscout.androidaps.plugins.general.tidepool.messages.DatasetReply
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertNull
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.powermock.modules.junit4.PowerMockRunner
 
-@RunWith(PowerMockRunner::class)
 class SessionTest {
     @Test
     fun populateBody() {
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/virtual/VirtualPumpPluginUTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/virtual/VirtualPumpPluginUTest.kt
index 53b4bc6086..3cae396031 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/virtual/VirtualPumpPluginUTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/virtual/VirtualPumpPluginUTest.kt
@@ -1,7 +1,6 @@
 package info.nightscout.androidaps.plugins.pump.virtual
 
 import dagger.android.AndroidInjector
-import info.nightscout.androidaps.utils.buildHelper.ConfigImpl
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.TestBase
 import info.nightscout.androidaps.interfaces.CommandQueueProvider
@@ -12,19 +11,15 @@ import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.pump.common.defs.PumpType
 import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.utils.FabricPrivacy
+import info.nightscout.androidaps.utils.buildHelper.ConfigImpl
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import info.nightscout.androidaps.utils.sharedPreferences.SP
 import org.junit.Assert
 import org.junit.Before
 import org.junit.Test
-import org.junit.runner.RunWith
 import org.mockito.Mock
-import org.powermock.api.mockito.PowerMockito
-import org.powermock.core.classloader.annotations.PrepareForTest
-import org.powermock.modules.junit4.PowerMockRunner
+import org.mockito.Mockito.`when`
 
-@RunWith(PowerMockRunner::class)
-@PrepareForTest(FabricPrivacy::class, DateUtil::class)
 class VirtualPumpPluginUTest : TestBase() {
 
     private val rxBus = RxBusWrapper(aapsSchedulers)
@@ -46,16 +41,16 @@ class VirtualPumpPluginUTest : TestBase() {
 
     @Test
     fun refreshConfiguration() {
-        PowerMockito.`when`(sp.getString(R.string.key_virtualpump_type, "Generic AAPS")).thenReturn("Accu-Chek Combo")
+        `when`(sp.getString(R.string.key_virtualpump_type, "Generic AAPS")).thenReturn("Accu-Chek Combo")
         virtualPumpPlugin.refreshConfiguration()
         Assert.assertEquals(PumpType.ACCU_CHEK_COMBO, virtualPumpPlugin.pumpType)
     }
 
     @Test
     fun refreshConfigurationTwice() {
-        PowerMockito.`when`(sp.getString(R.string.key_virtualpump_type, "Generic AAPS")).thenReturn("Accu-Chek Combo")
+        `when`(sp.getString(R.string.key_virtualpump_type, "Generic AAPS")).thenReturn("Accu-Chek Combo")
         virtualPumpPlugin.refreshConfiguration()
-        PowerMockito.`when`(sp.getString(R.string.key_virtualpump_type, "Generic AAPS")).thenReturn("Accu-Chek Combo")
+        `when`(sp.getString(R.string.key_virtualpump_type, "Generic AAPS")).thenReturn("Accu-Chek Combo")
         virtualPumpPlugin.refreshConfiguration()
         Assert.assertEquals(PumpType.ACCU_CHEK_COMBO, virtualPumpPlugin.pumpType)
     }
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/sensitivity/AbstractSensitivityPluginTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/sensitivity/AbstractSensitivityPluginTest.kt
index 40b5520720..a35ff07f17 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/sensitivity/AbstractSensitivityPluginTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/sensitivity/AbstractSensitivityPluginTest.kt
@@ -13,11 +13,8 @@ import info.nightscout.androidaps.utils.sharedPreferences.SP
 import org.json.JSONObject
 import org.junit.Assert
 import org.junit.Test
-import org.junit.runner.RunWith
 import org.mockito.Mock
-import org.powermock.modules.junit4.PowerMockRunner
 
-@RunWith(PowerMockRunner::class)
 class AbstractSensitivityPluginTest : TestBase() {
 
     @Mock lateinit var pluginDescription: PluginDescription
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/source/MM640GPluginTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/source/MM640GPluginTest.kt
index e2471d6acf..a1c98901c8 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/source/MM640GPluginTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/source/MM640GPluginTest.kt
@@ -8,11 +8,8 @@ import info.nightscout.androidaps.utils.sharedPreferences.SP
 import org.junit.Assert
 import org.junit.Before
 import org.junit.Test
-import org.junit.runner.RunWith
 import org.mockito.Mock
-import org.powermock.modules.junit4.PowerMockRunner
 
-@RunWith(PowerMockRunner::class)
 class MM640GPluginTest : TestBase() {
 
     private lateinit var mM640gPlugin: MM640gPlugin
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/source/NSClientPluginTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/source/NSClientPluginTest.kt
index ebd1e14b03..0a1211596e 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/source/NSClientPluginTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/source/NSClientPluginTest.kt
@@ -1,18 +1,15 @@
 package info.nightscout.androidaps.plugins.source
 
 import dagger.android.AndroidInjector
-import info.nightscout.androidaps.utils.buildHelper.ConfigImpl
 import info.nightscout.androidaps.TestBase
+import info.nightscout.androidaps.utils.buildHelper.ConfigImpl
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import info.nightscout.androidaps.utils.sharedPreferences.SP
 import org.junit.Assert
 import org.junit.Before
 import org.junit.Test
-import org.junit.runner.RunWith
 import org.mockito.Mock
-import org.powermock.modules.junit4.PowerMockRunner
 
-@RunWith(PowerMockRunner::class)
 class NSClientPluginTest : TestBase() {
 
     private lateinit var nsClientSourcePlugin: NSClientSourcePlugin
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/source/XdripPluginTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/source/XdripPluginTest.kt
index ed1dc9c91d..8b49149b3d 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/source/XdripPluginTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/source/XdripPluginTest.kt
@@ -3,16 +3,12 @@ package info.nightscout.androidaps.plugins.source
 import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.TestBase
-import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import org.junit.Assert
 import org.junit.Before
 import org.junit.Test
-import org.junit.runner.RunWith
 import org.mockito.Mock
-import org.powermock.modules.junit4.PowerMockRunner
 
-@RunWith(PowerMockRunner::class)
 class XdripPluginTest : TestBase() {
 
     private lateinit var xdripPlugin: XdripPlugin
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/treatments/TreatmentsPluginTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/treatments/TreatmentsPluginTest.kt
index a12a382840..a8c38819de 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/treatments/TreatmentsPluginTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/treatments/TreatmentsPluginTest.kt
@@ -4,36 +4,18 @@ import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.TestBaseWithProfile
 import info.nightscout.androidaps.database.AppRepository
-import info.nightscout.androidaps.db.TemporaryBasal
-import info.nightscout.androidaps.interfaces.DatabaseHelperInterface
-import info.nightscout.androidaps.utils.DateUtil
-import info.nightscout.androidaps.utils.FabricPrivacy
 import info.nightscout.androidaps.utils.sharedPreferences.SP
 import org.junit.Test
-import org.junit.runner.RunWith
 import org.mockito.Mock
-import org.powermock.core.classloader.annotations.PrepareForTest
-import org.powermock.modules.junit4.PowerMockRunner
 
 @Suppress("SpellCheckingInspection")
-@RunWith(PowerMockRunner::class)
-@PrepareForTest(FabricPrivacy::class, DatabaseHelperInterface::class, AppRepository::class)
 class TreatmentsPluginTest : TestBaseWithProfile() {
 
     @Mock lateinit var sp: SP
-    @Mock lateinit var treatmentService: TreatmentService
     @Mock lateinit var repository: AppRepository
-    @Mock lateinit var databaseHelper: DatabaseHelperInterface
 
     val injector = HasAndroidInjector {
         AndroidInjector {
-            if (it is TemporaryBasal) {
-                it.aapsLogger = aapsLogger
-                it.activePlugin = activePluginProvider
-                it.profileFunction = profileFunction
-                it.sp = sp
-                it.dateUtil = DateUtil(context)
-            }
         }
     }
 
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 cd03c5cffa..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,20 +12,19 @@ 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
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
-import info.nightscout.androidaps.plugins.general.maintenance.LoggerUtils
-import info.nightscout.androidaps.plugins.pump.virtual.VirtualPumpPlugin
-import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin
+import info.nightscout.androidaps.plugins.general.maintenance.PrefFileListProvider
 import info.nightscout.androidaps.queue.commands.*
 import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.utils.FabricPrivacy
-import info.nightscout.androidaps.utils.ToastUtils
 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
@@ -34,27 +33,19 @@ import io.reactivex.Single
 import org.junit.Assert
 import org.junit.Before
 import org.junit.Test
-import org.junit.runner.RunWith
 import org.mockito.Mock
 import org.mockito.Mockito.`when`
 import org.mockito.Mockito.anyLong
-import org.powermock.core.classloader.annotations.PrepareForTest
-import org.powermock.modules.junit4.PowerMockRunner
 import java.util.*
 
-@RunWith(PowerMockRunner::class)
-@PrepareForTest(
-    ConstraintChecker::class, VirtualPumpPlugin::class, ToastUtils::class, Context::class,
-    TreatmentsPlugin::class, FabricPrivacy::class, LoggerUtils::class, PowerManager::class,
-    AppRepository::class)
 class CommandQueueTest : TestBaseWithProfile() {
 
     @Mock lateinit var constraintChecker: ConstraintChecker
     @Mock lateinit var activePlugin: ActivePlugin
     @Mock lateinit var sp: SP
-    @Mock lateinit var loggerUtils: LoggerUtils
     @Mock lateinit var powerManager: PowerManager
     @Mock lateinit var repository: AppRepository
+    @Mock lateinit var fileListProvider: PrefFileListProvider
 
     class CommandQueueMocked(
         injector: HasAndroidInjector,
@@ -70,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() {}
 
@@ -107,7 +100,10 @@ class CommandQueueTest : TestBaseWithProfile() {
 
     @Before
     fun prepare() {
-        commandQueue = CommandQueueMocked(injector, aapsLogger, rxBus, aapsSchedulers, resourceHelper, constraintChecker, profileFunction, activePlugin, context, sp, BuildHelper(ConfigImpl(), loggerUtils), 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
@@ -138,7 +134,10 @@ class CommandQueueTest : TestBaseWithProfile() {
 
     @Test
     fun commandIsPickedUp() {
-        val commandQueue = CommandQueue(injector, aapsLogger, rxBus, aapsSchedulers, resourceHelper, constraintChecker, profileFunction, activePlugin, context, sp, BuildHelper(ConfigImpl(), loggerUtils), 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 ff19abebf4..7944588efd 100644
--- a/app/src/test/java/info/nightscout/androidaps/queue/QueueThreadTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/queue/QueueThreadTest.kt
@@ -12,35 +12,24 @@ import info.nightscout.androidaps.interfaces.Constraint
 import info.nightscout.androidaps.interfaces.PumpDescription
 import info.nightscout.androidaps.interfaces.PumpSync
 import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
-import info.nightscout.androidaps.plugins.general.maintenance.LoggerUtils
-import info.nightscout.androidaps.plugins.pump.virtual.VirtualPumpPlugin
-import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin
+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.FabricPrivacy
-import info.nightscout.androidaps.utils.ToastUtils
-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
 import org.junit.Before
 import org.junit.Test
-import org.junit.runner.RunWith
 import org.mockito.Mock
 import org.mockito.Mockito
-import org.powermock.core.classloader.annotations.PrepareForTest
-import org.powermock.modules.junit4.PowerMockRunner
 
-@RunWith(PowerMockRunner::class)
-@PrepareForTest(
-    ConstraintChecker::class, VirtualPumpPlugin::class, ToastUtils::class, Context::class,
-    TreatmentsPlugin::class, FabricPrivacy::class, LoggerUtils::class, PowerManager::class)
 class QueueThreadTest : TestBaseWithProfile() {
 
     @Mock lateinit var constraintChecker: ConstraintChecker
     @Mock lateinit var activePlugin: ActivePlugin
     @Mock lateinit var sp: SP
-    @Mock lateinit var loggerUtils: LoggerUtils
+    @Mock lateinit var fileListProvider: PrefFileListProvider
     @Mock lateinit var powerManager: PowerManager
     @Mock lateinit var repository: AppRepository
 
@@ -63,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(), loggerUtils), 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
@@ -80,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/app/src/test/java/info/nightscout/androidaps/utils/SntpClientTest.kt b/app/src/test/java/info/nightscout/androidaps/utils/SntpClientTest.kt
index 5224a6129c..04f0156e77 100644
--- a/app/src/test/java/info/nightscout/androidaps/utils/SntpClientTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/utils/SntpClientTest.kt
@@ -3,14 +3,8 @@ package info.nightscout.androidaps.utils
 import info.nightscout.androidaps.TestBase
 import org.junit.Assert
 import org.junit.Test
-import org.junit.runner.RunWith
 import org.mockito.Mock
-import org.powermock.core.classloader.annotations.PrepareForTest
-import org.powermock.modules.junit4.PowerMockRunner
 
-
-@RunWith(PowerMockRunner::class)
-@PrepareForTest(DateUtil::class)
 class SntpClientTest : TestBase() {
     @Mock lateinit var dateUtil: DateUtil
 
diff --git a/app/src/test/java/info/nightscout/androidaps/utils/wizard/BolusWizardTest.kt b/app/src/test/java/info/nightscout/androidaps/utils/wizard/BolusWizardTest.kt
index fa1e175567..8246239f76 100644
--- a/app/src/test/java/info/nightscout/androidaps/utils/wizard/BolusWizardTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/utils/wizard/BolusWizardTest.kt
@@ -13,21 +13,15 @@ import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.AutosensDataStore
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatusProvider
 import info.nightscout.androidaps.plugins.pump.virtual.VirtualPumpPlugin
-import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin
 import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import org.junit.Assert
 import org.junit.Test
-import org.junit.runner.RunWith
 import org.mockito.Mock
 import org.mockito.Mockito
 import org.mockito.Mockito.`when`
 import org.mockito.invocation.InvocationOnMock
-import org.powermock.core.classloader.annotations.PrepareForTest
-import org.powermock.modules.junit4.PowerMockRunner
 
-@RunWith(PowerMockRunner::class)
-@PrepareForTest(ConstraintChecker::class, VirtualPumpPlugin::class, DateUtil::class, AutosensDataStore::class)
 class BolusWizardTest : TestBase() {
 
     private val pumpBolusStep = 0.1
@@ -40,7 +34,6 @@ class BolusWizardTest : TestBase() {
     @Mock lateinit var commandQueue: CommandQueueProvider
     @Mock lateinit var loopPlugin: LoopPlugin
     @Mock lateinit var iobCobCalculator: IobCobCalculator
-    @Mock lateinit var treatmentsPlugin: TreatmentsPlugin
     @Mock lateinit var virtualPumpPlugin: VirtualPumpPlugin
     @Mock lateinit var dateUtil: DateUtil
     @Mock lateinit var autosensDataStore: AutosensDataStore
@@ -71,7 +64,6 @@ class BolusWizardTest : TestBase() {
         `when`(profile.getIc()).thenReturn(insulinToCarbRatio)
 
         `when`(profileFunction.getUnits()).thenReturn(GlucoseUnit.MGDL)
-        `when`(activePlugin.activeTreatments).thenReturn(treatmentsPlugin)
         `when`(iobCobCalculator.calculateIobFromBolus()).thenReturn(IobTotal(System.currentTimeMillis()))
         `when`(iobCobCalculator.calculateIobFromTempBasalsIncludingConvertedExtended()).thenReturn(IobTotal(System.currentTimeMillis()))
         `when`(activePlugin.activePump).thenReturn(virtualPumpPlugin)
diff --git a/automation/build.gradle b/automation/build.gradle
index 55565f892b..5e06a3e587 100644
--- a/automation/build.gradle
+++ b/automation/build.gradle
@@ -1,20 +1,15 @@
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-kapt'
+apply plugin: 'kotlin-allopen'
 apply plugin: 'com.hiya.jacoco-android'
 
 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"
 
 
-android {
-    defaultConfig {
-        versionCode 1
-        versionName "1.0"
-    }
-}
-
 dependencies {
     implementation project(':core')
     implementation project(':database')
diff --git a/automation/src/main/java/info/nightscout/androidaps/automation/di/AutomationModule.kt b/automation/src/main/java/info/nightscout/androidaps/automation/di/AutomationModule.kt
index 2fd51b4088..977cc208d5 100644
--- a/automation/src/main/java/info/nightscout/androidaps/automation/di/AutomationModule.kt
+++ b/automation/src/main/java/info/nightscout/androidaps/automation/di/AutomationModule.kt
@@ -27,6 +27,7 @@ abstract class AutomationModule {
     @ContributesAndroidInjector abstract fun triggerBTDeviceInjector(): TriggerBTDevice
     @ContributesAndroidInjector abstract fun triggerRecurringTimeInjector(): TriggerRecurringTime
     @ContributesAndroidInjector abstract fun triggerTempTargetInjector(): TriggerTempTarget
+    @ContributesAndroidInjector abstract fun triggerTempTargetValueInjector(): TriggerTempTargetValue
     @ContributesAndroidInjector abstract fun triggerTime(): TriggerTime
     @ContributesAndroidInjector abstract fun triggerTimeRangeInjector(): TriggerTimeRange
     @ContributesAndroidInjector abstract fun triggerWifiSsidInjector(): TriggerWifiSsid
diff --git a/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/AutomationEvent.kt b/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/AutomationEvent.kt
index ca2ba012e0..b02dfb0dd3 100644
--- a/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/AutomationEvent.kt
+++ b/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/AutomationEvent.kt
@@ -64,7 +64,7 @@ class AutomationEvent(private val injector: HasAndroidInjector) {
             .toString()
     }
 
-    fun fromJSON(data: String?): AutomationEvent {
+    fun fromJSON(data: String): AutomationEvent {
         val d = JSONObject(data)
         title = d.optString("title", "")
         isEnabled = d.optBoolean("enabled", true)
@@ -72,7 +72,6 @@ class AutomationEvent(private val injector: HasAndroidInjector) {
         readOnly = d.optBoolean("readOnly", false)
         autoRemove = d.optBoolean("autoRemove", false)
         trigger = TriggerDummy(injector).instantiate(JSONObject(d.getString("trigger")))
-            ?: TriggerConnector(injector)
         val array = d.getJSONArray("actions")
         actions.clear()
         for (i in 0 until array.length()) {
diff --git a/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/AutomationPlugin.kt b/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/AutomationPlugin.kt
index 6fdcd20ff7..404df4f4bb 100644
--- a/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/AutomationPlugin.kt
+++ b/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/AutomationPlugin.kt
@@ -5,10 +5,11 @@ import android.os.Handler
 import android.os.HandlerThread
 import android.os.SystemClock
 import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.annotations.OpenForTesting
 import info.nightscout.androidaps.automation.R
 import info.nightscout.androidaps.events.*
 import info.nightscout.androidaps.interfaces.Config
-import info.nightscout.androidaps.interfaces.LoopInterface
+import info.nightscout.androidaps.interfaces.Loop
 import info.nightscout.androidaps.interfaces.PluginBase
 import info.nightscout.androidaps.interfaces.PluginDescription
 import info.nightscout.androidaps.interfaces.PluginType
@@ -38,6 +39,7 @@ import javax.inject.Inject
 import javax.inject.Singleton
 import kotlin.collections.ArrayList
 
+@OpenForTesting
 @Singleton
 class AutomationPlugin @Inject constructor(
     injector: HasAndroidInjector,
@@ -45,7 +47,7 @@ class AutomationPlugin @Inject constructor(
     private val context: Context,
     private val sp: SP,
     private val fabricPrivacy: FabricPrivacy,
-    private val loopPlugin: LoopInterface,
+    private val loopPlugin: Loop,
     private val rxBus: RxBusWrapper,
     private val constraintChecker: ConstraintChecker,
     aapsLogger: AAPSLogger,
@@ -309,6 +311,7 @@ class AutomationPlugin @Inject constructor(
             TriggerCOB(injector),
             TriggerProfilePercent(injector),
             TriggerTempTarget(injector),
+            TriggerTempTargetValue(injector),
             TriggerWifiSsid(injector),
             TriggerLocation(injector),
             TriggerAutosensValue(injector),
diff --git a/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/Action.kt b/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/Action.kt
index 9d3b86e875..184b082cf5 100644
--- a/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/Action.kt
+++ b/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/Action.kt
@@ -9,7 +9,6 @@ import info.nightscout.androidaps.queue.Callback
 import org.json.JSONException
 import org.json.JSONObject
 import javax.inject.Inject
-import kotlin.reflect.full.primaryConstructor
 
 abstract class Action(val injector: HasAndroidInjector) {
 
@@ -34,7 +33,7 @@ abstract class Action(val injector: HasAndroidInjector) {
     open fun hasDialog(): Boolean = false
 
     open fun toJSON(): String =
-        JSONObject().put("type", this.javaClass.name).toString()
+        JSONObject().put("type", this.javaClass.simpleName).toString()
 
     open fun fromJSON(data: String): Action = this
 
@@ -48,10 +47,37 @@ abstract class Action(val injector: HasAndroidInjector) {
     fun instantiate(obj: JSONObject): Action? {
         try {
             val type = obj.getString("type")
-            val data = obj.optJSONObject("data")
-            val clazz = Class.forName(type).kotlin
-            return (clazz.primaryConstructor?.call(injector) as Action).fromJSON(data?.toString()
-                ?: "")
+            val data = if (obj.has("data")) obj.getJSONObject("data") else JSONObject()
+            return when (type) {
+                ActionAlarm::class.java.name,              // backward compatibility
+                ActionAlarm::class.java.simpleName                -> ActionAlarm(injector).fromJSON(data.toString())
+                ActionDummy::class.java.name,
+                ActionDummy::class.java.simpleName                -> ActionDummy(injector).fromJSON(data.toString())
+                ActionLoopDisable::class.java.name,
+                ActionLoopDisable::class.java.simpleName          -> ActionLoopDisable(injector).fromJSON(data.toString())
+                ActionLoopEnable::class.java.name,
+                ActionLoopEnable::class.java.simpleName           -> ActionLoopEnable(injector).fromJSON(data.toString())
+                ActionLoopResume::class.java.name,
+                ActionLoopResume::class.java.simpleName           -> ActionLoopResume(injector).fromJSON(data.toString())
+                ActionLoopSuspend::class.java.name,
+                ActionLoopSuspend::class.java.simpleName          -> ActionLoopSuspend(injector).fromJSON(data.toString())
+                ActionNotification::class.java.name,
+                ActionNotification::class.java.simpleName         -> ActionNotification(injector).fromJSON(data.toString())
+                ActionProfileSwitch::class.java.name,
+                ActionProfileSwitch::class.java.simpleName        -> ActionProfileSwitch(injector).fromJSON(data.toString())
+                ActionProfileSwitchPercent::class.java.name,
+                ActionProfileSwitchPercent::class.java.simpleName -> ActionProfileSwitchPercent(injector).fromJSON(data.toString())
+                ActionSendSMS::class.java.name,
+                ActionSendSMS::class.java.simpleName              -> ActionSendSMS(injector).fromJSON(data.toString())
+                ActionStartTempTarget::class.java.name,
+                ActionStartTempTarget::class.java.simpleName      -> ActionStartTempTarget(injector).fromJSON(data.toString())
+                ActionStopTempTarget::class.java.name,
+                ActionStopTempTarget::class.java.simpleName       -> ActionStopTempTarget(injector).fromJSON(data.toString())
+                else                                              -> throw ClassNotFoundException(type)
+            }
+            //val clazz = Class.forName(type).kotlin
+            //return (clazz.primaryConstructor?.call(injector) as Action).fromJSON(data?.toString()
+            //    ?: "")
             //return (clazz.newInstance() as Action).fromJSON(data?.toString() ?: "")
         } catch (e: ClassNotFoundException) {
             aapsLogger.error("Unhandled exception", e)
diff --git a/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionLoopDisable.kt b/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionLoopDisable.kt
index 848dc3c3b4..b6c391ebac 100644
--- a/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionLoopDisable.kt
+++ b/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionLoopDisable.kt
@@ -9,7 +9,7 @@ import info.nightscout.androidaps.database.entities.UserEntry.Sources
 import info.nightscout.androidaps.events.EventRefreshOverview
 import info.nightscout.androidaps.interfaces.CommandQueueProvider
 import info.nightscout.androidaps.interfaces.ConfigBuilder
-import info.nightscout.androidaps.interfaces.LoopInterface
+import info.nightscout.androidaps.interfaces.Loop
 import info.nightscout.androidaps.interfaces.PluginBase
 import info.nightscout.androidaps.interfaces.PluginType
 import info.nightscout.androidaps.logging.UserEntryLogger
@@ -19,7 +19,7 @@ import info.nightscout.androidaps.utils.resources.ResourceHelper
 import javax.inject.Inject
 
 class ActionLoopDisable(injector: HasAndroidInjector) : Action(injector) {
-    @Inject lateinit var loopPlugin: LoopInterface
+    @Inject lateinit var loopPlugin: Loop
     @Inject lateinit var resourceHelper: ResourceHelper
     @Inject lateinit var configBuilder: ConfigBuilder
     @Inject lateinit var commandQueue: CommandQueueProvider
diff --git a/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionLoopEnable.kt b/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionLoopEnable.kt
index d9c99ab41b..2864c2b96e 100644
--- a/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionLoopEnable.kt
+++ b/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionLoopEnable.kt
@@ -8,7 +8,7 @@ import info.nightscout.androidaps.database.entities.UserEntry
 import info.nightscout.androidaps.database.entities.UserEntry.Sources
 import info.nightscout.androidaps.events.EventRefreshOverview
 import info.nightscout.androidaps.interfaces.ConfigBuilder
-import info.nightscout.androidaps.interfaces.LoopInterface
+import info.nightscout.androidaps.interfaces.Loop
 import info.nightscout.androidaps.interfaces.PluginBase
 import info.nightscout.androidaps.interfaces.PluginType
 import info.nightscout.androidaps.logging.UserEntryLogger
@@ -20,7 +20,7 @@ import javax.inject.Inject
 class ActionLoopEnable(injector: HasAndroidInjector) : Action(injector) {
 
     @Inject lateinit var resourceHelper: ResourceHelper
-    @Inject lateinit var loopPlugin: LoopInterface
+    @Inject lateinit var loopPlugin: Loop
     @Inject lateinit var configBuilder: ConfigBuilder
     @Inject lateinit var rxBus: RxBusWrapper
     @Inject lateinit var uel: UserEntryLogger
diff --git a/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionLoopResume.kt b/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionLoopResume.kt
index a113a84506..25a22f54f0 100644
--- a/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionLoopResume.kt
+++ b/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionLoopResume.kt
@@ -4,33 +4,46 @@ import androidx.annotation.DrawableRes
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.automation.R
 import info.nightscout.androidaps.data.PumpEnactResult
+import info.nightscout.androidaps.database.AppRepository
 import info.nightscout.androidaps.database.entities.UserEntry
 import info.nightscout.androidaps.database.entities.UserEntry.Sources
+import info.nightscout.androidaps.database.transactions.CancelCurrentOfflineEventIfAnyTransaction
 import info.nightscout.androidaps.events.EventRefreshOverview
 import info.nightscout.androidaps.interfaces.ConfigBuilder
-import info.nightscout.androidaps.interfaces.LoopInterface
+import info.nightscout.androidaps.interfaces.Loop
+import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.logging.UserEntryLogger
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.queue.Callback
+import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.utils.resources.ResourceHelper
+import io.reactivex.disposables.CompositeDisposable
+import io.reactivex.rxkotlin.plusAssign
 import javax.inject.Inject
 
 class ActionLoopResume(injector: HasAndroidInjector) : Action(injector) {
     @Inject lateinit var resourceHelper: ResourceHelper
-    @Inject lateinit var loopPlugin: LoopInterface
+    @Inject lateinit var loopPlugin: Loop
     @Inject lateinit var configBuilder: ConfigBuilder
     @Inject lateinit var rxBus: RxBusWrapper
     @Inject lateinit var uel: UserEntryLogger
+    @Inject lateinit var repository: AppRepository
+    @Inject lateinit var dateUtil: DateUtil
 
     override fun friendlyName(): Int = R.string.resumeloop
     override fun shortDescription(): String = resourceHelper.gs(R.string.resumeloop)
     @DrawableRes override fun icon(): Int = R.drawable.ic_replay_24dp
 
+    val disposable = CompositeDisposable()
+
     override fun doAction(callback: Callback) {
         if (loopPlugin.isSuspended) {
-            loopPlugin.suspendTo(0)
-            configBuilder.storeSettings("ActionLoopResume")
-            loopPlugin.createOfflineEvent(0)
+            disposable += repository.runTransactionForResult(CancelCurrentOfflineEventIfAnyTransaction(dateUtil.now()))
+                .subscribe({ result ->
+                    result.updated.forEach { aapsLogger.debug(LTag.DATABASE, "Updated OfflineEvent $it") }
+                }, {
+                    aapsLogger.error(LTag.DATABASE, "Error while saving OfflineEvent", it)
+                })
             rxBus.send(EventRefreshOverview("ActionLoopResume"))
             uel.log(UserEntry.Action.RESUME, Sources.Automation, title)
             callback.result(PumpEnactResult(injector).success(true).comment(R.string.ok))?.run()
diff --git a/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionLoopSuspend.kt b/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionLoopSuspend.kt
index 797250b443..1ca41aa699 100644
--- a/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionLoopSuspend.kt
+++ b/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionLoopSuspend.kt
@@ -9,7 +9,7 @@ import info.nightscout.androidaps.database.entities.UserEntry
 import info.nightscout.androidaps.database.entities.UserEntry.Sources
 import info.nightscout.androidaps.database.entities.ValueWithUnit
 import info.nightscout.androidaps.events.EventRefreshOverview
-import info.nightscout.androidaps.interfaces.LoopInterface
+import info.nightscout.androidaps.interfaces.Loop
 import info.nightscout.androidaps.logging.UserEntryLogger
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.general.automation.elements.InputDuration
@@ -23,7 +23,7 @@ import javax.inject.Inject
 
 class ActionLoopSuspend(injector: HasAndroidInjector) : Action(injector) {
     @Inject lateinit var resourceHelper: ResourceHelper
-    @Inject lateinit var loopPlugin: LoopInterface
+    @Inject lateinit var loopPlugin: Loop
     @Inject lateinit var rxBus: RxBusWrapper
     @Inject lateinit var uel: UserEntryLogger
 
diff --git a/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionProfileSwitchPercent.kt b/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionProfileSwitchPercent.kt
index 546cafa12f..0634021564 100644
--- a/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionProfileSwitchPercent.kt
+++ b/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionProfileSwitchPercent.kt
@@ -9,6 +9,7 @@ import info.nightscout.androidaps.database.entities.UserEntry
 import info.nightscout.androidaps.database.entities.UserEntry.Sources
 import info.nightscout.androidaps.database.entities.ValueWithUnit
 import info.nightscout.androidaps.interfaces.ProfileFunction
+import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.logging.UserEntryLogger
 import info.nightscout.androidaps.plugins.general.automation.elements.Comparator
 import info.nightscout.androidaps.plugins.general.automation.elements.InputDuration
@@ -43,10 +44,17 @@ class ActionProfileSwitchPercent(injector: HasAndroidInjector) : Action(injector
     }
 
     override fun doAction(callback: Callback) {
-        uel.log(UserEntry.Action.PROFILE_SWITCH, Sources.Automation, title + ": " + resourceHelper.gs(R.string.startprofile, pct.value.toInt(), duration.value),
-            ValueWithUnit.Percent(pct.value.toInt()),
-            ValueWithUnit.Minute(duration.value))
-        profileFunction.createProfileSwitch(duration.value, pct.value.toInt(), 0)
+        if (profileFunction.createProfileSwitch(duration.value, pct.value.toInt(), 0)) {
+            uel.log(
+                UserEntry.Action.PROFILE_SWITCH,
+                Sources.Automation,
+                title + ": " + resourceHelper.gs(R.string.startprofile, pct.value.toInt(), duration.value),
+                ValueWithUnit.Percent(pct.value.toInt()),
+                ValueWithUnit.Minute(duration.value)
+            )
+        } else {
+            aapsLogger.error(LTag.AUTOMATION, "Final profile not valid")
+        }
         callback.result(PumpEnactResult(injector).success(true).comment(R.string.ok))?.run()
     }
 
diff --git a/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionStartTempTarget.kt b/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionStartTempTarget.kt
index b2e0397954..6775c1b34b 100644
--- a/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionStartTempTarget.kt
+++ b/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionStartTempTarget.kt
@@ -12,7 +12,7 @@ import info.nightscout.androidaps.database.entities.TemporaryTarget
 import info.nightscout.androidaps.database.entities.UserEntry
 import info.nightscout.androidaps.database.entities.UserEntry.Sources
 import info.nightscout.androidaps.database.entities.ValueWithUnit
-import info.nightscout.androidaps.database.transactions.InsertTemporaryTargetAndCancelCurrentTransaction
+import info.nightscout.androidaps.database.transactions.InsertAndCancelCurrentTemporaryTargetTransaction
 import info.nightscout.androidaps.interfaces.ActivePlugin
 import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.logging.LTag
@@ -59,7 +59,7 @@ class ActionStartTempTarget(injector: HasAndroidInjector) : Action(injector) {
     @DrawableRes override fun icon(): Int = R.drawable.ic_temptarget_high
 
     override fun doAction(callback: Callback) {
-        disposable += repository.runTransactionForResult(InsertTemporaryTargetAndCancelCurrentTransaction(tt()))
+        disposable += repository.runTransactionForResult(InsertAndCancelCurrentTemporaryTargetTransaction(tt()))
             .subscribe({ result ->
                 result.inserted.forEach { aapsLogger.debug(LTag.DATABASE, "Inserted temp target $it") }
                 result.updated.forEach { aapsLogger.debug(LTag.DATABASE, "Updated temp target $it") }
diff --git a/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/dragHelpers/SimpleItemTouchHelperCallback.kt b/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/dragHelpers/SimpleItemTouchHelperCallback.kt
index 849e5c6a26..1e633d4627 100644
--- a/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/dragHelpers/SimpleItemTouchHelperCallback.kt
+++ b/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/dragHelpers/SimpleItemTouchHelperCallback.kt
@@ -41,12 +41,12 @@ class SimpleItemTouchHelperCallback(private val mAdapter: ItemTouchHelperAdapter
             return false
         }
         // Notify the adapter of the move
-        mAdapter.onItemMove(source.adapterPosition, target.adapterPosition)
+        mAdapter.onItemMove(source.absoluteAdapterPosition, target.absoluteAdapterPosition)
         return true
     }
 
     override fun onSwiped(viewHolder: RecyclerView.ViewHolder, i: Int) { // Notify the adapter of the dismissal
-        mAdapter.onItemDismiss(viewHolder.adapterPosition)
+        mAdapter.onItemDismiss(viewHolder.absoluteAdapterPosition)
     }
 
     override fun onChildDraw(c: Canvas, recyclerView: RecyclerView, viewHolder: RecyclerView.ViewHolder, dX: Float, dY: Float, actionState: Int, isCurrentlyActive: Boolean) {
diff --git a/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/Trigger.kt b/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/Trigger.kt
index c67c10bb75..1a4b228398 100644
--- a/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/Trigger.kt
+++ b/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/Trigger.kt
@@ -43,6 +43,7 @@ abstract class Trigger(val injector: HasAndroidInjector) {
     @Inject lateinit var dateUtil: DateUtil
 
     init {
+        @Suppress("LeakingThis")
         injector.androidInjector().inject(this)
     }
 
@@ -55,16 +56,12 @@ abstract class Trigger(val injector: HasAndroidInjector) {
     abstract fun icon(): Optional<Int?>
     abstract fun duplicate(): Trigger
 
-    companion object {
-
-        @JvmStatic
-        fun scanForActivity(cont: Context?): AppCompatActivity? {
-            return when (cont) {
-                null                 -> null
-                is AppCompatActivity -> cont
-                is ContextWrapper    -> scanForActivity(cont.baseContext)
-                else                 -> null
-            }
+    private fun scanForActivity(cont: Context?): AppCompatActivity? {
+        return when (cont) {
+            null                 -> null
+            is AppCompatActivity -> cont
+            is ContextWrapper    -> scanForActivity(cont.baseContext)
+            else                 -> null
         }
     }
 
@@ -80,49 +77,75 @@ abstract class Trigger(val injector: HasAndroidInjector) {
             .put("data", dataJSON())
             .toString()
 
-    fun instantiate(obj: JSONObject): Trigger? {
+    fun instantiate(obj: JSONObject): Trigger {
         val type = obj.getString("type")
         val data = obj.getJSONObject("data")
         //val clazz = Class.forName(type).kotlin
         //return (clazz.primaryConstructor?.call(injector) as Trigger).fromJSON(data?.toString() ?: "")
         return when (type) {
             TriggerAutosensValue::class.java.name,              // backward compatibility
-            TriggerAutosensValue::class.java.simpleName      -> TriggerAutosensValue(injector).fromJSON(data?.toString() ?: "")
+            TriggerAutosensValue::class.java.simpleName      -> TriggerAutosensValue(injector).fromJSON(
+                data.toString()
+            )
             TriggerBg::class.java.name,
-            TriggerBg::class.java.simpleName                 -> TriggerBg(injector).fromJSON(data?.toString() ?: "")
+            TriggerBg::class.java.simpleName                 -> TriggerBg(injector).fromJSON(data.toString())
             TriggerBolusAgo::class.java.name,
-            TriggerBolusAgo::class.java.simpleName           -> TriggerBolusAgo(injector).fromJSON(data?.toString() ?: "")
+            TriggerBolusAgo::class.java.simpleName           -> TriggerBolusAgo(injector).fromJSON(
+                data.toString()
+            )
             TriggerBTDevice::class.java.name,
-            TriggerBTDevice::class.java.simpleName           -> TriggerBTDevice(injector).fromJSON(data?.toString() ?: "")
+            TriggerBTDevice::class.java.simpleName           -> TriggerBTDevice(injector).fromJSON(
+                data.toString()
+            )
             TriggerIob::class.java.name,
-            TriggerIob::class.java.simpleName                -> TriggerIob(injector).fromJSON(data?.toString() ?: "")
+            TriggerIob::class.java.simpleName                -> TriggerIob(injector).fromJSON(data.toString())
             TriggerCOB::class.java.name,
-            TriggerCOB::class.java.simpleName                -> TriggerCOB(injector).fromJSON(data?.toString() ?: "")
+            TriggerCOB::class.java.simpleName                -> TriggerCOB(injector).fromJSON(data.toString())
             TriggerConnector::class.java.name,
-            TriggerConnector::class.java.simpleName          -> TriggerConnector(injector).fromJSON(data?.toString() ?: "")
+            TriggerConnector::class.java.simpleName          -> TriggerConnector(injector).fromJSON(
+                data.toString()
+            )
             TriggerDelta::class.java.name,
-            TriggerDelta::class.java.simpleName              -> TriggerDelta(injector).fromJSON(data?.toString() ?: "")
+            TriggerDelta::class.java.simpleName              -> TriggerDelta(injector).fromJSON(data.toString())
             TriggerDummy::class.java.name,
-            TriggerDummy::class.java.simpleName              -> TriggerDummy(injector).fromJSON(data?.toString() ?: "")
+            TriggerDummy::class.java.simpleName              -> TriggerDummy(injector).fromJSON(data.toString())
             TriggerIob::class.java.name,
-            TriggerIob::class.java.simpleName                -> TriggerIob(injector).fromJSON(data?.toString() ?: "")
+            TriggerIob::class.java.simpleName                -> TriggerIob(injector).fromJSON(data.toString())
             TriggerLocation::class.java.name,
-            TriggerLocation::class.java.simpleName           -> TriggerLocation(injector).fromJSON(data?.toString() ?: "")
+            TriggerLocation::class.java.simpleName           -> TriggerLocation(injector).fromJSON(
+                data.toString()
+            )
             TriggerProfilePercent::class.java.name,
-            TriggerProfilePercent::class.java.simpleName     -> TriggerProfilePercent(injector).fromJSON(data?.toString() ?: "")
+            TriggerProfilePercent::class.java.simpleName     -> TriggerProfilePercent(injector).fromJSON(
+                data.toString()
+            )
             TriggerPumpLastConnection::class.java.name,
-            TriggerPumpLastConnection::class.java.simpleName -> TriggerPumpLastConnection(injector).fromJSON(data?.toString() ?: "")
+            TriggerPumpLastConnection::class.java.simpleName -> TriggerPumpLastConnection(injector).fromJSON(
+                data.toString()
+            )
             TriggerRecurringTime::class.java.name,
-            TriggerRecurringTime::class.java.simpleName      -> TriggerRecurringTime(injector).fromJSON(data?.toString() ?: "")
+            TriggerRecurringTime::class.java.simpleName      -> TriggerRecurringTime(injector).fromJSON(
+                data.toString()
+            )
             TriggerTempTarget::class.java.name,
-            TriggerTempTarget::class.java.simpleName         -> TriggerTempTarget(injector).fromJSON(data?.toString() ?: "")
+            TriggerTempTarget::class.java.simpleName         -> TriggerTempTarget(injector).fromJSON(
+                data.toString()
+            )
+            TriggerTempTargetValue::class.java.name,
+            TriggerTempTargetValue::class.java.simpleName         -> TriggerTempTargetValue(injector).fromJSON(
+                data.toString()
+            )
             TriggerTime::class.java.name,
-            TriggerTime::class.java.simpleName               -> TriggerTime(injector).fromJSON(data?.toString() ?: "")
+            TriggerTime::class.java.simpleName               -> TriggerTime(injector).fromJSON(data.toString())
             TriggerTimeRange::class.java.name,
-            TriggerTimeRange::class.java.simpleName          -> TriggerTimeRange(injector).fromJSON(data?.toString() ?: "")
+            TriggerTimeRange::class.java.simpleName          -> TriggerTimeRange(injector).fromJSON(
+                data.toString()
+            )
             TriggerWifiSsid::class.java.name,
-            TriggerWifiSsid::class.java.simpleName           -> TriggerWifiSsid(injector).fromJSON(data?.toString() ?: "")
-            else                                             -> throw ClassNotFoundException(type)
+            TriggerWifiSsid::class.java.simpleName           -> TriggerWifiSsid(injector).fromJSON(
+                data.toString()
+            )
+            else                                             -> TriggerConnector(injector)
         }
     }
 
diff --git a/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerConnector.kt b/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerConnector.kt
index 105f91fe3b..91311a84da 100644
--- a/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerConnector.kt
+++ b/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerConnector.kt
@@ -95,7 +95,7 @@ class TriggerConnector(injector: HasAndroidInjector) : Trigger(injector) {
         val array = d.getJSONArray("triggerList")
         list.clear()
         for (i in 0 until array.length()) {
-            instantiate(JSONObject(array.getString(i)))?.let {
+            instantiate(JSONObject(array.getString(i))).let {
                 list.add(it)
             }
         }
diff --git a/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerTempTargetValue.kt b/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerTempTargetValue.kt
new file mode 100644
index 0000000000..96d83c0326
--- /dev/null
+++ b/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerTempTargetValue.kt
@@ -0,0 +1,98 @@
+package info.nightscout.androidaps.plugins.general.automation.triggers
+
+import android.widget.LinearLayout
+import com.google.common.base.Optional
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.Constants
+import info.nightscout.androidaps.automation.R
+import info.nightscout.androidaps.database.ValueWrapper
+import info.nightscout.androidaps.interfaces.GlucoseUnit
+import info.nightscout.androidaps.interfaces.Profile
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.general.automation.elements.Comparator
+import info.nightscout.androidaps.plugins.general.automation.elements.InputBg
+import info.nightscout.androidaps.plugins.general.automation.elements.LabelWithElement
+import info.nightscout.androidaps.plugins.general.automation.elements.LayoutBuilder
+import info.nightscout.androidaps.plugins.general.automation.elements.StaticLabel
+import info.nightscout.androidaps.utils.JsonHelper
+import org.json.JSONObject
+
+class TriggerTempTargetValue(injector: HasAndroidInjector) : Trigger(injector) {
+
+    var ttValue = InputBg(profileFunction)
+    var comparator = Comparator(resourceHelper)
+
+    constructor(injector: HasAndroidInjector, value: Double, units: GlucoseUnit, compare: Comparator.Compare) : this(injector) {
+        ttValue = InputBg(profileFunction, value, units)
+        comparator = Comparator(resourceHelper, compare)
+    }
+
+    constructor(injector: HasAndroidInjector, triggerTempTarget: TriggerTempTargetValue) : this(injector) {
+        ttValue = InputBg(profileFunction, triggerTempTarget.ttValue.value, triggerTempTarget.ttValue.units)
+        comparator = Comparator(resourceHelper, triggerTempTarget.comparator.value)
+    }
+
+    fun comparator(comparator: Comparator.Compare): TriggerTempTargetValue {
+        this.comparator.value = comparator
+        return this
+    }
+
+    fun setUnits(units: GlucoseUnit): TriggerTempTargetValue {
+        ttValue.units = units
+        return this
+    }
+
+    fun setValue(value: Double): TriggerTempTargetValue {
+        ttValue.value = value
+        return this
+    }
+
+    override fun shouldRun(): Boolean {
+        val tt = repository.getTemporaryTargetActiveAt(dateUtil.now()).blockingGet()
+        if (tt is ValueWrapper.Absent && comparator.value == Comparator.Compare.IS_NOT_AVAILABLE) {
+            aapsLogger.debug(LTag.AUTOMATION, "Ready for execution: " + friendlyDescription())
+            return true
+        }
+        if (tt is ValueWrapper.Existing && comparator.value.check(tt.value.lowTarget, Profile.toMgdl(ttValue.value, ttValue.units))) {
+            aapsLogger.debug(LTag.AUTOMATION, "Ready for execution: " + friendlyDescription())
+            return true
+        }
+        aapsLogger.debug(LTag.AUTOMATION, "NOT ready for execution: " + friendlyDescription())
+        return false
+    }
+
+    override fun dataJSON(): JSONObject =
+        JSONObject()
+            .put("tt", ttValue.value)
+            .put("comparator", comparator.value.toString())
+            .put("units", ttValue.units.asText)
+
+    override fun fromJSON(data: String): Trigger {
+        val d = JSONObject(data)
+        ttValue.setUnits(GlucoseUnit.fromText(JsonHelper.safeGetString(d, "units", Constants.MGDL)))
+        ttValue.value = JsonHelper.safeGetDouble(d, "tt")
+        comparator.setValue(Comparator.Compare.valueOf(JsonHelper.safeGetString(d, "comparator")!!))
+        return this
+    }
+
+    override fun friendlyName(): Int = R.string.careportal_temporarytargetvalue
+
+    override fun friendlyDescription(): String  {
+        return if (comparator.value == Comparator.Compare.IS_NOT_AVAILABLE)
+            resourceHelper.gs(R.string.notemptarget)
+        else
+            resourceHelper.gs(if (ttValue.units == GlucoseUnit.MGDL) R.string.temptargetcomparedmgdl else R.string.temptargetcomparedmmol, resourceHelper.gs(comparator.value.stringRes), ttValue.value, ttValue.units)
+    }
+
+    override fun icon(): Optional<Int?> = Optional.of(R.drawable.ic_keyboard_tab)
+
+    override fun duplicate(): Trigger = TriggerTempTargetValue(injector, this)
+
+    override fun generateDialog(root: LinearLayout) {
+        LayoutBuilder()
+            .add(StaticLabel(resourceHelper, R.string.careportal_temporarytargetvalue, this))
+            .add(comparator)
+            .add(LabelWithElement(resourceHelper, resourceHelper.gs(R.string.target_u, ttValue.units), "", ttValue))
+            .build(root)
+    }
+}
\ No newline at end of file
diff --git a/automation/src/main/java/info/nightscout/androidaps/services/LastLocationDataContainer.kt b/automation/src/main/java/info/nightscout/androidaps/services/LastLocationDataContainer.kt
index f546abb8cf..aa184ade9c 100644
--- a/automation/src/main/java/info/nightscout/androidaps/services/LastLocationDataContainer.kt
+++ b/automation/src/main/java/info/nightscout/androidaps/services/LastLocationDataContainer.kt
@@ -1,13 +1,11 @@
 package info.nightscout.androidaps.services
 
 import android.location.Location
+import info.nightscout.androidaps.annotations.OpenForTesting
 import javax.inject.Inject
 import javax.inject.Singleton
 
-/**
- * Created by adrian on 2020-01-06.
- */
-
+@OpenForTesting
 @Singleton
 class LastLocationDataContainer @Inject constructor() {
     var lastLocation: Location? = null
diff --git a/automation/src/main/java/info/nightscout/androidaps/services/LocationService.kt b/automation/src/main/java/info/nightscout/androidaps/services/LocationService.kt
index 9f5063be77..bd293160db 100644
--- a/automation/src/main/java/info/nightscout/androidaps/services/LocationService.kt
+++ b/automation/src/main/java/info/nightscout/androidaps/services/LocationService.kt
@@ -148,15 +148,13 @@ class LocationService : DaggerService() {
 
     override fun onDestroy() {
         super.onDestroy()
-        if (locationManager != null) {
-            try {
-                if (ActivityCompat.checkSelfPermission(this, Manifest.permission.ACCESS_FINE_LOCATION) != PackageManager.PERMISSION_GRANTED && ActivityCompat.checkSelfPermission(this, Manifest.permission.ACCESS_COARSE_LOCATION) != PackageManager.PERMISSION_GRANTED) {
-                    return
-                }
-                locationManager!!.removeUpdates(locationListener)
-            } catch (ex: Exception) {
-                aapsLogger.error(LTag.LOCATION, "fail to remove location listener, ignore", ex)
+        try {
+            if (ActivityCompat.checkSelfPermission(this, Manifest.permission.ACCESS_FINE_LOCATION) != PackageManager.PERMISSION_GRANTED && ActivityCompat.checkSelfPermission(this, Manifest.permission.ACCESS_COARSE_LOCATION) != PackageManager.PERMISSION_GRANTED) {
+                return
             }
+            locationListener?.let { locationManager?.removeUpdates(it) }
+        } catch (ex: Exception) {
+            aapsLogger.error(LTag.LOCATION, "fail to remove location listener, ignore", ex)
         }
         disposable.clear()
     }
diff --git a/automation/src/main/res/values-cs-rCZ/strings.xml b/automation/src/main/res/values-cs-rCZ/strings.xml
index 4f30a85513..5b993f0975 100644
--- a/automation/src/main/res/values-cs-rCZ/strings.xml
+++ b/automation/src/main/res/values-cs-rCZ/strings.xml
@@ -38,6 +38,9 @@
     <string name="glucoseisnotavailable">Glykémie není k dispozici</string>
     <string name="glucosecomparedmgdl">Glykémie %1$s %2$.0f %3$s</string>
     <string name="glucosecomparedmmol">Glykémie %1$s %2$.1f %3$s</string>
+    <string name="notemptarget">Dočasný cíl neexistuje</string>
+    <string name="temptargetcomparedmgdl">Dočasný cíl %1$s %2$.0f %3$s</string>
+    <string name="temptargetcomparedmmol">Dočasný cíl %1$s %2$.1f %3$s</string>
     <string name="percentagecompared">Profil pct %1$s %2$d</string>
     <string name="iobcompared">IOB %1$s %2$.1f</string>
     <string name="and">A</string>
@@ -86,6 +89,7 @@
     <string name="latitude_short">Zem. šířka:</string>
     <string name="longitude_short">Zem. délka:</string>
     <string name="glucose_u">Glykémie [%1$s]:</string>
+    <string name="target_u">Cíl [%1$s]:</string>
     <string name="lastboluslabel">Poslední bolus</string>
     <string name="lastboluscompared">Poslední bolus %1$s před %2$s min</string>
     <string name="triggercoblabel">COB</string>
diff --git a/automation/src/main/res/values-de-rDE/strings.xml b/automation/src/main/res/values-de-rDE/strings.xml
index acb6f2480a..2845766192 100644
--- a/automation/src/main/res/values-de-rDE/strings.xml
+++ b/automation/src/main/res/values-de-rDE/strings.xml
@@ -38,6 +38,9 @@
     <string name="glucoseisnotavailable">Glukosewert nicht verfügbar</string>
     <string name="glucosecomparedmgdl">Glukosewert %1$s %2$.0f %3$s</string>
     <string name="glucosecomparedmmol">Glukosewert %1$s %2$.1f %3$s</string>
+    <string name="notemptarget">Kein temporäres Ziel vorhanden</string>
+    <string name="temptargetcomparedmgdl">Temp. Zielwert %1$s %2$.0f %3$s</string>
+    <string name="temptargetcomparedmmol">Temp. Zielwert %1$s %2$.1f %3$s</string>
     <string name="percentagecompared">Profil-Prozentsatz %1$s %2$d</string>
     <string name="iobcompared">IOB %1$s %2$.1f</string>
     <string name="and">Und</string>
@@ -86,6 +89,7 @@
     <string name="latitude_short">Breitengrad:</string>
     <string name="longitude_short">Längengrad:</string>
     <string name="glucose_u">Glukosewert [%1$s]:</string>
+    <string name="target_u">Zielwert [%1$s]:</string>
     <string name="lastboluslabel">Letzter Bolus vor</string>
     <string name="lastboluscompared">Letzter Bolus vor %1$s %2$s Min</string>
     <string name="triggercoblabel">COB</string>
diff --git a/automation/src/main/res/values-fr-rFR/strings.xml b/automation/src/main/res/values-fr-rFR/strings.xml
index 449448894d..a42641de69 100644
--- a/automation/src/main/res/values-fr-rFR/strings.xml
+++ b/automation/src/main/res/values-fr-rFR/strings.xml
@@ -3,9 +3,9 @@
     <string name="automation_short">Auto</string>
     <string name="automation">Automatisation</string>
     <string name="automation_description">Tâches d\'automatisation définies par l\'utilisateur</string>
-    <string name="automation_missing_task_name">Merci d\'entrer le nom de la tâche.</string>
-    <string name="automation_missing_trigger">Merci de spécifier au moins un déclencheur.</string>
-    <string name="automation_missing_action">Merci de spécifier au moins une action.</string>
+    <string name="automation_missing_task_name">Veuillez entrer un nom pour la tâche.</string>
+    <string name="automation_missing_trigger">Veuillez spécifier au moins un déclencheur.</string>
+    <string name="automation_missing_action">Veuillez spécifier au moins une action.</string>
     <string name="alarm_message">Alarme: %1$s</string>
     <string name="alarm_short">Alarme:</string>
     <string name="message_short">Mess :</string>
@@ -38,6 +38,9 @@
     <string name="glucoseisnotavailable">La glycémie n\'est pas disponible</string>
     <string name="glucosecomparedmgdl">Glycémie %1$s %2$.0f %3$s</string>
     <string name="glucosecomparedmmol">Glycémie %1$s %2$.1f %3$s</string>
+    <string name="notemptarget">La Cible Temp. n\'existe pas</string>
+    <string name="temptargetcomparedmgdl">Cible Temp. %1$s %2$.0f %3$s</string>
+    <string name="temptargetcomparedmmol">Cible Temp. %1$s %2$.1f %3$s</string>
     <string name="percentagecompared">Profil %% %1$s %2$d</string>
     <string name="iobcompared">IA %1$s %2$.1f</string>
     <string name="and">Et</string>
@@ -86,6 +89,7 @@
     <string name="latitude_short">Lat :</string>
     <string name="longitude_short">Long :</string>
     <string name="glucose_u">Glycémie [%1$s] :</string>
+    <string name="target_u">Cible [%1$s]:</string>
     <string name="lastboluslabel">Lors du dernier Bolus</string>
     <string name="lastboluscompared">Heure du dernier bolus %1$s il y a %2$s min</string>
     <string name="triggercoblabel">GA</string>
diff --git a/automation/src/main/res/values-iw-rIL/strings.xml b/automation/src/main/res/values-iw-rIL/strings.xml
index 5112cef6ac..46a2efd8ef 100644
--- a/automation/src/main/res/values-iw-rIL/strings.xml
+++ b/automation/src/main/res/values-iw-rIL/strings.xml
@@ -38,11 +38,14 @@
     <string name="glucoseisnotavailable">גלוקוז אינו זמין</string>
     <string name="glucosecomparedmgdl">גלוקוז %1$s %2$.0f %3$s</string>
     <string name="glucosecomparedmmol">גלוקוז %1$s %2$.1f %3$s</string>
+    <string name="notemptarget">ערך המטרה הזמני לא קיים</string>
+    <string name="temptargetcomparedmgdl">ערך מטרה זמני %1$s %2$.0f %3$s</string>
+    <string name="temptargetcomparedmmol">ערך מטרה זמני %1$s %2$.1f %3$s</string>
     <string name="percentagecompared">אחוז פרופיל %1$s %2$d</string>
     <string name="iobcompared">אינסולין פעיל %1$s %2$.1f</string>
     <string name="and">וגם</string>
     <string name="or">או</string>
-    <string name="xor">או בררני</string>
+    <string name="xor">או בררני (XOR)</string>
     <string name="atspecifiedtime">ב-%1$s</string>
     <string name="use_network_location">שימוש במיקום רשת</string>
     <string name="use_gps_location">שימוש במיקום GPS</string>
@@ -86,6 +89,7 @@
     <string name="latitude_short">רוחב:</string>
     <string name="longitude_short">אורך:</string>
     <string name="glucose_u">גלוקוז [%1$s]:</string>
+    <string name="target_u">מטרה [%1$s]:</string>
     <string name="lastboluslabel">בולוס אחרון</string>
     <string name="lastboluscompared">הבולוס האחרון היה לפני %1$s %2$s דק\'</string>
     <string name="triggercoblabel">פחמ\' פעילות</string>
diff --git a/automation/src/main/res/values-ko-rKR/strings.xml b/automation/src/main/res/values-ko-rKR/strings.xml
index 2c1f7d9cef..d6e91aec5b 100644
--- a/automation/src/main/res/values-ko-rKR/strings.xml
+++ b/automation/src/main/res/values-ko-rKR/strings.xml
@@ -6,6 +6,8 @@
     <string name="automation_missing_task_name">작업 이름을 입력하세요.</string>
     <string name="automation_missing_trigger">적어도 하나의 트리거를 지정하세요.</string>
     <string name="automation_missing_action">적어도 하나의 액션을 지정하세요.</string>
+    <string name="alarm_message">알람: %1$s</string>
+    <string name="alarm_short">알람:</string>
     <string name="message_short">메세지:</string>
     <string name="alreadyenabled">이미 활성화됨</string>
     <string name="alreadydisabled">이미 비활성화됨</string>
@@ -46,6 +48,8 @@
     <string name="use_gps_location">GPS 위치 사용</string>
     <string name="use_passive_location">수동 위치 사용</string>
     <string name="locationservice">위치 서비스</string>
+    <string name="onconnect">연결 중</string>
+    <string name="ondisconnect">연결 해제 중</string>
     <string name="short_avgdelta">단기 평균 증분</string>
     <string name="long_avgdelta">장기 평균 증분</string>
     <string name="delta">증분</string>
@@ -69,6 +73,8 @@
     <string name="add_short">추가</string>
     <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>
@@ -82,6 +88,7 @@
     <string name="glucose_u">혈당 [%1$s]:</string>
     <string name="lastboluslabel">마지막 Bolus</string>
     <string name="lastboluscompared">마지막 Bolus 시간 %1$s %2$s 분 전</string>
+    <string name="triggercoblabel">COB</string>
     <string name="cobcompared">COB %1$s %2$.0f</string>
     <string name="iob_u">IOB [U]:</string>
     <string name="distance_short">거리 [m]:</string>
diff --git a/automation/src/main/res/values-lt-rLT/strings.xml b/automation/src/main/res/values-lt-rLT/strings.xml
index c6dbde7171..9a77054a2d 100644
--- a/automation/src/main/res/values-lt-rLT/strings.xml
+++ b/automation/src/main/res/values-lt-rLT/strings.xml
@@ -7,6 +7,7 @@
     <string name="automation_missing_trigger">Nurodykite mažiausiai vieną sąlygą.</string>
     <string name="automation_missing_action">Nurodykite mažiausiai vieną veiksmą.</string>
     <string name="alarm_message">Aliarmas: %1$s</string>
+    <string name="alarm_short">Aliarmas:</string>
     <string name="message_short">Pranešimas:</string>
     <string name="alreadyenabled">Jau įjungta</string>
     <string name="alreadydisabled">Jau išjungta</string>
@@ -87,6 +88,7 @@
     <string name="glucose_u">Gliukozė [%1$s]:</string>
     <string name="lastboluslabel">Paskutinis bolusas</string>
     <string name="lastboluscompared">Paskutinis Bolusas prieš %1$s %2$s min</string>
+    <string name="triggercoblabel">AAO</string>
     <string name="cobcompared">AAO %1$s %2$.0f</string>
     <string name="iob_u">AIO [U]:</string>
     <string name="distance_short">Atstumas [m]:</string>
diff --git a/automation/src/main/res/values-sk-rSK/strings.xml b/automation/src/main/res/values-sk-rSK/strings.xml
index 4ab6b045d5..b06dc622ac 100644
--- a/automation/src/main/res/values-sk-rSK/strings.xml
+++ b/automation/src/main/res/values-sk-rSK/strings.xml
@@ -38,6 +38,9 @@
     <string name="glucoseisnotavailable">Glykémia nedostupná</string>
     <string name="glucosecomparedmgdl">Glykémia %1$s %2$.0f %3$s</string>
     <string name="glucosecomparedmmol">Glykémia %1$s %2$.1f %3$s</string>
+    <string name="notemptarget">Dočasný cieľ neexistuje</string>
+    <string name="temptargetcomparedmgdl">Doč. cieľ %1$s %2$.0f %3$s</string>
+    <string name="temptargetcomparedmmol">Doč. cieľ %1$s %2$.1f %3$s</string>
     <string name="percentagecompared">Percentuálny profil %1$s %2$d</string>
     <string name="iobcompared">IOB %1$s %2$.1f</string>
     <string name="and">A</string>
@@ -86,6 +89,7 @@
     <string name="latitude_short">Lat:</string>
     <string name="longitude_short">Lon:</string>
     <string name="glucose_u">Glykémia [%1$s]:</string>
+    <string name="target_u">Cieľ [%1$s]:</string>
     <string name="lastboluslabel">Od posledného bolusu</string>
     <string name="lastboluscompared">Čas posledného bolusu: pred %1$s %2$s min </string>
     <string name="triggercoblabel">COB</string>
diff --git a/automation/src/main/res/values/strings.xml b/automation/src/main/res/values/strings.xml
index 2e23b54761..842e53b14d 100644
--- a/automation/src/main/res/values/strings.xml
+++ b/automation/src/main/res/values/strings.xml
@@ -40,6 +40,9 @@
     <string name="glucoseisnotavailable">Glucose is not available</string>
     <string name="glucosecomparedmgdl">Glucose %1$s %2$.0f %3$s</string>
     <string name="glucosecomparedmmol">Glucose %1$s %2$.1f %3$s</string>
+    <string name="notemptarget">Temp Target does not exist</string>
+    <string name="temptargetcomparedmgdl">Temp Target %1$s %2$.0f %3$s</string>
+    <string name="temptargetcomparedmmol">Temp Target %1$s %2$.1f %3$s</string>
     <string name="percentagecompared">Profile pct %1$s %2$d</string>
     <string name="iobcompared">IOB %1$s %2$.1f</string>
     <string name="and">And</string>
@@ -88,6 +91,7 @@
     <string name="latitude_short">Lat:</string>
     <string name="longitude_short">Lon:</string>
     <string name="glucose_u">Glucose [%1$s]:</string>
+    <string name="target_u">Target [%1$s]:</string>
     <string name="lastboluslabel">Last bolus ago</string>
     <string name="lastboluscompared">Last bolus time %1$s %2$s min ago</string>
     <string name="triggercoblabel">COB</string>
diff --git a/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/AutomationEventTest.kt b/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/AutomationEventTest.kt
index 6c0087b86b..cf77f4a972 100644
--- a/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/AutomationEventTest.kt
+++ b/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/AutomationEventTest.kt
@@ -4,8 +4,9 @@ import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.TestBase
 import info.nightscout.androidaps.interfaces.ConfigBuilder
-import info.nightscout.androidaps.interfaces.LoopInterface
+import info.nightscout.androidaps.interfaces.Loop
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.general.automation.actions.Action
 import info.nightscout.androidaps.plugins.general.automation.actions.ActionLoopEnable
 import info.nightscout.androidaps.plugins.general.automation.triggers.TriggerConnectorTest
 import info.nightscout.androidaps.plugins.general.automation.triggers.TriggerDummy
@@ -13,14 +14,11 @@ import info.nightscout.androidaps.utils.resources.ResourceHelper
 import org.json.JSONObject
 import org.junit.Assert
 import org.junit.Test
-import org.junit.runner.RunWith
 import org.mockito.Mock
-import org.powermock.modules.junit4.PowerMockRunner
 
-@RunWith(PowerMockRunner::class)
 class AutomationEventTest : TestBase() {
 
-    @Mock lateinit var loopPlugin: LoopInterface
+    @Mock lateinit var loopPlugin: Loop
     @Mock lateinit var resourceHelper: ResourceHelper
     @Mock lateinit var configBuilder: ConfigBuilder
 
@@ -29,6 +27,9 @@ class AutomationEventTest : TestBase() {
             if (it is AutomationEvent) {
                 it.aapsLogger = aapsLogger
             }
+            if (it is Action) {
+                it.aapsLogger = aapsLogger
+            }
             if (it is ActionLoopEnable) {
                 it.loopPlugin = loopPlugin
                 it.resourceHelper = resourceHelper
@@ -44,11 +45,10 @@ class AutomationEventTest : TestBase() {
         val event = AutomationEvent(injector)
         event.title = "Test"
         event.trigger = TriggerDummy(injector).instantiate(JSONObject(TriggerConnectorTest.oneItem))
-            ?: throw Exception()
         event.addAction(ActionLoopEnable(injector))
 
         // export to json
-        val eventJsonExpected = "{\"autoRemove\":false,\"readOnly\":false,\"trigger\":\"{\\\"data\\\":{\\\"connectorType\\\":\\\"AND\\\",\\\"triggerList\\\":[\\\"{\\\\\\\"data\\\\\\\":{\\\\\\\"connectorType\\\\\\\":\\\\\\\"AND\\\\\\\",\\\\\\\"triggerList\\\\\\\":[]},\\\\\\\"type\\\\\\\":\\\\\\\"TriggerConnector\\\\\\\"}\\\"]},\\\"type\\\":\\\"TriggerConnector\\\"}\",\"title\":\"Test\",\"systemAction\":false,\"actions\":[\"{\\\"type\\\":\\\"info.nightscout.androidaps.plugins.general.automation.actions.ActionLoopEnable\\\"}\"],\"enabled\":true}"
+        val eventJsonExpected = "{\"autoRemove\":false,\"readOnly\":false,\"trigger\":\"{\\\"data\\\":{\\\"connectorType\\\":\\\"AND\\\",\\\"triggerList\\\":[\\\"{\\\\\\\"data\\\\\\\":{\\\\\\\"connectorType\\\\\\\":\\\\\\\"AND\\\\\\\",\\\\\\\"triggerList\\\\\\\":[]},\\\\\\\"type\\\\\\\":\\\\\\\"TriggerConnector\\\\\\\"}\\\"]},\\\"type\\\":\\\"TriggerConnector\\\"}\",\"title\":\"Test\",\"systemAction\":false,\"actions\":[\"{\\\"type\\\":\\\"ActionLoopEnable\\\"}\"],\"enabled\":true}"
         Assert.assertEquals(eventJsonExpected, event.toJSON())
 
         // clone
@@ -64,7 +64,7 @@ class AutomationEventTest : TestBase() {
         Assert.assertEquals(event.trigger.toJSON(), clone.trigger.toJSON())
 
         // check action
-        Assert.assertEquals(1, clone.actions.size.toLong())
+        Assert.assertEquals(1, clone.actions.size)
         Assert.assertFalse(event.actions === clone.actions) // not the same object reference
         Assert.assertEquals(clone.toJSON(), clone.toJSON())
     }
diff --git a/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/ComposeTriggerTest.kt b/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/ComposeTriggerTest.kt
index 0422edc519..01ddca5cbe 100644
--- a/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/ComposeTriggerTest.kt
+++ b/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/ComposeTriggerTest.kt
@@ -8,12 +8,7 @@ import info.nightscout.androidaps.plugins.general.automation.triggers.TriggerCon
 import info.nightscout.androidaps.plugins.general.automation.triggers.TriggerDummy
 import org.junit.Assert
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.powermock.core.classloader.annotations.PrepareForTest
-import org.powermock.modules.junit4.PowerMockRunner
 
-@RunWith(PowerMockRunner::class)
-@PrepareForTest
 class ComposeTriggerTest : TestBase() {
 
     var injector: HasAndroidInjector = HasAndroidInjector { AndroidInjector { } }
diff --git a/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/TestBaseWithProfile.kt b/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/TestBaseWithProfile.kt
index e284c2c64e..1aa632efca 100644
--- a/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/TestBaseWithProfile.kt
+++ b/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/TestBaseWithProfile.kt
@@ -19,10 +19,8 @@ import info.nightscout.androidaps.utils.resources.ResourceHelper
 import org.json.JSONObject
 import org.junit.Before
 import org.mockito.Mock
-import org.powermock.core.classloader.annotations.PrepareForTest
 
 @Suppress("SpellCheckingInspection")
-@PrepareForTest(FabricPrivacy::class, AppRepository::class)
 open class TestBaseWithProfile : TestBase() {
 
     @Mock lateinit var activePluginProvider: ActivePlugin
diff --git a/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionAlarmTest.kt b/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionAlarmTest.kt
index 9cafda9289..0aad1dd7ba 100644
--- a/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionAlarmTest.kt
+++ b/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionAlarmTest.kt
@@ -15,15 +15,10 @@ import info.nightscout.androidaps.utils.resources.ResourceHelper
 import org.junit.Assert
 import org.junit.Before
 import org.junit.Test
-import org.junit.runner.RunWith
 import org.mockito.ArgumentMatchers
 import org.mockito.Mock
 import org.mockito.Mockito.`when`
-import org.powermock.core.classloader.annotations.PrepareForTest
-import org.powermock.modules.junit4.PowerMockRunner
 
-@RunWith(PowerMockRunner::class)
-@PrepareForTest(RxBusWrapper::class, TimerUtil::class)
 class ActionAlarmTest : TestBase() {
 
     @Mock lateinit var resourceHelper: ResourceHelper
diff --git a/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionLoopDisableTest.kt b/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionLoopDisableTest.kt
index 0a0aa4db2b..c50f16ea5a 100644
--- a/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionLoopDisableTest.kt
+++ b/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionLoopDisableTest.kt
@@ -1,20 +1,15 @@
 package info.nightscout.androidaps.plugins.general.automation.actions
 
 import info.nightscout.androidaps.automation.R
-import info.nightscout.androidaps.interfaces.PluginBase
 import info.nightscout.androidaps.interfaces.PluginType
-import info.nightscout.androidaps.interfaces.PumpDescription
 import info.nightscout.androidaps.queue.Callback
 import org.junit.Assert
 import org.junit.Before
 import org.junit.Test
-import org.junit.runner.RunWith
 import org.mockito.ArgumentMatchers.eq
 import org.mockito.Mockito
 import org.mockito.Mockito.`when`
-import org.powermock.modules.junit4.PowerMockRunner
 
-@RunWith(PowerMockRunner::class)
 class ActionLoopDisableTest : ActionsTestBase() {
 
     lateinit var sut: ActionLoopDisable
diff --git a/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionLoopEnableTest.kt b/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionLoopEnableTest.kt
index 21cc20b448..e7bc6e5320 100644
--- a/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionLoopEnableTest.kt
+++ b/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionLoopEnableTest.kt
@@ -1,18 +1,14 @@
 package info.nightscout.androidaps.plugins.general.automation.actions
 
 import info.nightscout.androidaps.automation.R
-import info.nightscout.androidaps.interfaces.PluginBase
 import info.nightscout.androidaps.interfaces.PluginType
 import info.nightscout.androidaps.queue.Callback
 import org.junit.Assert
 import org.junit.Before
 import org.junit.Test
-import org.junit.runner.RunWith
 import org.mockito.Mockito
 import org.mockito.Mockito.`when`
-import org.powermock.modules.junit4.PowerMockRunner
 
-@RunWith(PowerMockRunner::class)
 class ActionLoopEnableTest : ActionsTestBase() {
 
     lateinit var sut: ActionLoopEnable
diff --git a/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionLoopResumeTest.kt b/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionLoopResumeTest.kt
index b24aef178c..e630a0df01 100644
--- a/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionLoopResumeTest.kt
+++ b/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionLoopResumeTest.kt
@@ -1,16 +1,16 @@
 package info.nightscout.androidaps.plugins.general.automation.actions
 
 import info.nightscout.androidaps.automation.R
+import info.nightscout.androidaps.database.entities.TemporaryTarget
+import info.nightscout.androidaps.database.transactions.CancelCurrentOfflineEventIfAnyTransaction
+import info.nightscout.androidaps.database.transactions.Transaction
 import info.nightscout.androidaps.queue.Callback
+import io.reactivex.Single
 import org.junit.Assert
 import org.junit.Before
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.mockito.Mockito
 import org.mockito.Mockito.`when`
-import org.powermock.modules.junit4.PowerMockRunner
 
-@RunWith(PowerMockRunner::class)
 class ActionLoopResumeTest : ActionsTestBase() {
 
     lateinit var sut: ActionLoopResume
@@ -38,20 +38,30 @@ class ActionLoopResumeTest : ActionsTestBase() {
 
     @Test fun doActionTest() {
         `when`(loopPlugin.isSuspended).thenReturn(true)
+        val inserted = mutableListOf<TemporaryTarget>().apply {
+            // insert all inserted TTs
+        }
+        val updated = mutableListOf<TemporaryTarget>().apply {
+            // add(TemporaryTarget(id = 0, version = 0, dateCreated = 0, isValid = false, referenceId = null, interfaceIDs_backing = null, timestamp = 0, utcOffset = 0, reason =, highTarget = 0.0, lowTarget = 0.0, duration = 0))
+            // insert all updated TTs
+        }
+        `when`(
+            repository.runTransactionForResult(anyObject<Transaction<CancelCurrentOfflineEventIfAnyTransaction.TransactionResult>>())
+        ).thenReturn(Single.just(CancelCurrentOfflineEventIfAnyTransaction.TransactionResult().apply {
+            inserted.addAll(inserted)
+            updated.addAll(updated)
+        }))
+
         sut.doAction(object : Callback() {
             override fun run() {}
         })
-        Mockito.verify(loopPlugin, Mockito.times(1)).suspendTo(0)
-        Mockito.verify(configBuilder, Mockito.times(1)).storeSettings("ActionLoopResume")
-        Mockito.verify(loopPlugin, Mockito.times(1)).createOfflineEvent(0)
+        //Mockito.verify(loopPlugin, Mockito.times(1)).suspendTo(0)
 
         // another call should keep it resumed, , no new invocation
         `when`(loopPlugin.isSuspended).thenReturn(false)
         sut.doAction(object : Callback() {
             override fun run() {}
         })
-        Mockito.verify(loopPlugin, Mockito.times(1)).suspendTo(0)
-        Mockito.verify(configBuilder, Mockito.times(1)).storeSettings("ActionLoopResume")
-        Mockito.verify(loopPlugin, Mockito.times(1)).createOfflineEvent(0)
+        //Mockito.verify(loopPlugin, Mockito.times(1)).suspendTo(0)
     }
 }
\ No newline at end of file
diff --git a/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionLoopSuspendTest.kt b/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionLoopSuspendTest.kt
index ec4cfa0956..66140b09d0 100644
--- a/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionLoopSuspendTest.kt
+++ b/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionLoopSuspendTest.kt
@@ -6,13 +6,10 @@ import info.nightscout.androidaps.queue.Callback
 import org.junit.Assert
 import org.junit.Before
 import org.junit.Test
-import org.junit.runner.RunWith
 import org.mockito.ArgumentMatchers
 import org.mockito.Mockito
 import org.mockito.Mockito.`when`
-import org.powermock.modules.junit4.PowerMockRunner
 
-@RunWith(PowerMockRunner::class)
 class ActionLoopSuspendTest : ActionsTestBase() {
 
     lateinit var sut: ActionLoopSuspend
diff --git a/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionNotificationTest.kt b/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionNotificationTest.kt
index 72a50156b8..d48c9683a1 100644
--- a/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionNotificationTest.kt
+++ b/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionNotificationTest.kt
@@ -6,23 +6,26 @@ import info.nightscout.androidaps.TestBase
 import info.nightscout.androidaps.automation.R
 import info.nightscout.androidaps.data.PumpEnactResult
 import info.nightscout.androidaps.database.AppRepository
+import info.nightscout.androidaps.database.transactions.CancelCurrentTemporaryTargetIfAnyTransaction
+import info.nightscout.androidaps.database.transactions.InsertAndCancelCurrentTemporaryTargetTransaction
+import info.nightscout.androidaps.database.transactions.InsertTherapyEventAnnouncementTransaction
+import info.nightscout.androidaps.database.transactions.Transaction
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.general.automation.elements.InputString
 import info.nightscout.androidaps.queue.Callback
 import info.nightscout.androidaps.utils.resources.ResourceHelper
+import io.reactivex.Completable
+import io.reactivex.Single
 import org.junit.Assert
 import org.junit.Before
 import org.junit.Test
-import org.junit.runner.RunWith
 import org.mockito.ArgumentMatchers
 import org.mockito.Mock
 import org.mockito.Mockito
 import org.mockito.Mockito.`when`
-import org.powermock.core.classloader.annotations.PrepareForTest
-import org.powermock.modules.junit4.PowerMockRunner
+import org.mockito.Mockito.any
+import org.mockito.Mockito.doNothing
 
-@RunWith(PowerMockRunner::class)
-@PrepareForTest(RxBusWrapper::class)
 class ActionNotificationTest : TestBase() {
 
     @Mock lateinit var resourceHelper: ResourceHelper
@@ -47,7 +50,14 @@ class ActionNotificationTest : TestBase() {
     fun setup() {
         `when`(resourceHelper.gs(R.string.ok)).thenReturn("OK")
         `when`(resourceHelper.gs(R.string.notification)).thenReturn("Notification")
-        `when`(resourceHelper.gs(ArgumentMatchers.eq(R.string.notification_message), ArgumentMatchers.anyString())).thenReturn("Notification: %s")
+        `when`(
+            resourceHelper.gs(
+                ArgumentMatchers.eq(R.string.notification_message),
+                ArgumentMatchers.anyString()
+            )
+        ).thenReturn("Notification: %s")
+        `when`(repository.runTransaction(anyObject<Transaction<InsertTherapyEventAnnouncementTransaction.TransactionResult>>()))
+            .thenReturn(Completable.fromAction {})
 
         sut = ActionNotification(injector)
     }
@@ -81,7 +91,10 @@ class ActionNotificationTest : TestBase() {
 
     @Test fun toJSONTest() {
         sut.text = InputString("Asd")
-        Assert.assertEquals("{\"data\":{\"text\":\"Asd\"},\"type\":\"info.nightscout.androidaps.plugins.general.automation.actions.ActionNotification\"}", sut.toJSON())
+        Assert.assertEquals(
+            "{\"data\":{\"text\":\"Asd\"},\"type\":\"info.nightscout.androidaps.plugins.general.automation.actions.ActionNotification\"}",
+            sut.toJSON()
+        )
     }
 
     @Test fun fromJSONTest() {
diff --git a/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionProfileSwitchPercentTest.kt b/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionProfileSwitchPercentTest.kt
index 9d201af7eb..60a109bd62 100644
--- a/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionProfileSwitchPercentTest.kt
+++ b/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionProfileSwitchPercentTest.kt
@@ -7,12 +7,9 @@ import info.nightscout.androidaps.queue.Callback
 import org.junit.Assert
 import org.junit.Before
 import org.junit.Test
-import org.junit.runner.RunWith
 import org.mockito.Mockito
 import org.mockito.Mockito.`when`
-import org.powermock.modules.junit4.PowerMockRunner
 
-@RunWith(PowerMockRunner::class)
 class ActionProfileSwitchPercentTest : ActionsTestBase() {
 
     private lateinit var sut: ActionProfileSwitchPercent
diff --git a/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionProfileSwitchTest.kt b/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionProfileSwitchTest.kt
index 6bf564425b..c15d1030b0 100644
--- a/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionProfileSwitchTest.kt
+++ b/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionProfileSwitchTest.kt
@@ -6,16 +6,13 @@ import info.nightscout.androidaps.queue.Callback
 import org.junit.Assert
 import org.junit.Before
 import org.junit.Test
-import org.junit.runner.RunWith
 import org.mockito.ArgumentMatchers
 import org.mockito.ArgumentMatchers.anyLong
 import org.mockito.Mockito
 import org.mockito.Mockito.`when`
 import org.mockito.Mockito.anyInt
 import org.mockito.Mockito.anyString
-import org.powermock.modules.junit4.PowerMockRunner
 
-@RunWith(PowerMockRunner::class)
 class ActionProfileSwitchTest : ActionsTestBase() {
 
     private lateinit var sut: ActionProfileSwitch
diff --git a/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionSendSMSTest.kt b/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionSendSMSTest.kt
index 476aabd460..cd2d36f941 100644
--- a/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionSendSMSTest.kt
+++ b/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionSendSMSTest.kt
@@ -6,13 +6,10 @@ import info.nightscout.androidaps.queue.Callback
 import org.junit.Assert
 import org.junit.Before
 import org.junit.Test
-import org.junit.runner.RunWith
 import org.mockito.ArgumentMatchers.anyString
 import org.mockito.ArgumentMatchers.eq
 import org.mockito.Mockito.`when`
-import org.powermock.modules.junit4.PowerMockRunner
 
-@RunWith(PowerMockRunner::class)
 class ActionSendSMSTest : ActionsTestBase() {
 
     private lateinit var sut: ActionSendSMS
diff --git a/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionStartTempTargetTest.kt b/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionStartTempTargetTest.kt
index da2c4b8a3f..bca2b68ef4 100644
--- a/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionStartTempTargetTest.kt
+++ b/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionStartTempTargetTest.kt
@@ -1,9 +1,8 @@
 package info.nightscout.androidaps.plugins.general.automation.actions
 
-import info.nightscout.androidaps.Constants
 import info.nightscout.androidaps.automation.R
 import info.nightscout.androidaps.database.entities.TemporaryTarget
-import info.nightscout.androidaps.database.transactions.InsertTemporaryTargetAndCancelCurrentTransaction
+import info.nightscout.androidaps.database.transactions.InsertAndCancelCurrentTemporaryTargetTransaction
 import info.nightscout.androidaps.database.transactions.Transaction
 import info.nightscout.androidaps.interfaces.GlucoseUnit
 import info.nightscout.androidaps.plugins.general.automation.elements.InputDuration
@@ -13,13 +12,9 @@ import io.reactivex.Single
 import org.junit.Assert
 import org.junit.Before
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.mockito.ArgumentMatcher
 import org.mockito.Mockito
 import org.mockito.Mockito.`when`
-import org.powermock.modules.junit4.PowerMockRunner
 
-@RunWith(PowerMockRunner::class)
 class ActionStartTempTargetTest : ActionsTestBase() {
 
     private lateinit var sut: ActionStartTempTarget
@@ -68,16 +63,15 @@ class ActionStartTempTargetTest : ActionsTestBase() {
         }
 
         val updated = mutableListOf<TemporaryTarget>().apply {
-            // TODO insert all updated TTs
         }
 
         `when`(
-            repository.runTransactionForResult(argThatKotlin<InsertTemporaryTargetAndCancelCurrentTransaction> {
+            repository.runTransactionForResult(argThatKotlin<InsertAndCancelCurrentTemporaryTargetTransaction> {
                 it.temporaryTarget
                     .copy(timestamp = expectedTarget.timestamp, utcOffset = expectedTarget.utcOffset) // those can be different
                     .contentEqualsTo(expectedTarget)
             })
-        ).thenReturn(Single.just(InsertTemporaryTargetAndCancelCurrentTransaction.TransactionResult().apply {
+        ).thenReturn(Single.just(InsertAndCancelCurrentTemporaryTargetTransaction.TransactionResult().apply {
             inserted.addAll(inserted)
             updated.addAll(updated)
         }))
@@ -87,7 +81,7 @@ class ActionStartTempTargetTest : ActionsTestBase() {
                 Assert.assertTrue(result.success)
             }
         })
-        Mockito.verify(repository, Mockito.times(1)).runTransactionForResult(anyObject<Transaction<InsertTemporaryTargetAndCancelCurrentTransaction.TransactionResult>>())
+        Mockito.verify(repository, Mockito.times(1)).runTransactionForResult(anyObject<Transaction<InsertAndCancelCurrentTemporaryTargetTransaction.TransactionResult>>())
     }
 
     @Test fun hasDialogTest() {
diff --git a/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionStopTempTargetTest.kt b/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionStopTempTargetTest.kt
index a1e1139070..e3310ed65e 100644
--- a/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionStopTempTargetTest.kt
+++ b/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionStopTempTargetTest.kt
@@ -9,12 +9,9 @@ import io.reactivex.Single
 import org.junit.Assert
 import org.junit.Before
 import org.junit.Test
-import org.junit.runner.RunWith
 import org.mockito.Mockito
 import org.mockito.Mockito.`when`
-import org.powermock.modules.junit4.PowerMockRunner
 
-@RunWith(PowerMockRunner::class)
 class ActionStopTempTargetTest : ActionsTestBase() {
 
     private lateinit var sut: ActionStopTempTarget
@@ -66,7 +63,7 @@ class ActionStopTempTargetTest : ActionsTestBase() {
     }
 
     @Test fun toJSONTest() {
-        Assert.assertEquals("{\"type\":\"info.nightscout.androidaps.plugins.general.automation.actions.ActionStopTempTarget\"}", sut.toJSON())
+        Assert.assertEquals("{\"type\":\"ActionStopTempTarget\"}", sut.toJSON())
     }
 
     @Test fun fromJSONTest() {
diff --git a/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionTest.kt b/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionTest.kt
index ca61579dd8..d199e76bc2 100644
--- a/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionTest.kt
+++ b/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionTest.kt
@@ -3,12 +3,7 @@ package info.nightscout.androidaps.plugins.general.automation.actions
 import org.json.JSONObject
 import org.junit.Assert
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.powermock.core.classloader.annotations.PrepareForTest
-import org.powermock.modules.junit4.PowerMockRunner
 
-@RunWith(PowerMockRunner::class)
-@PrepareForTest
 class ActionTest : ActionsTestBase() {
 
     @Test
diff --git a/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionsTestBase.kt b/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionsTestBase.kt
index 8831ea6cb4..38a2d884eb 100644
--- a/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionsTestBase.kt
+++ b/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionsTestBase.kt
@@ -2,24 +2,21 @@ package info.nightscout.androidaps.plugins.general.automation.actions
 
 import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.Constants
-import info.nightscout.androidaps.plugins.general.automation.TestBaseWithProfile
 import info.nightscout.androidaps.TestPumpPlugin
 import info.nightscout.androidaps.automation.R
 import info.nightscout.androidaps.data.PumpEnactResult
+import info.nightscout.androidaps.database.entities.OfflineEvent
 import info.nightscout.androidaps.interfaces.*
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.UserEntryLogger
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.general.automation.TestBaseWithProfile
 import info.nightscout.androidaps.plugins.general.automation.triggers.Trigger
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import info.nightscout.androidaps.utils.sharedPreferences.SP
 import org.junit.Before
 import org.mockito.Mock
 import org.mockito.Mockito.`when`
-import org.powermock.core.classloader.annotations.PrepareForTest
 
-@PrepareForTest(RxBusWrapper::class, ActionsTestBase.TestLoopPlugin::class, UserEntryLogger::class)
 open class ActionsTestBase : TestBaseWithProfile() {
 
     open class TestLoopPlugin(
@@ -29,13 +26,20 @@ open class ActionsTestBase : TestBaseWithProfile() {
         pluginDescription: PluginDescription
     ) : PluginBase(
         pluginDescription, aapsLogger, resourceHelper, injector
-    ), LoopInterface {
+    ), Loop {
 
         private var suspended = false
-        override var lastRun: LoopInterface.LastRun? = LoopInterface.LastRun()
+        override var lastRun: Loop.LastRun? = Loop.LastRun()
         override val isSuspended: Boolean = suspended
-        override fun suspendTo(endTime: Long) {}
-        override fun createOfflineEvent(durationInMinutes: Int) {}
+        override var enabled: Boolean
+            get() = true
+            set(_) {}
+
+        override fun minutesToEndOfSuspend(): Int = 0
+
+        override fun goToZeroTemp(durationInMinutes: Int, profile: Profile, reason: OfflineEvent.Reason) {
+        }
+
         override fun suspendLoop(durationInMinutes: Int) {}
     }
 
@@ -83,28 +87,35 @@ open class ActionsTestBase : TestBaseWithProfile() {
                 it.dateUtil = dateUtil
             }
             if (it is ActionProfileSwitchPercent) {
+                it.aapsLogger = aapsLogger
                 it.resourceHelper = resourceHelper
                 it.profileFunction = profileFunction
                 it.uel = uel
             }
             if (it is ActionNotification) {
+                it.aapsLogger = aapsLogger
                 it.resourceHelper = resourceHelper
                 it.rxBus = rxBus
             }
             if (it is ActionLoopSuspend) {
+                it.aapsLogger = aapsLogger
                 it.loopPlugin = loopPlugin
                 it.resourceHelper = resourceHelper
                 it.rxBus = rxBus
                 it.uel = uel
             }
             if (it is ActionLoopResume) {
+                it.aapsLogger = aapsLogger
                 it.loopPlugin = loopPlugin
                 it.resourceHelper = resourceHelper
                 it.configBuilder = configBuilder
                 it.rxBus = rxBus
+                it.repository = repository
+                it.dateUtil = dateUtil
                 it.uel = uel
             }
             if (it is ActionLoopEnable) {
+                it.aapsLogger = aapsLogger
                 it.loopPlugin = loopPlugin
                 it.resourceHelper = resourceHelper
                 it.configBuilder = configBuilder
@@ -112,6 +123,7 @@ open class ActionsTestBase : TestBaseWithProfile() {
                 it.uel = uel
             }
             if (it is ActionLoopDisable) {
+                it.aapsLogger = aapsLogger
                 it.loopPlugin = loopPlugin
                 it.resourceHelper = resourceHelper
                 it.configBuilder = configBuilder
diff --git a/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/elements/ComparatorConnectTest.kt b/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/elements/ComparatorConnectTest.kt
index 16db4a10c7..0842c232d8 100644
--- a/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/elements/ComparatorConnectTest.kt
+++ b/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/elements/ComparatorConnectTest.kt
@@ -3,10 +3,7 @@ package info.nightscout.androidaps.plugins.general.automation.elements
 import info.nightscout.androidaps.plugins.general.automation.triggers.TriggerTestBase
 import org.junit.Assert
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.powermock.modules.junit4.PowerMockRunner
 
-@RunWith(PowerMockRunner::class)
 class ComparatorConnectTest : TriggerTestBase() {
 
     @Test fun labelsTest() {
diff --git a/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/elements/ComparatorExistsTest.kt b/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/elements/ComparatorExistsTest.kt
index 94a00c6833..1011db6565 100644
--- a/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/elements/ComparatorExistsTest.kt
+++ b/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/elements/ComparatorExistsTest.kt
@@ -3,10 +3,7 @@ package info.nightscout.androidaps.plugins.general.automation.elements
 import info.nightscout.androidaps.plugins.general.automation.triggers.TriggerTestBase
 import org.junit.Assert
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.powermock.modules.junit4.PowerMockRunner
 
-@RunWith(PowerMockRunner::class)
 class ComparatorExistsTest : TriggerTestBase() {
 
     @Test fun labelsTest() {
diff --git a/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/elements/ComparatorTest.kt b/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/elements/ComparatorTest.kt
index e33ade173f..71b8fc4233 100644
--- a/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/elements/ComparatorTest.kt
+++ b/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/elements/ComparatorTest.kt
@@ -3,10 +3,7 @@ package info.nightscout.androidaps.plugins.general.automation.elements
 import info.nightscout.androidaps.plugins.general.automation.triggers.TriggerTestBase
 import org.junit.Assert
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.powermock.modules.junit4.PowerMockRunner
 
-@RunWith(PowerMockRunner::class)
 class ComparatorTest : TriggerTestBase() {
 
     @Test
diff --git a/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/elements/InputBgTest.kt b/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/elements/InputBgTest.kt
index b84e1e5ff5..ee20a8e851 100644
--- a/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/elements/InputBgTest.kt
+++ b/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/elements/InputBgTest.kt
@@ -1,16 +1,12 @@
 package info.nightscout.androidaps.plugins.general.automation.elements
 
-import info.nightscout.androidaps.Constants
 import info.nightscout.androidaps.interfaces.GlucoseUnit
 import info.nightscout.androidaps.plugins.general.automation.triggers.TriggerTestBase
 import org.junit.Assert
 import org.junit.Before
 import org.junit.Test
-import org.junit.runner.RunWith
 import org.mockito.Mockito.`when`
-import org.powermock.modules.junit4.PowerMockRunner
 
-@RunWith(PowerMockRunner::class)
 class InputBgTest : TriggerTestBase() {
 
     @Test
diff --git a/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/elements/InputDurationTest.kt b/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/elements/InputDurationTest.kt
index f1becea887..424efd6d36 100644
--- a/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/elements/InputDurationTest.kt
+++ b/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/elements/InputDurationTest.kt
@@ -3,10 +3,7 @@ package info.nightscout.androidaps.plugins.general.automation.elements
 import info.nightscout.androidaps.plugins.general.automation.triggers.TriggerTestBase
 import org.junit.Assert
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.powermock.modules.junit4.PowerMockRunner
 
-@RunWith(PowerMockRunner::class)
 class InputDurationTest : TriggerTestBase() {
 
     @Test fun setValueTest() {
diff --git a/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/elements/InputInsulinTest.kt b/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/elements/InputInsulinTest.kt
index f4f8c8b770..c2b2c53ceb 100644
--- a/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/elements/InputInsulinTest.kt
+++ b/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/elements/InputInsulinTest.kt
@@ -3,10 +3,7 @@ package info.nightscout.androidaps.plugins.general.automation.elements
 import info.nightscout.androidaps.plugins.general.automation.triggers.TriggerTestBase
 import org.junit.Assert
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.powermock.modules.junit4.PowerMockRunner
 
-@RunWith(PowerMockRunner::class)
 class InputInsulinTest : TriggerTestBase() {
 
     @Test fun setValueTest() {
diff --git a/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/elements/InputPercentTest.kt b/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/elements/InputPercentTest.kt
index 1cf2e8e0df..a75c044cf7 100644
--- a/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/elements/InputPercentTest.kt
+++ b/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/elements/InputPercentTest.kt
@@ -3,10 +3,7 @@ package info.nightscout.androidaps.plugins.general.automation.elements
 import info.nightscout.androidaps.plugins.general.automation.triggers.TriggerTestBase
 import org.junit.Assert
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.powermock.modules.junit4.PowerMockRunner
 
-@RunWith(PowerMockRunner::class)
 class InputPercentTest : TriggerTestBase() {
 
     @Test fun setValueTest() {
diff --git a/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/elements/InputProfileNameTest.kt b/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/elements/InputProfileNameTest.kt
index 1566a3e1af..26f0b69976 100644
--- a/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/elements/InputProfileNameTest.kt
+++ b/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/elements/InputProfileNameTest.kt
@@ -3,10 +3,7 @@ package info.nightscout.androidaps.plugins.general.automation.elements
 import info.nightscout.androidaps.plugins.general.automation.triggers.TriggerTestBase
 import org.junit.Assert
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.powermock.modules.junit4.PowerMockRunner
 
-@RunWith(PowerMockRunner::class)
 class InputProfileNameTest : TriggerTestBase() {
 
     @Test fun setValue() {
diff --git a/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/elements/InputStringTest.kt b/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/elements/InputStringTest.kt
index 6a8ce2d94b..7bce11b606 100644
--- a/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/elements/InputStringTest.kt
+++ b/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/elements/InputStringTest.kt
@@ -3,10 +3,7 @@ package info.nightscout.androidaps.plugins.general.automation.elements
 import info.nightscout.androidaps.plugins.general.automation.triggers.TriggerTestBase
 import org.junit.Assert
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.powermock.modules.junit4.PowerMockRunner
 
-@RunWith(PowerMockRunner::class)
 class InputStringTest : TriggerTestBase() {
 
     @Test fun setValueTest() {
diff --git a/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/elements/InputTempTargetTest.kt b/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/elements/InputTempTargetTest.kt
index d5a8b89e93..6690a7a017 100644
--- a/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/elements/InputTempTargetTest.kt
+++ b/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/elements/InputTempTargetTest.kt
@@ -1,16 +1,10 @@
 package info.nightscout.androidaps.plugins.general.automation.elements
 
-import info.nightscout.androidaps.Constants
 import info.nightscout.androidaps.interfaces.GlucoseUnit
-import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.plugins.general.automation.triggers.TriggerTestBase
 import org.junit.Assert
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.mockito.Mock
-import org.powermock.modules.junit4.PowerMockRunner
 
-@RunWith(PowerMockRunner::class)
 class InputTempTargetTest : TriggerTestBase() {
 
     @Test fun setValueTest() {
diff --git a/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/elements/LabelWithElementTest.kt b/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/elements/LabelWithElementTest.kt
index 57a3f5676c..5ccdb971ed 100644
--- a/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/elements/LabelWithElementTest.kt
+++ b/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/elements/LabelWithElementTest.kt
@@ -3,10 +3,7 @@ package info.nightscout.androidaps.plugins.general.automation.elements
 import info.nightscout.androidaps.plugins.general.automation.triggers.TriggerTestBase
 import org.junit.Assert
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.powermock.modules.junit4.PowerMockRunner
 
-@RunWith(PowerMockRunner::class)
 class LabelWithElementTest : TriggerTestBase() {
 
     @Test
diff --git a/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/elements/LayoutBuilderTest.kt b/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/elements/LayoutBuilderTest.kt
index a81b5506be..76b1e01d42 100644
--- a/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/elements/LayoutBuilderTest.kt
+++ b/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/elements/LayoutBuilderTest.kt
@@ -5,10 +5,7 @@ import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.TestBase
 import org.junit.Assert
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.powermock.modules.junit4.PowerMockRunner
 
-@RunWith(PowerMockRunner::class)
 class LayoutBuilderTest : TestBase() {
 
     val injector = HasAndroidInjector { AndroidInjector { } }
diff --git a/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/elements/StaticLabelTest.kt b/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/elements/StaticLabelTest.kt
index 15eaa50c5e..0f5a9edda5 100644
--- a/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/elements/StaticLabelTest.kt
+++ b/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/elements/StaticLabelTest.kt
@@ -5,11 +5,8 @@ import info.nightscout.androidaps.plugins.general.automation.triggers.TriggerDum
 import info.nightscout.androidaps.plugins.general.automation.triggers.TriggerTestBase
 import org.junit.Assert
 import org.junit.Test
-import org.junit.runner.RunWith
 import org.mockito.Mockito.`when`
-import org.powermock.modules.junit4.PowerMockRunner
 
-@RunWith(PowerMockRunner::class)
 class StaticLabelTest : TriggerTestBase() {
 
     @Test fun constructor() {
diff --git a/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerAutosensValueTest.kt b/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerAutosensValueTest.kt
index 39ddf09fde..ab2563b0d7 100644
--- a/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerAutosensValueTest.kt
+++ b/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerAutosensValueTest.kt
@@ -4,21 +4,14 @@ import com.google.common.base.Optional
 import info.nightscout.androidaps.automation.R
 import info.nightscout.androidaps.plugins.general.automation.elements.Comparator
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.data.AutosensData
-import info.nightscout.androidaps.utils.DateUtil
 import org.json.JSONObject
 import org.junit.Assert
 import org.junit.Before
 import org.junit.Test
-import org.junit.runner.RunWith
 import org.mockito.ArgumentMatchers
 import org.mockito.Mockito
 import org.mockito.Mockito.`when`
-import org.powermock.api.mockito.PowerMockito
-import org.powermock.core.classloader.annotations.PrepareForTest
-import org.powermock.modules.junit4.PowerMockRunner
 
-@RunWith(PowerMockRunner::class)
-@PrepareForTest(DateUtil::class)
 class TriggerAutosensValueTest : TriggerTestBase() {
 
     var now = 1514766900000L
@@ -65,14 +58,14 @@ class TriggerAutosensValueTest : TriggerTestBase() {
         t.autosens.value = 390.0
         t.comparator.value = Comparator.Compare.IS_EQUAL_OR_LESSER
         Assert.assertTrue(t.shouldRun())
-        PowerMockito.`when`(autosensDataStore.getLastAutosensData(anyObject(), anyObject(), anyObject())).thenReturn(AutosensData(injector))
+        `when`(autosensDataStore.getLastAutosensData(anyObject(), anyObject(), anyObject())).thenReturn(AutosensData(injector))
         t = TriggerAutosensValue(injector)
         t.autosens.value = 80.0
         t.comparator.value = Comparator.Compare.IS_EQUAL_OR_LESSER
         Assert.assertFalse(t.shouldRun())
 
         // Test autosensData == null and Comparator == IS_NOT_AVAILABLE
-        PowerMockito.`when`(autosensDataStore.getLastAutosensData(anyObject(), anyObject(), anyObject())).thenReturn(null)
+        `when`(autosensDataStore.getLastAutosensData(anyObject(), anyObject(), anyObject())).thenReturn(null)
         t = TriggerAutosensValue(injector)
         t.comparator.value = Comparator.Compare.IS_NOT_AVAILABLE
         Assert.assertTrue(t.shouldRun())
@@ -114,7 +107,7 @@ class TriggerAutosensValueTest : TriggerTestBase() {
 
     @Before
     fun mock() {
-        PowerMockito.`when`(dateUtil.now()).thenReturn(now)
+        `when`(dateUtil.now()).thenReturn(now)
     }
 
     private fun generateAutosensData(): AutosensData {
diff --git a/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerBTDeviceTest.kt b/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerBTDeviceTest.kt
index 47b98b582d..4ddeded933 100644
--- a/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerBTDeviceTest.kt
+++ b/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerBTDeviceTest.kt
@@ -6,11 +6,8 @@ import info.nightscout.androidaps.plugins.general.automation.elements.Comparator
 import org.json.JSONObject
 import org.junit.Assert
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.powermock.modules.junit4.PowerMockRunner
 
 @Suppress("SpellCheckingInspection")
-@RunWith(PowerMockRunner::class)
 class TriggerBTDeviceTest : TriggerTestBase() {
 
     var now = 1514766900000L
diff --git a/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerBgTest.kt b/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerBgTest.kt
index 76d1980ac0..e9ee52718f 100644
--- a/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerBgTest.kt
+++ b/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerBgTest.kt
@@ -1,25 +1,17 @@
 package info.nightscout.androidaps.plugins.general.automation.triggers
 
 import com.google.common.base.Optional
-import info.nightscout.androidaps.Constants
 import info.nightscout.androidaps.automation.R
 import info.nightscout.androidaps.database.entities.GlucoseValue
 import info.nightscout.androidaps.interfaces.GlucoseUnit
-import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.plugins.general.automation.elements.Comparator
-import info.nightscout.androidaps.utils.DateUtil
 import org.json.JSONObject
 import org.junit.Assert
 import org.junit.Before
 import org.junit.Test
-import org.junit.runner.RunWith
 import org.mockito.Mockito.`when`
-import org.powermock.core.classloader.annotations.PrepareForTest
-import org.powermock.modules.junit4.PowerMockRunner
 import java.util.*
 
-@RunWith(PowerMockRunner::class)
-@PrepareForTest(DateUtil::class, ProfileFunction::class)
 class TriggerBgTest : TriggerTestBase() {
 
     var now = 1514766900000L
diff --git a/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerBolusAgoTest.kt b/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerBolusAgoTest.kt
index 29beab1464..11d2b392c6 100644
--- a/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerBolusAgoTest.kt
+++ b/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerBolusAgoTest.kt
@@ -4,27 +4,20 @@ import com.google.common.base.Optional
 import info.nightscout.androidaps.automation.R
 import info.nightscout.androidaps.database.entities.Bolus
 import info.nightscout.androidaps.plugins.general.automation.elements.Comparator
-import info.nightscout.androidaps.utils.DateUtil
 import org.json.JSONException
 import org.json.JSONObject
 import org.junit.Assert
 import org.junit.Before
 import org.junit.Test
-import org.junit.runner.RunWith
 import org.mockito.Mockito.`when`
-import org.powermock.api.mockito.PowerMockito
-import org.powermock.core.classloader.annotations.PrepareForTest
-import org.powermock.modules.junit4.PowerMockRunner
 
-@RunWith(PowerMockRunner::class)
-@PrepareForTest(DateUtil::class)
 class TriggerBolusAgoTest : TriggerTestBase() {
 
     var now = 1514766900000L
 
     @Before
     fun mock() {
-        PowerMockito.`when`(dateUtil.now()).thenReturn(now)
+        `when`(dateUtil.now()).thenReturn(now)
     }
 
     @Test
diff --git a/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerCOBTest.kt b/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerCOBTest.kt
index d67fb0a109..1176417304 100644
--- a/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerCOBTest.kt
+++ b/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerCOBTest.kt
@@ -4,31 +4,25 @@ import com.google.common.base.Optional
 import info.nightscout.androidaps.automation.R
 import info.nightscout.androidaps.plugins.general.automation.elements.Comparator
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.CobInfo
-import info.nightscout.androidaps.utils.DateUtil
 import org.json.JSONObject
 import org.junit.Assert
 import org.junit.Before
 import org.junit.Test
-import org.junit.runner.RunWith
 import org.mockito.ArgumentMatchers
-import org.powermock.api.mockito.PowerMockito
-import org.powermock.core.classloader.annotations.PrepareForTest
-import org.powermock.modules.junit4.PowerMockRunner
+import org.mockito.Mockito.`when`
 
-@RunWith(PowerMockRunner::class)
-@PrepareForTest(DateUtil::class)
 class TriggerCOBTest : TriggerTestBase() {
 
     var now = 1514766900000L
 
     @Before fun mock() {
-        PowerMockito.`when`(dateUtil.now()).thenReturn(now)
-        PowerMockito.`when`(sp.getInt(ArgumentMatchers.anyInt(), ArgumentMatchers.anyInt())).thenReturn(48)
+        `when`(dateUtil.now()).thenReturn(now)
+        `when`(sp.getInt(ArgumentMatchers.anyInt(), ArgumentMatchers.anyInt())).thenReturn(48)
     }
 
     @Test fun shouldRunTest() {
         // COB value is 6
-        PowerMockito.`when`(iobCobCalculator.getCobInfo(false, "AutomationTriggerCOB")).thenReturn(CobInfo(6.0, 2.0))
+        `when`(iobCobCalculator.getCobInfo(false, "AutomationTriggerCOB")).thenReturn(CobInfo(0, 6.0, 2.0))
         var t: TriggerCOB = TriggerCOB(injector).setValue(1.0).comparator(Comparator.Compare.IS_EQUAL)
         Assert.assertFalse(t.shouldRun())
         t = TriggerCOB(injector).setValue(6.0).comparator(Comparator.Compare.IS_EQUAL)
@@ -72,6 +66,6 @@ class TriggerCOBTest : TriggerTestBase() {
     }
 
     fun generateCobInfo(): CobInfo {
-        return CobInfo(6.0, 0.0)
+        return CobInfo(0, 6.0, 0.0)
     }
 }
\ No newline at end of file
diff --git a/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerConnectorTest.kt b/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerConnectorTest.kt
index 74754f924e..f43006c6d9 100644
--- a/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerConnectorTest.kt
+++ b/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerConnectorTest.kt
@@ -4,10 +4,7 @@ import org.json.JSONException
 import org.json.JSONObject
 import org.junit.Assert
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.powermock.modules.junit4.PowerMockRunner
 
-@RunWith(PowerMockRunner::class)
 class TriggerConnectorTest : TriggerTestBase() {
 
     @Test fun testTriggerList() {
diff --git a/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerDeltaTest.kt b/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerDeltaTest.kt
index 964cbb5e0f..9f23dffbfc 100644
--- a/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerDeltaTest.kt
+++ b/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerDeltaTest.kt
@@ -1,34 +1,25 @@
 package info.nightscout.androidaps.plugins.general.automation.triggers
 
 import com.google.common.base.Optional
-import info.nightscout.androidaps.Constants
 import info.nightscout.androidaps.automation.R
 import info.nightscout.androidaps.database.entities.GlucoseValue
 import info.nightscout.androidaps.interfaces.GlucoseUnit
-import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.plugins.general.automation.elements.Comparator
 import info.nightscout.androidaps.plugins.general.automation.elements.InputDelta.DeltaType
-import info.nightscout.androidaps.utils.DateUtil
 import org.json.JSONObject
 import org.junit.Assert
 import org.junit.Before
 import org.junit.Test
-import org.junit.runner.RunWith
 import org.mockito.Mockito.`when`
-import org.powermock.api.mockito.PowerMockito
-import org.powermock.core.classloader.annotations.PrepareForTest
-import org.powermock.modules.junit4.PowerMockRunner
 import java.util.*
 
-@RunWith(PowerMockRunner::class)
-@PrepareForTest(DateUtil::class, ProfileFunction::class)
 class TriggerDeltaTest : TriggerTestBase() {
 
     var now = 1514766900000L
 
     @Before
     fun mock() {
-        PowerMockito.`when`(dateUtil.now()).thenReturn(now)
+        `when`(dateUtil.now()).thenReturn(now)
         `when`(profileFunction.getUnits()).thenReturn(GlucoseUnit.MGDL)
     }
 
diff --git a/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerIobTest.kt b/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerIobTest.kt
index af3a608550..cb554535e2 100644
--- a/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerIobTest.kt
+++ b/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerIobTest.kt
@@ -4,19 +4,13 @@ import com.google.common.base.Optional
 import info.nightscout.androidaps.automation.R
 import info.nightscout.androidaps.data.IobTotal
 import info.nightscout.androidaps.plugins.general.automation.elements.Comparator
-import info.nightscout.androidaps.utils.DateUtil
 import org.json.JSONObject
 import org.junit.Assert
 import org.junit.Before
 import org.junit.Test
-import org.junit.runner.RunWith
 import org.mockito.ArgumentMatchers
 import org.mockito.Mockito.`when`
-import org.powermock.core.classloader.annotations.PrepareForTest
-import org.powermock.modules.junit4.PowerMockRunner
 
-@RunWith(PowerMockRunner::class)
-@PrepareForTest(DateUtil::class)
 class TriggerIobTest : TriggerTestBase() {
 
     var now = 1514766900000L
diff --git a/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerLocationTest.kt b/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerLocationTest.kt
index c533c8f257..8f80672065 100644
--- a/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerLocationTest.kt
+++ b/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerLocationTest.kt
@@ -4,29 +4,19 @@ import android.location.Location
 import com.google.common.base.Optional
 import info.nightscout.androidaps.automation.R
 import info.nightscout.androidaps.plugins.general.automation.elements.InputLocationMode
-import info.nightscout.androidaps.services.LocationService
-import info.nightscout.androidaps.utils.DateUtil
 import org.json.JSONException
 import org.json.JSONObject
 import org.junit.Assert
 import org.junit.Before
 import org.junit.Test
-import org.junit.runner.RunWith
 import org.mockito.Mockito.`when`
-import org.powermock.api.mockito.PowerMockito
-import org.powermock.core.classloader.annotations.PrepareForTest
-import org.powermock.modules.junit4.PowerMockRunner
 
-@RunWith(PowerMockRunner::class)
-@PrepareForTest(DateUtil::class, LocationService::class)
 class TriggerLocationTest : TriggerTestBase() {
 
     var now = 1514766900000L
 
     @Before fun mock() {
-        PowerMockito.mockStatic(LocationService::class.java)
         `when`(dateUtil.now()).thenReturn(now)
-        PowerMockito.spy(LocationService::class.java)
         `when`(locationDataContainer.lastLocation).thenReturn(mockedLocation())
     }
 
diff --git a/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerProfilePercentTest.kt b/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerProfilePercentTest.kt
index 27c910ca78..d1343adf6c 100644
--- a/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerProfilePercentTest.kt
+++ b/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerProfilePercentTest.kt
@@ -3,27 +3,20 @@ package info.nightscout.androidaps.plugins.general.automation.triggers
 import com.google.common.base.Optional
 import info.nightscout.androidaps.automation.R
 import info.nightscout.androidaps.plugins.general.automation.elements.Comparator
-import info.nightscout.androidaps.utils.DateUtil
 import org.json.JSONException
 import org.json.JSONObject
 import org.junit.Assert
 import org.junit.Before
 import org.junit.Test
-import org.junit.runner.RunWith
 import org.mockito.Mockito.`when`
-import org.powermock.api.mockito.PowerMockito
-import org.powermock.core.classloader.annotations.PrepareForTest
-import org.powermock.modules.junit4.PowerMockRunner
 
-@RunWith(PowerMockRunner::class)
-@PrepareForTest(DateUtil::class)
 class TriggerProfilePercentTest : TriggerTestBase() {
 
     private val now = 1514766900000L
 
     @Before fun mock() {
         `when`(profileFunction.getProfile()).thenReturn(validProfile)
-        PowerMockito.`when`(dateUtil.now()).thenReturn(now)
+        `when`(dateUtil.now()).thenReturn(now)
     }
 
     @Test fun shouldRunTest() {
diff --git a/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerPumpLastConnectionTest.kt b/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerPumpLastConnectionTest.kt
index bddce94217..1bd94e4e25 100644
--- a/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerPumpLastConnectionTest.kt
+++ b/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerPumpLastConnectionTest.kt
@@ -3,25 +3,19 @@ package info.nightscout.androidaps.plugins.general.automation.triggers
 import com.google.common.base.Optional
 import info.nightscout.androidaps.automation.R
 import info.nightscout.androidaps.plugins.general.automation.elements.Comparator
-import info.nightscout.androidaps.utils.DateUtil
 import org.json.JSONObject
 import org.junit.Assert
 import org.junit.Before
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.powermock.api.mockito.PowerMockito
-import org.powermock.core.classloader.annotations.PrepareForTest
-import org.powermock.modules.junit4.PowerMockRunner
+import org.mockito.Mockito.`when`
 
-@RunWith(PowerMockRunner::class)
-@PrepareForTest(DateUtil::class)
 class TriggerPumpLastConnectionTest : TriggerTestBase() {
 
     var now = 1514766900000L
 
     @Before
     fun mock() {
-        PowerMockito.`when`(dateUtil.now()).thenReturn(now)
+        `when`(dateUtil.now()).thenReturn(now)
     }
 
     @Test
@@ -29,7 +23,7 @@ class TriggerPumpLastConnectionTest : TriggerTestBase() {
 //        System.currentTimeMillis() is always 0
 //        and so is every last connection time
         Assert.assertEquals(0L, testPumpPlugin.lastDataTime())
-        PowerMockito.`when`(dateUtil.now()).thenReturn(now + 10 * 60 * 1000) // set current time to now + 10 min
+        `when`(dateUtil.now()).thenReturn(now + 10 * 60 * 1000) // set current time to now + 10 min
         var t = TriggerPumpLastConnection(injector).setValue(110).comparator(Comparator.Compare.IS_EQUAL)
         Assert.assertEquals(110, t.minutesAgo.value)
         Assert.assertEquals(Comparator.Compare.IS_EQUAL, t.comparator.value)
diff --git a/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerRecurringTimeTest.kt b/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerRecurringTimeTest.kt
index e764e22747..e63ec3118b 100644
--- a/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerRecurringTimeTest.kt
+++ b/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerRecurringTimeTest.kt
@@ -1,26 +1,20 @@
 package info.nightscout.androidaps.plugins.general.automation.triggers
 
-import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.utils.MidnightTime
 import info.nightscout.androidaps.utils.T
 import org.json.JSONObject
 import org.junit.Assert
 import org.junit.Before
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.powermock.api.mockito.PowerMockito
-import org.powermock.core.classloader.annotations.PrepareForTest
-import org.powermock.modules.junit4.PowerMockRunner
+import org.mockito.Mockito.`when`
 
-@RunWith(PowerMockRunner::class)
-@PrepareForTest(DateUtil::class)
 class TriggerRecurringTimeTest : TriggerTestBase() {
 
     var now : Long = 0L
 
     @Before fun mock() {
         now = MidnightTime.calc() + T.mins(95).msecs() // 95 min from midnight
-        PowerMockito.`when`(dateUtil.now()).thenReturn(now)
+        `when`(dateUtil.now()).thenReturn(now)
     }
 
     @Test fun shouldRunTest() {
diff --git a/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerTempTargetTest.kt b/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerTempTargetTest.kt
index 64ba71fd14..7960208905 100644
--- a/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerTempTargetTest.kt
+++ b/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerTempTargetTest.kt
@@ -3,24 +3,18 @@ package info.nightscout.androidaps.plugins.general.automation.triggers
 import com.google.common.base.Optional
 import info.nightscout.androidaps.automation.R
 import info.nightscout.androidaps.plugins.general.automation.elements.ComparatorExists
-import info.nightscout.androidaps.utils.DateUtil
 import org.json.JSONObject
 import org.junit.Assert
 import org.junit.Before
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.powermock.api.mockito.PowerMockito
-import org.powermock.core.classloader.annotations.PrepareForTest
-import org.powermock.modules.junit4.PowerMockRunner
+import org.mockito.Mockito.`when`
 
-@RunWith(PowerMockRunner::class)
-@PrepareForTest(DateUtil::class)
 class TriggerTempTargetTest : TriggerTestBase() {
 
     var now = 1514766900000L
 
     @Before fun mock() {
-        PowerMockito.`when`(dateUtil.now()).thenReturn(now)
+        `when`(dateUtil.now()).thenReturn(now)
     }
 /*
     @Test fun shouldRunTest() {
@@ -29,7 +23,7 @@ class TriggerTempTargetTest : TriggerTestBase() {
         Assert.assertFalse(t.shouldRun())
         t = TriggerTempTarget(injector).comparator(ComparatorExists.Compare.NOT_EXISTS)
         Assert.assertTrue(t.shouldRun())
-        PowerMockito.`when`(repository.getTemporaryTargetActiveAt(anyObject())).thenReturn(TemporaryTarget(duration = 0, highTarget = 0.0, lowTarget = 0.0, reason = TemporaryTarget.Reason.CUSTOM, timestamp = 0))
+        `when`(repository.getTemporaryTargetActiveAt(anyObject())).thenReturn(TemporaryTarget(duration = 0, highTarget = 0.0, lowTarget = 0.0, reason = TemporaryTarget.Reason.CUSTOM, timestamp = 0))
         t = TriggerTempTarget(injector).comparator(ComparatorExists.Compare.NOT_EXISTS)
         Assert.assertFalse(t.shouldRun())
         t = TriggerTempTarget(injector).comparator(ComparatorExists.Compare.EXISTS)
diff --git a/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerTempTargetValueTest.kt b/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerTempTargetValueTest.kt
new file mode 100644
index 0000000000..9e500fbbee
--- /dev/null
+++ b/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerTempTargetValueTest.kt
@@ -0,0 +1,85 @@
+package info.nightscout.androidaps.plugins.general.automation.triggers
+
+import com.google.common.base.Optional
+import info.nightscout.androidaps.automation.R
+import info.nightscout.androidaps.database.ValueWrapper
+import info.nightscout.androidaps.database.entities.TemporaryTarget
+import info.nightscout.androidaps.interfaces.GlucoseUnit
+import info.nightscout.androidaps.plugins.general.automation.elements.Comparator
+import io.reactivex.Single
+import org.json.JSONObject
+import org.junit.Assert
+import org.junit.Before
+import org.junit.Test
+import org.mockito.Mockito.`when`
+
+class TriggerTempTargetValueTest : TriggerTestBase() {
+
+    var now = 1514766900000L
+
+    @Before
+    fun prepare() {
+        `when`(profileFunction.getUnits()).thenReturn(GlucoseUnit.MGDL)
+        `when`(dateUtil.now()).thenReturn(now)
+    }
+
+    @Test
+    fun shouldRunTest() {
+        `when`(repository.getTemporaryTargetActiveAt(dateUtil.now())).thenReturn(Single.just(ValueWrapper.Existing(TemporaryTarget(duration = 60000, highTarget = 140.0, lowTarget = 140.0, reason = TemporaryTarget.Reason.CUSTOM, timestamp = now - 1))))
+        var t: TriggerTempTargetValue = TriggerTempTargetValue(injector).setUnits(GlucoseUnit.MMOL).setValue(7.7).comparator(Comparator.Compare.IS_EQUAL)
+        Assert.assertFalse(t.shouldRun())
+        t = TriggerTempTargetValue(injector).setUnits(GlucoseUnit.MGDL).setValue(140.0).comparator(Comparator.Compare.IS_EQUAL)
+        Assert.assertTrue(t.shouldRun())
+        t = TriggerTempTargetValue(injector).setUnits(GlucoseUnit.MGDL).setValue(140.0).comparator(Comparator.Compare.IS_EQUAL_OR_GREATER)
+        Assert.assertTrue(t.shouldRun())
+        t = TriggerTempTargetValue(injector).setUnits(GlucoseUnit.MGDL).setValue(140.0).comparator(Comparator.Compare.IS_EQUAL_OR_LESSER)
+        Assert.assertTrue(t.shouldRun())
+        t = TriggerTempTargetValue(injector).setUnits(GlucoseUnit.MGDL).setValue(139.0).comparator(Comparator.Compare.IS_EQUAL)
+        Assert.assertFalse(t.shouldRun())
+        t = TriggerTempTargetValue(injector).setUnits(GlucoseUnit.MGDL).setValue(141.0).comparator(Comparator.Compare.IS_EQUAL_OR_LESSER)
+        Assert.assertTrue(t.shouldRun())
+        t = TriggerTempTargetValue(injector).setUnits(GlucoseUnit.MGDL).setValue(141.0).comparator(Comparator.Compare.IS_EQUAL_OR_GREATER)
+        Assert.assertFalse(t.shouldRun())
+        t = TriggerTempTargetValue(injector).setUnits(GlucoseUnit.MGDL).setValue(139.0).comparator(Comparator.Compare.IS_EQUAL_OR_GREATER)
+        Assert.assertTrue(t.shouldRun())
+        t = TriggerTempTargetValue(injector).setUnits(GlucoseUnit.MGDL).setValue(139.0).comparator(Comparator.Compare.IS_EQUAL_OR_LESSER)
+        Assert.assertFalse(t.shouldRun())
+        Assert.assertFalse(t.shouldRun())
+        t = TriggerTempTargetValue(injector).comparator(Comparator.Compare.IS_NOT_AVAILABLE)
+        Assert.assertFalse(t.shouldRun())
+        `when`(repository.getTemporaryTargetActiveAt(dateUtil.now())).thenReturn(Single.just(ValueWrapper.Absent()))
+        Assert.assertTrue(t.shouldRun())
+    }
+
+    @Test
+    fun copyConstructorTest() {
+        val t: TriggerTempTargetValue = TriggerTempTargetValue(injector).setUnits(GlucoseUnit.MGDL).setValue(140.0).comparator(Comparator.Compare.IS_EQUAL_OR_LESSER)
+        val t1 = t.duplicate() as TriggerTempTargetValue
+        Assert.assertEquals(140.0, t1.ttValue.value, 0.01)
+        Assert.assertEquals(GlucoseUnit.MGDL, t1.ttValue.units)
+        Assert.assertEquals(Comparator.Compare.IS_EQUAL_OR_LESSER, t.comparator.value)
+    }
+
+    private var ttJson = "{\"data\":{\"tt\":7.7,\"comparator\":\"IS_EQUAL\",\"units\":\"mmol\"},\"type\":\"TriggerTempTargetValue\"}"
+
+    @Test
+    fun toJSONTest() {
+        val t: TriggerTempTargetValue = TriggerTempTargetValue(injector).setUnits(GlucoseUnit.MMOL).setValue(7.7).comparator(Comparator.Compare.IS_EQUAL)
+        Assert.assertEquals(ttJson, t.toJSON())
+    }
+
+    @Test
+    fun fromJSONTest() {
+        val t: TriggerTempTargetValue = TriggerTempTargetValue(injector).setUnits(GlucoseUnit.MMOL).setValue(7.7).comparator(Comparator.Compare.IS_EQUAL)
+        val t2 = TriggerDummy(injector).instantiate(JSONObject(t.toJSON())) as TriggerTempTargetValue
+        Assert.assertEquals(Comparator.Compare.IS_EQUAL, t2.comparator.value)
+        Assert.assertEquals(7.7, t2.ttValue.value, 0.01)
+        Assert.assertEquals(GlucoseUnit.MMOL, t2.ttValue.units)
+    }
+
+    @Test
+    fun iconTest() {
+        Assert.assertEquals(Optional.of(R.drawable.ic_keyboard_tab), TriggerTempTargetValue(injector).icon())
+    }
+}
+
diff --git a/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerTestBase.kt b/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerTestBase.kt
index 350b987dbd..dcd98a45e9 100644
--- a/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerTestBase.kt
+++ b/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerTestBase.kt
@@ -3,13 +3,13 @@ package info.nightscout.androidaps.plugins.general.automation.triggers
 import android.content.Context
 import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.plugins.general.automation.TestBaseWithProfile
 import info.nightscout.androidaps.TestPumpPlugin
 import info.nightscout.androidaps.interfaces.ActivePlugin
 import info.nightscout.androidaps.interfaces.IobCobCalculator
 import info.nightscout.androidaps.interfaces.PluginDescription
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.general.automation.AutomationPlugin
+import info.nightscout.androidaps.plugins.general.automation.TestBaseWithProfile
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.AutosensDataStore
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatusProvider
 import info.nightscout.androidaps.receivers.ReceiverStatusStore
@@ -18,9 +18,7 @@ import info.nightscout.androidaps.utils.sharedPreferences.SP
 import org.junit.Before
 import org.mockito.Mock
 import org.mockito.Mockito.`when`
-import org.powermock.core.classloader.annotations.PrepareForTest
 
-@PrepareForTest(LastLocationDataContainer::class, AutomationPlugin::class, AutosensDataStore::class)
 open class TriggerTestBase : TestBaseWithProfile() {
 
     @Mock lateinit var sp: SP
diff --git a/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerTimeRangeTest.kt b/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerTimeRangeTest.kt
index 3e01059aa6..55e31d328f 100644
--- a/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerTimeRangeTest.kt
+++ b/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerTimeRangeTest.kt
@@ -2,19 +2,13 @@ package info.nightscout.androidaps.plugins.general.automation.triggers
 
 import com.google.common.base.Optional
 import info.nightscout.androidaps.automation.R
-import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.utils.MidnightTime
 import org.json.JSONObject
 import org.junit.Assert
 import org.junit.Before
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.powermock.api.mockito.PowerMockito
-import org.powermock.core.classloader.annotations.PrepareForTest
-import org.powermock.modules.junit4.PowerMockRunner
+import org.mockito.Mockito.`when`
 
-@RunWith(PowerMockRunner::class)
-@PrepareForTest(DateUtil::class)
 class TriggerTimeRangeTest : TriggerTestBase() {
 
     var now = 754 // in minutes from midnight
@@ -23,7 +17,7 @@ class TriggerTimeRangeTest : TriggerTestBase() {
     @Before
     fun mock() {
         val nowMills = MidnightTime.calcPlusMinutes(now)
-        PowerMockito.`when`(dateUtil.now()).thenReturn(nowMills)
+        `when`(dateUtil.now()).thenReturn(nowMills)
     }
 
     @Test
diff --git a/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerTimeTest.kt b/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerTimeTest.kt
index 8c38c37761..24f7fc9932 100644
--- a/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerTimeTest.kt
+++ b/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerTimeTest.kt
@@ -2,26 +2,20 @@ package info.nightscout.androidaps.plugins.general.automation.triggers
 
 import com.google.common.base.Optional
 import info.nightscout.androidaps.automation.R
-import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.utils.T
 import org.json.JSONException
 import org.json.JSONObject
 import org.junit.Assert
 import org.junit.Before
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.powermock.api.mockito.PowerMockito
-import org.powermock.core.classloader.annotations.PrepareForTest
-import org.powermock.modules.junit4.PowerMockRunner
+import org.mockito.Mockito.`when`
 
-@RunWith(PowerMockRunner::class)
-@PrepareForTest(DateUtil::class)
 class TriggerTimeTest : TriggerTestBase() {
 
     var now = 1514766900000L
 
     @Before fun mock() {
-        PowerMockito.`when`(dateUtil.now()).thenReturn(now)
+        `when`(dateUtil.now()).thenReturn(now)
     }
 
     @Test fun shouldRunTest() {
diff --git a/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerWifiSsidTest.kt b/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerWifiSsidTest.kt
index 4b38476f98..3e7fe4549e 100644
--- a/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerWifiSsidTest.kt
+++ b/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerWifiSsidTest.kt
@@ -4,27 +4,19 @@ import com.google.common.base.Optional
 import info.nightscout.androidaps.automation.R
 import info.nightscout.androidaps.events.EventNetworkChange
 import info.nightscout.androidaps.plugins.general.automation.elements.Comparator
-import info.nightscout.androidaps.receivers.NetworkChangeReceiver
-import info.nightscout.androidaps.utils.DateUtil
 import org.json.JSONException
 import org.json.JSONObject
 import org.junit.Assert
 import org.junit.Before
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.powermock.api.mockito.PowerMockito
-import org.powermock.core.classloader.annotations.PrepareForTest
-import org.powermock.modules.junit4.PowerMockRunner
+import org.mockito.Mockito.`when`
 
-@RunWith(PowerMockRunner::class)
-@PrepareForTest(NetworkChangeReceiver::class, DateUtil::class)
 class TriggerWifiSsidTest : TriggerTestBase() {
 
     var now = 1514766900000L
 
     @Before fun mock() {
-        PowerMockito.mockStatic(NetworkChangeReceiver::class.java)
-        PowerMockito.`when`(dateUtil.now()).thenReturn(now)
+        `when`(dateUtil.now()).thenReturn(now)
     }
 
     @Test fun shouldRunTest() {
diff --git a/build.gradle b/build.gradle
index 415ec67a96..69f3e7777a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,39 +1,36 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.5.0-release-764'
     ext {
-        // kotlin 1.5.0 prevents travis from pass
-        // remove @kotlin.ExperimentalStdlibApi everywhere when upgrade
-        kotlin_version = '1.4.32'
-        coreVersion = '1.5.0'
+        kotlin_version = '1.5.31'
+        coreVersion = '1.6.0'
         rxjava_version = '2.2.21'
         rxandroid_version = '2.1.1'
         rxkotlin_version = '2.4.0'
         room_version = '2.3.0'
         lifecycle_version = '2.3.1'
-        dagger_version = '2.35.1'
+        dagger_version = '2.39.1'
         coroutinesVersion = '1.4.1'
-        activityVersion = '1.2.0'
-        fragmentktx_version = '1.3.0'
+        activityVersion = '1.3.1'
+        fragmentktx_version = '1.3.6'
         ormLiteVersion = '4.46'
-        nav_version = '2.3.3'
-        appcompat_version = '1.3.0'
-        material_version = '1.3.0'
-        constraintlayout_version = '2.0.4'
+        nav_version = '2.3.5'
+        appcompat_version = '1.3.1'
+        material_version = '1.4.0'
+        constraintlayout_version = '2.1.0'
         preferencektx_version = '1.1.1'
         commonslang3_version = '3.11'
         commonscodec_version = '1.15'
-        jodatime_version = '2.10.10'
+        jodatime_version = '2.10.12'
         work_version = '2.5.0'
+        tink_version = '1.5.0'
 
         junit_version = '4.13.2'
-        mockitoVersion = '3.10.0'
-        powermockVersion = '2.0.9'
+        mockitoVersion = '3.12.4'
         dexmakerVersion = "1.2"
         retrofit2Version = '2.9.0'
         okhttp3Version = '4.9.0'
-        byteBuddyVersion = '1.11.0'
+        byteBuddyVersion = '1.11.18'
 
         androidx_junit = '1.1.2'
         androidx_rules = '1.4.0-alpha04'
@@ -44,44 +41,38 @@ buildscript {
         maven { url "https://plugins.gradle.org/m2/" } // jacoco 0.2
     }
     dependencies {
-        // Update to 4.2.1 is not possible because it forces use build-tools 30.0.2
-        // and this is not available in travis so far
-        // see https://issuetracker.google.com/issues/162255866
-        classpath 'com.android.tools.build:gradle:4.1.3'
-        classpath 'com.google.gms:google-services:4.3.5'
-        classpath 'com.google.firebase:firebase-crashlytics-gradle:2.6.1'
+        classpath 'com.android.tools.build:gradle:7.0.2'
+        classpath 'com.google.gms:google-services:4.3.10'
+        classpath 'com.google.firebase:firebase-crashlytics-gradle:2.7.1'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
 
         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' }
-        maven { url "https://google.bintray.com/flexbox-layout" }
-        ivy {
-            url 'https://github.com/'
-            patternLayout {
-                artifact '/[organisation]/[module]/archive/[revision].[ext]'
-            }
-        }
     }
-    //Support @JvmDefault
     tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {
         kotlinOptions {
-            freeCompilerArgs = ['-Xjvm-default=all']
+            freeCompilerArgs = [
+                    // Ignore warning for  @ExperimentalCoroutinesApi
+                    "-Xuse-experimental=kotlinx.coroutines.ExperimentalCoroutinesApi",
+                    '-Xjvm-default=all'     //Support @JvmDefault
+            ]
             jvmTarget = "1.8"
         }
     }
diff --git a/combo/build.gradle b/combo/build.gradle
index 8020051b31..c81f96b15c 100644
--- a/combo/build.gradle
+++ b/combo/build.gradle
@@ -1,19 +1,13 @@
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-kapt'
+apply plugin: 'kotlin-allopen'
 apply plugin: 'com.hiya.jacoco-android'
 
 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"
-
-
-android {
-    defaultConfig {
-        versionCode 1
-        versionName "1.0"
-    }
-}
+apply from: "${project.rootDir}/gradle/jacoco_global.gradle"
 
 dependencies {
     implementation project(':core')
diff --git a/combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ComboPlugin.java b/combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ComboPlugin.java
index a42bcaafde..b50e85a5bc 100644
--- a/combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ComboPlugin.java
+++ b/combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ComboPlugin.java
@@ -768,7 +768,7 @@ public class ComboPlugin extends PumpPluginBase implements Pump, Constraints {
             pumpSync.syncTemporaryBasalWithPumpId(
                     state.timestamp,
                     state.tbrPercent,
-                    T.mins(state.tbrRemainingDuration).msecs(),
+                    T.Companion.mins(state.tbrRemainingDuration).msecs(),
                     false,
                     tbrType,
                     // There are no IDs for TBRs on the pump and none is calculated (in contrast to boluses).
@@ -974,7 +974,7 @@ public class ComboPlugin extends PumpPluginBase implements Pump, Constraints {
                 pumpSync.syncTemporaryBasalWithPumpId(
                         now,
                         0.0,
-                        T.mins(15).msecs(),
+                        T.Companion.mins(15).msecs(),
                         false,
                         PumpSync.TemporaryBasalType.PUMP_SUSPEND,
                         // Combo doesn't have nor uses IDs for TBRs, see note in #setTempBasalPercent
@@ -1107,7 +1107,7 @@ public class ComboPlugin extends PumpPluginBase implements Pump, Constraints {
             pumpSync.syncTemporaryBasalWithPumpId(
                     now,
                     state.tbrPercent,
-                    T.mins(state.tbrRemainingDuration).msecs(),
+                    T.Companion.mins(state.tbrRemainingDuration).msecs(),
                     false,
                     PumpSync.TemporaryBasalType.NORMAL,
                     tbrId,
@@ -1140,7 +1140,7 @@ public class ComboPlugin extends PumpPluginBase implements Pump, Constraints {
             pumpSync.syncTemporaryBasalWithPumpId(
                     now,
                     state.tbrPercent,
-                    T.mins(state.tbrRemainingDuration).msecs(),
+                    T.Companion.mins(state.tbrRemainingDuration).msecs(),
                     false,
                     PumpSync.TemporaryBasalType.NORMAL,
                     tbrId,
diff --git a/combo/src/main/res/values-fr-rFR/strings.xml b/combo/src/main/res/values-fr-rFR/strings.xml
index 321624b7f2..53e1970f73 100644
--- a/combo/src/main/res/values-fr-rFR/strings.xml
+++ b/combo/src/main/res/values-fr-rFR/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="description_pump_combo">Intégration des pompes Accu-Chek Combo il faut avoir Ruffy installé</string>
-    <string name="combo_programming_bolus">Programmer la pompe pour injecter un bolus</string>
+    <string name="description_pump_combo">Pour l\'intégration des pompes Accu-Chek Combo, il faut d\'abord installer Ruffy</string>
+    <string name="combo_programming_bolus">Programmation de la pompe pour injecter un bolus</string>
     <string name="combo_pump_state_label">État</string>
     <string name="combo_pump_activity_label">Activité</string>
     <string name="combo_no_pump_connection">Pas de connexion depuis %1$d min</string>
@@ -10,13 +10,13 @@
     <string name="combo_pump_state_suspended_due_to_error">Arrêté pour cause d\'erreur</string>
     <string name="combo_pump_state_suspended_by_user">Arrêté par l\'utilisateur</string>
     <string name="combo_pump_state_running">En cours d\'exécution</string>
-    <string name="combo_pump_action_cancelling_tbr">Annulation en cours du TBR</string>
-    <string name="combo_pump_action_setting_tbr">Paramétrer TBR (%1$d%% / %2$d min) </string>
+    <string name="combo_pump_action_cancelling_tbr">Annulation du DBT</string>
+    <string name="combo_pump_action_setting_tbr">Réglage DBT (%1$d%% / %2$d min)</string>
     <string name="combo_pump_action_bolusing">Injection du Bolus en cours (%1$.1f U)</string>
     <string name="combo_pump_action_refreshing">Actualisation en cours</string>
     <string name="combo_pump_unsupported_operation">L\'opération demandée n\'est pas prise en charge par la pompe</string>
     <string name="combo_low_suspend_forced_notification">Utilisation dangereuse : les bolus étendus ou carrés sont actifs. Le mode Boucle a été programmé pour des suspensions seulement pour 6 heures. Uniquement les bolus normaux sont pris en charge par le mode Boucle</string>
-    <string name="combo_force_disabled_notification">Utilisation dangereuse : la pompe utilise un profil avec taux basal différent de celui du premier. Le mode Boucle a été désactivé. Sélectionner le premier profil sur la pompe et rafraîchir.</string>
+    <string name="combo_force_disabled_notification">Utilisation dangereuse : la pompe utilise un profil avec un taux basal différent du premier. Le mode Boucle a été désactivé. Sélectionner le premier profil sur la pompe et rafraîchir.</string>
     <string name="bolus_frequency_exceeded">Un bolus avec la même quantité d’insuline a été demandé au cours de la dernière minute. Pour prévenir l’administration accidentelle de deux bolus à la fois et pour protéger contre les bugs, ceci (bolus) n\'est pas autorisé.</string>
     <string name="combo_pump_connected_now">Maintenant</string>
     <string name="combo_activity_reading_pump_history">Lecture historique pompe</string>
@@ -37,13 +37,13 @@
     <string name="combo_invalid_setup">Paramétrage de la pompe invalide. Vérifiez la documentation et le menu QUICK INFO en utilisant le logiciel de configuration 360.</string>
     <string name="combo_actvity_reading_basal_profile">Lecture du profil basal</string>
     <string name="combo_bolus_rejected_due_to_pump_history_change">L\'historique de la pompe a été modifié depuis le calcul du bolus. Le bolus n\'a pas été administré. Merci de recalculer le bolus s\'il est toujours nécessaire.</string>
-    <string name="combo_error_updating_treatment_record">Le bolus a été délivré mais il n\'a pas pu être ajouté à l\'historique des traitements. Ceci peut se produire lorsque deux petits bolus de la même taille sont gérés dans les deux dernières minutes. Merci de vérifier l\'historique de la pompe et les entrées de traitements puis utilisez le Careportal pour y ajouter les entrées manquantes. Assurez-vous de ne pas ajouter des entrées au cours de la même minute et pour la même quantité d\'insuline.</string>
+    <string name="combo_error_updating_treatment_record">Le bolus a été délivré mais il n\'a pas pu être ajouté à l\'historique des traitements. Ceci peut se produire lorsque deux petits bolus de même taille sont injectés dans les deux dernières minutes. Veuillez vérifier l\'historique de la pompe et les entrées de traitements puis utilisez Careportal pour y ajouter les entrées manquantes. Assurez-vous de ne pas ajouter d\'entrées au cours de la même minute et pour la même quantité d\'insuline.</string>
     <string name="combo_high_temp_rejected_due_to_pump_history_changes">Rejet cible temporaire haute parce que le calcul ne prend pas en compte les changements récents de l\'historique pompe</string>
     <string name="combo_activity_checking_pump_state">Actualisation de l\'état de la pompe</string>
     <string name="combo_warning_pump_basal_rate_changed">Le taux basal de la pompe a été modifié et sera bientôt actualisé</string>
     <string name="combo_error_failure_reading_changed_basal_rate">Le pourcentage de basal a changé dans la pompe mais sa lecture a échoué</string>
     <string name="combo_activity_checking_for_history_changes">Vérification des modifications de l\'historique</string>
-    <string name="combo_error_multiple_boluses_with_identical_timestamp">De multiples bolus similaires viennent d\'être importés dans la même minute. Un seul enregistrement a pu être ajouté aux traitements. Merci de vérifier la pompe et d\'ajouter manuellement un enregistrement de bolus en utilisant l\'onglet Careportal. Assurez vous de créer ce bolus avec un temps différent de tous les autres Bolus.</string>
+    <string name="combo_error_multiple_boluses_with_identical_timestamp">De multiples bolus similaires viennent d\'être importés dans la même minute. Un seul enregistrement a pu être ajouté aux traitements. Veuillez vérifier la pompe et d\'ajouter manuellement un enregistrement de bolus en utilisant l\'onglet Careportal. Assurez vous de créer ce bolus avec un temps différent de tous les autres Bolus.</string>
     <string name="about_link_urls">\n\ndocumentation :\nhttps://androidaps.readthedocs.io/fr/latest/\n\nfacebook :\nhttps://www.facebook.com/groups/AndroidAPSUsers</string>
     <string name="combo_check_date">Le dernier bolus enregistré date d\'il y a plus de 24h ou est dans le futur. Vérifiez que la date dans la pompe est correctement définie.</string>
     <string name="combo_suspious_bolus_time">L\'heure/date sur la pompe du dernier bolus administré semble erroné. L\'IA est probablement incorrecte. Vérifiez l\'heure/date de la pompe.</string>
diff --git a/combo/src/main/res/values-lt-rLT/strings.xml b/combo/src/main/res/values-lt-rLT/strings.xml
index 496bdf4c3e..56aa4d18dd 100644
--- a/combo/src/main/res/values-lt-rLT/strings.xml
+++ b/combo/src/main/res/values-lt-rLT/strings.xml
@@ -3,6 +3,7 @@
     <string name="description_pump_combo">Accu-Chek Combo pompos integracija, reikalinga Ruffy programėlė</string>
     <string name="combo_programming_bolus">Programuojamas bolusas</string>
     <string name="combo_pump_state_label">Būsena</string>
+    <string name="combo_pump_activity_label">Aktyvumas</string>
     <string name="combo_no_pump_connection">Nėra ryšio su pompa %1$d min</string>
     <string name="combo_tbr_remaining">%1$d%% (liko%2$d min)</string>
     <string name="combo_pump_state_initializing">Inicijuojama</string>
diff --git a/combo/src/test/java/info/nightscout/androidaps/plugins/pump/combo/ComboPluginTest.kt b/combo/src/test/java/info/nightscout/androidaps/plugins/pump/combo/ComboPluginTest.kt
index 919a2e597a..20397ef6e6 100644
--- a/combo/src/test/java/info/nightscout/androidaps/plugins/pump/combo/ComboPluginTest.kt
+++ b/combo/src/test/java/info/nightscout/androidaps/plugins/pump/combo/ComboPluginTest.kt
@@ -15,14 +15,9 @@ import info.nightscout.androidaps.utils.sharedPreferences.SP
 import org.junit.Assert
 import org.junit.Before
 import org.junit.Test
-import org.junit.runner.RunWith
 import org.mockito.Mock
 import org.mockito.Mockito.`when`
-import org.powermock.core.classloader.annotations.PrepareForTest
-import org.powermock.modules.junit4.PowerMockRunner
 
-@RunWith(PowerMockRunner::class)
-@PrepareForTest(Context::class)
 class ComboPluginTest : TestBase() {
 
     @Mock lateinit var resourceHelper: ResourceHelper
@@ -32,7 +27,6 @@ class ComboPluginTest : TestBase() {
     @Mock lateinit var pumpSync: PumpSync
     @Mock lateinit var sp: SP
     @Mock lateinit var context: Context
-    @Mock lateinit var databaseHelper: DatabaseHelperInterface
     @Mock lateinit var dateUtil: DateUtil
 
     val injector = HasAndroidInjector {
diff --git a/core/build.gradle b/core/build.gradle
index 9b2d54be1e..8f3db0440e 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -2,21 +2,15 @@ apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-kapt'
 apply plugin: 'kotlin-parcelize'
+apply plugin: 'kotlin-allopen'
 apply plugin: 'com.hiya.jacoco-android'
 
 apply from: 'core_dependencies.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"
-
-android {
-    defaultConfig {
-        versionCode 1
-        versionName "1.0"
-    }
-}
+apply from: "${project.rootDir}/gradle/jacoco_global.gradle"
 
 dependencies {
     implementation project(':database')
 }
-
diff --git a/core/core_dependencies.gradle b/core/core_dependencies.gradle
index 6fa2e179f9..fbfb5ce29e 100644
--- a/core/core_dependencies.gradle
+++ b/core/core_dependencies.gradle
@@ -15,7 +15,7 @@ dependencies {
     api "androidx.activity:activity-ktx:${activityVersion}"
     api "androidx.lifecycle:lifecycle-runtime-ktx:$lifecycle_version"
     api 'androidx.cardview:cardview:1.0.0'
-    api 'androidx.recyclerview:recyclerview:1.1.0'
+    api 'androidx.recyclerview:recyclerview:1.2.1'
     api 'androidx.gridlayout:gridlayout:1.0.0'
     api 'androidx.percentlayout:percentlayout:1.0.0'
     api "com.google.android.material:material:$material_version"
@@ -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"
@@ -55,7 +56,7 @@ dependencies {
     api "com.j256.ormlite:ormlite-android:${ormLiteVersion}"
 
     // pumpCommon
-    api "com.google.code.gson:gson:2.8.6"
+    api "com.google.code.gson:gson:2.8.7"
 
     // don't kill my app
     api('dev.doubledot.doki:library:0.0.1@aar') {
@@ -87,7 +88,7 @@ dependencies {
     api 'com.google.android.gms:play-services-wearable:17.0.0'
     api 'com.google.android.gms:play-services-location:17.1.0'
 
-    api("com.google.android:flexbox:2.0.1")
+    api 'com.google.android.flexbox:flexbox:3.0.0'
     api("io.socket:socket.io-client:1.0.0") {
         // excluding org.json which is provided by Android
         exclude group: "org.json", module: "json"
@@ -103,5 +104,6 @@ dependencies {
     api "commons-codec:commons-codec:$commonscodec_version"
 
     // Phone checker
+    // updating to 0.0.9 prevents AAPS from build
     api 'com.scottyab:rootbeer-lib:0.0.8'
 }
\ No newline at end of file
diff --git a/core/src/main/java/info/nightscout/androidaps/Constants.java b/core/src/main/java/info/nightscout/androidaps/Constants.java
index f8748d2639..e8388b6178 100644
--- a/core/src/main/java/info/nightscout/androidaps/Constants.java
+++ b/core/src/main/java/info/nightscout/androidaps/Constants.java
@@ -23,9 +23,6 @@ public class Constants {
 
     public static final Integer notificationID = 556677;
 
-    public static final int hoursToKeepInDatabase = 72;
-    public static final int daysToKeepHistoryInDatabase = 30;
-
     // SMS COMMUNICATOR
     public static final long remoteBolusMinDistance = 15 * 60 * 1000L;
 
@@ -72,7 +69,7 @@ public class Constants {
     public static final int MIN_WATCHDOG_INTERVAL_IN_SECONDS = 12 * 60;
 
     //SMS Communicator
-    public static final long SMS_CONFIRM_TIMEOUT = T.mins(5L).msecs();
+    public static final long SMS_CONFIRM_TIMEOUT = T.Companion.mins(5L).msecs();
 
     //Storage [MB]
     public static final long MINIMUM_FREE_SPACE = 200;
@@ -106,7 +103,7 @@ public class Constants {
 
     /**
      * How many old TOTP tokens still accept.
-     * Each token is 30s valid, but copying and SMS transmision of it can take additional seconds,
+     * Each token is 30s valid, but copying and SMS transmission of it can take additional seconds,
      * so we add leeway to still accept given amount of older tokens
      */
     public static final int OTP_ACCEPT_OLD_TOKENS_COUNT = 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/ErrorHelperActivity.kt b/core/src/main/java/info/nightscout/androidaps/activities/ErrorHelperActivity.kt
index 0fc25ff143..93b6dc14e0 100644
--- a/core/src/main/java/info/nightscout/androidaps/activities/ErrorHelperActivity.kt
+++ b/core/src/main/java/info/nightscout/androidaps/activities/ErrorHelperActivity.kt
@@ -25,13 +25,13 @@ class ErrorHelperActivity : DialogAppCompatActivity() {
         super.onCreate(savedInstanceState)
         val errorDialog = ErrorDialog()
         errorDialog.helperActivity = this
-        errorDialog.status = intent.getStringExtra(STATUS)
+        errorDialog.status = intent.getStringExtra(STATUS) ?: ""
         errorDialog.sound = intent.getIntExtra(SOUND_ID, R.raw.error)
-        errorDialog.title = intent.getStringExtra(TITLE)
+        errorDialog.title = intent.getStringExtra(TITLE)?: ""
         errorDialog.show(supportFragmentManager, "Error")
 
         if (sp.getBoolean(R.string.key_ns_create_announcements_from_errors, true))
-            disposable += repository.runTransaction(InsertTherapyEventAnnouncementTransaction(intent.getStringExtra(STATUS))).subscribe()
+            disposable += repository.runTransaction(InsertTherapyEventAnnouncementTransaction(intent.getStringExtra(STATUS) ?: "")).subscribe()
     }
 
     companion object {
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/activities/TDDStatsActivity.kt b/core/src/main/java/info/nightscout/androidaps/activities/TDDStatsActivity.kt
index 1015274a08..0e29d22b00 100644
--- a/core/src/main/java/info/nightscout/androidaps/activities/TDDStatsActivity.kt
+++ b/core/src/main/java/info/nightscout/androidaps/activities/TDDStatsActivity.kt
@@ -26,6 +26,7 @@ import info.nightscout.androidaps.interfaces.ActivePlugin
 import info.nightscout.androidaps.interfaces.CommandQueueProvider
 import info.nightscout.androidaps.interfaces.ProfileFunction
 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.common.defs.PumpType
 import info.nightscout.androidaps.queue.Callback
@@ -232,11 +233,15 @@ class TDDStatsActivity : NoSplashAppCompatActivity() {
     @SuppressLint("SetTextI18n")
     private fun loadDataFromDB() {
         historyList.clear()
-        historyList.addAll(repository.getLastTotalDailyDoses(10, false).blockingGet())
+        // timestamp DESC sorting!
+        historyList.addAll(repository.getLastTotalDailyDoses(10, true).blockingGet())
 
         //only use newest 10
         historyList = historyList.subList(0, min(10, historyList.size))
 
+        // dummies reset
+        dummies.clear()
+
         //fill single gaps
         val df: DateFormat = SimpleDateFormat("dd.MM.", Locale.getDefault())
         for (i in 0 until historyList.size - 1) {
@@ -425,7 +430,7 @@ class TDDStatsActivity : NoSplashAppCompatActivity() {
 
     private fun isOldData(historyList: List<TotalDailyDose>): Boolean {
         val type = activePlugin.activePump.pumpDescription.pumpType
-        val startsYesterday = type == PumpType.DANA_R || type == PumpType.DANA_RS || type == PumpType.DANA_RV2 || type == PumpType.DANA_R_KOREAN || type == PumpType.ACCU_CHEK_INSIGHT_VIRTUAL
+        val startsYesterday = type == PumpType.DANA_R || type == PumpType.DANA_RS || type == PumpType.DANA_RV2 || type == PumpType.DANA_R_KOREAN || type == PumpType.ACCU_CHEK_INSIGHT_VIRTUAL || type == PumpType.DIACONN_G8
         val df: DateFormat = SimpleDateFormat("dd.MM.", Locale.getDefault())
         return historyList.size < 3 || df.format(Date(historyList[0].timestamp)) != df.format(Date(System.currentTimeMillis() - if (startsYesterday) 1000 * 60 * 60 * 24 else 0))
     }
diff --git a/core/src/main/java/info/nightscout/androidaps/data/DetailedBolusInfo.kt b/core/src/main/java/info/nightscout/androidaps/data/DetailedBolusInfo.kt
index 3316f00ece..07be899e6d 100644
--- a/core/src/main/java/info/nightscout/androidaps/data/DetailedBolusInfo.kt
+++ b/core/src/main/java/info/nightscout/androidaps/data/DetailedBolusInfo.kt
@@ -20,8 +20,8 @@ class DetailedBolusInfo {
 
     // Additional requesting parameters
     @JvmField var timestamp = System.currentTimeMillis()
-    @JvmField var lastKnownBolusTime: Long = 0 // for SMB check
-    @JvmField var deliverAtTheLatest: Long = 0 // SMB should be delivered within 1 min from this time
+    var lastKnownBolusTime: Long = 0 // for SMB check
+    var deliverAtTheLatest: Long = 0 // SMB should be delivered within 1 min from this time
     @Transient var context: Context? = null // context for progress dialog
 
     // Prefilled info for storing to db
diff --git a/core/src/main/java/info/nightscout/androidaps/data/InMemoryGlucoseValue.kt b/core/src/main/java/info/nightscout/androidaps/data/InMemoryGlucoseValue.kt
index 5c80f6767c..00a89d48db 100644
--- a/core/src/main/java/info/nightscout/androidaps/data/InMemoryGlucoseValue.kt
+++ b/core/src/main/java/info/nightscout/androidaps/data/InMemoryGlucoseValue.kt
@@ -2,7 +2,7 @@ package info.nightscout.androidaps.data
 
 import info.nightscout.androidaps.database.entities.GlucoseValue
 
-class InMemoryGlucoseValue @JvmOverloads constructor(var timestamp: Long = 0L, var value: Double = 0.0, var interpolated: Boolean = false) {
+class InMemoryGlucoseValue constructor(var timestamp: Long = 0L, var value: Double = 0.0, var interpolated: Boolean = false) {
 
     constructor(gv: GlucoseValue) : this(gv.timestamp, gv.value)
     // var generated : value doesn't correspond to real value with timestamp close to real BG
diff --git a/core/src/main/java/info/nightscout/androidaps/data/Intervals.kt b/core/src/main/java/info/nightscout/androidaps/data/Intervals.kt
deleted file mode 100644
index 0ae6352231..0000000000
--- a/core/src/main/java/info/nightscout/androidaps/data/Intervals.kt
+++ /dev/null
@@ -1,72 +0,0 @@
-package info.nightscout.androidaps.data
-
-import androidx.collection.LongSparseArray
-import info.nightscout.androidaps.interfaces.Interval
-import java.util.*
-
-/**
- * Created by mike on 09.05.2017.
- */
-// Zero duration means end of interval
-abstract class Intervals<T : Interval> {
-
-    var rawData: LongSparseArray<T> = LongSparseArray()// oldest at index 0
-
-    @Synchronized fun reset(): Intervals<T> {
-        rawData = LongSparseArray()
-        return this
-    }
-
-    protected abstract fun merge()
-
-    /**
-     * The List must be sorted by `T.start()` in ascending order
-     */
-    @Synchronized fun add(list: List<T>) {
-        for (interval in list) {
-            rawData.put(interval.start(), interval)
-        }
-        merge()
-    }
-
-    @Synchronized fun add(interval: T) {
-        rawData.put(interval.start(), interval)
-        merge()
-    }
-
-    @get:Synchronized val list: List<T>
-        get() {
-            val list: MutableList<T> = ArrayList()
-            for (i in 0 until rawData.size()) list.add(rawData.valueAt(i))
-            return list
-        }
-    @get:Synchronized val reversedList: List<T>
-        get() {
-            val list: MutableList<T> = ArrayList()
-            for (i in rawData.size() - 1 downTo 0) list.add(rawData.valueAt(i))
-            return list
-        }
-
-    @Synchronized protected fun binarySearch(value: Long): Int {
-        var lo = 0
-        var hi = rawData.size() - 1
-        while (lo <= hi) {
-            val mid = lo + hi ushr 1
-            val midVal: Interval = rawData.valueAt(mid)
-            when {
-                midVal.before(value) -> lo = mid + 1
-                midVal.after(value)  -> hi = mid - 1
-                midVal.match(value)  -> return mid // value found
-            }
-        }
-        return lo.inv() // value not present
-    }
-
-    abstract fun getValueByInterval(time: Long): T?
-
-    @Synchronized fun size(): Int = rawData.size()
-
-    @Synchronized operator fun get(index: Int): T? = rawData.valueAt(index)
-
-    @Synchronized fun getReversed(index: Int): T = rawData.valueAt(size() - 1 - index)
-}
\ No newline at end of file
diff --git a/core/src/main/java/info/nightscout/androidaps/data/NonOverlappingIntervals.kt b/core/src/main/java/info/nightscout/androidaps/data/NonOverlappingIntervals.kt
deleted file mode 100644
index 9c8b642baf..0000000000
--- a/core/src/main/java/info/nightscout/androidaps/data/NonOverlappingIntervals.kt
+++ /dev/null
@@ -1,26 +0,0 @@
-package info.nightscout.androidaps.data
-
-import info.nightscout.androidaps.interfaces.Interval
-
-class NonOverlappingIntervals<T : Interval> : Intervals<T> {
-
-    constructor() : super()
-    constructor(other: Intervals<T>) {
-        rawData = other.rawData.clone()
-    }
-
-    @Synchronized public override fun merge() {
-        for (index in 0 until rawData.size() - 1) {
-            val i: T = rawData.valueAt(index)
-            val startOfNewer = rawData.valueAt(index + 1).start()
-            if (i.originalEnd() > startOfNewer) {
-                i.cutEndTo(startOfNewer)
-            }
-        }
-    }
-
-    @Synchronized override fun getValueByInterval(time: Long): T? {
-        val index = binarySearch(time)
-        return if (index >= 0) rawData.valueAt(index) else null
-    }
-}
\ No newline at end of file
diff --git a/core/src/main/java/info/nightscout/androidaps/data/OverlappingIntervals.kt b/core/src/main/java/info/nightscout/androidaps/data/OverlappingIntervals.kt
deleted file mode 100644
index ad6d189b3b..0000000000
--- a/core/src/main/java/info/nightscout/androidaps/data/OverlappingIntervals.kt
+++ /dev/null
@@ -1,38 +0,0 @@
-package info.nightscout.androidaps.data
-
-import info.nightscout.androidaps.interfaces.Interval
-
-class OverlappingIntervals<T : Interval> : Intervals<T> {
-
-    constructor() : super()
-    constructor(other: Intervals<T>) {
-        rawData = other.rawData.clone()
-    }
-
-    @Synchronized override fun merge() {
-        var needToCut = false
-        var cutTime: Long = 0
-        for (index in rawData.size() - 1 downTo 0) { //begin with newest
-            val cur: Interval = rawData.valueAt(index)
-            if (cur.isEndingEvent) {
-                needToCut = true
-                cutTime = cur.start()
-            } else {
-                //event that is no EndingEvent might need to be stopped by an ending event
-                if (needToCut && cur.end() > cutTime) {
-                    cur.cutEndTo(cutTime)
-                }
-            }
-        }
-    }
-
-    @Synchronized override fun getValueByInterval(time: Long): T? {
-        for (index in rawData.size() - 1 downTo 0) { //begin with newest
-            val cur = rawData.valueAt(index)
-            if (cur!!.match(time)) {
-                return cur
-            }
-        }
-        return null
-    }
-}
\ No newline at end of file
diff --git a/core/src/main/java/info/nightscout/androidaps/data/ProfileIntervals.kt b/core/src/main/java/info/nightscout/androidaps/data/ProfileIntervals.kt
deleted file mode 100644
index 1f7097b59b..0000000000
--- a/core/src/main/java/info/nightscout/androidaps/data/ProfileIntervals.kt
+++ /dev/null
@@ -1,115 +0,0 @@
-package info.nightscout.androidaps.data
-
-import androidx.collection.LongSparseArray
-import info.nightscout.androidaps.interfaces.Interval
-import java.util.*
-
-// Zero duration means profile is valid until is changed
-// When no interval match the latest record without duration is used
-class ProfileIntervals<T : Interval> {
-
-    private var rawData: LongSparseArray<T> // oldest at index 0
-
-    constructor() {
-        rawData = LongSparseArray()
-    }
-
-    constructor(other: ProfileIntervals<T>) {
-        rawData = other.rawData.clone()
-    }
-
-    @Synchronized fun reset(): ProfileIntervals<T> {
-        rawData = LongSparseArray()
-        return this
-    }
-
-    @Synchronized fun add(newInterval: T) {
-        if (newInterval.isValid) {
-            rawData.put(newInterval.start(), newInterval)
-            merge()
-        }
-    }
-
-    @Synchronized fun add(list: List<T>) {
-        for (interval in list) {
-            if (interval.isValid) rawData.put(interval.start(), interval)
-        }
-        merge()
-    }
-
-    @Synchronized private fun merge() {
-        for (index in 0 until rawData.size() - 1) {
-            val i: T = rawData.valueAt(index)
-            val startOfNewer = rawData.valueAt(index + 1)!!.start()
-            if (i.originalEnd() > startOfNewer) {
-                i.cutEndTo(startOfNewer)
-            }
-        }
-    }
-
-    @Synchronized fun getValueToTime(time: Long): Interval? {
-        var index = binarySearch(time)
-        if (index >= 0) return rawData.valueAt(index)
-        // if we request data older than first record, use oldest with zero duration instead
-        index = 0
-        while (index < rawData.size()) {
-            if (rawData.valueAt(index)!!.durationInMsec() == 0L) {
-                //log.debug("Requested profile for time: " + DateUtil.dateAndTimeString(time) + ". Providing oldest record: " + rawData.valueAt(0).toString());
-                return rawData.valueAt(index)
-            }
-            index++
-        }
-        return null
-    }
-
-    @get:Synchronized val list: List<T>
-        get() {
-            val list: MutableList<T> = ArrayList()
-            for (i in 0 until rawData.size()) list.add(rawData.valueAt(i))
-            return list
-        }
-    @get:Synchronized val reversedList: List<T>
-        get() {
-            val list: MutableList<T> = ArrayList()
-            for (i in rawData.size() - 1 downTo 0) list.add(rawData.valueAt(i))
-            return list
-        }
-
-    @Synchronized private fun binarySearch(value: Long): Int {
-        if (rawData.size() == 0) return -1
-        var lo = 0
-        var hi = rawData.size() - 1
-        while (lo <= hi) {
-            val mid = lo + hi ushr 1
-            val midVal: Interval = rawData.valueAt(mid)
-            when {
-                midVal.match(value)  -> return mid // value found
-                midVal.before(value) -> lo = mid + 1
-                midVal.after(value)  -> hi = mid - 1
-            }
-        }
-        // not found, try nearest older with duration 0
-        lo -= 1
-        while (lo >= 0 && lo < rawData.size()) {
-            if (rawData.valueAt(lo)!!.isEndingEvent) return lo
-            lo--
-        }
-        return -1 // value not present
-    }
-
-    @Synchronized fun size(): Int {
-        return rawData.size()
-    }
-
-    @Synchronized operator fun get(index: Int): T? {
-        return rawData.valueAt(index)
-    }
-
-    @Synchronized fun getReversed(index: Int): T {
-        return rawData.valueAt(size() - 1 - index)
-    }
-
-    override fun toString(): String {
-        return rawData.toString()
-    }
-}
\ No newline at end of file
diff --git a/core/src/main/java/info/nightscout/androidaps/data/ProfileSealed.kt b/core/src/main/java/info/nightscout/androidaps/data/ProfileSealed.kt
index 8a30319b67..1dbba939d6 100644
--- a/core/src/main/java/info/nightscout/androidaps/data/ProfileSealed.kt
+++ b/core/src/main/java/info/nightscout/androidaps/data/ProfileSealed.kt
@@ -15,11 +15,12 @@ import info.nightscout.androidaps.interfaces.Profile.Companion.secondsFromMidnig
 import info.nightscout.androidaps.interfaces.Profile.Companion.toMgdl
 import info.nightscout.androidaps.interfaces.Profile.ProfileValue
 import info.nightscout.androidaps.interfaces.Pump
-import info.nightscout.androidaps.interfaces.PumpDescription
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification
 import info.nightscout.androidaps.plugins.general.overview.notifications.Notification
 import info.nightscout.androidaps.utils.DateUtil
+import info.nightscout.androidaps.utils.HardLimits
+import info.nightscout.androidaps.utils.Round
 import info.nightscout.androidaps.utils.T
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import org.json.JSONArray
@@ -95,34 +96,93 @@ sealed class ProfileSealed(
         value.timeZone.rawOffset.toLong()
     )
 
-    override fun isValid(from: String, pump: Pump, config: Config, resourceHelper: ResourceHelper, rxBus: RxBusWrapper): Boolean {
+    override fun isValid(from: String, pump: Pump, config: Config, resourceHelper: ResourceHelper, rxBus: RxBusWrapper, hardLimits: HardLimits): Profile.ValidityCheck {
         val notify = true
-        var valid = true
+        val validityCheck = Profile.ValidityCheck()
         val description = pump.pumpDescription
-        if (!description.is30minBasalRatesCapable) {
-            for (basal in basalBlocks) {
+        for (basal in basalBlocks) {
+            val basalAmount = basal.amount * percentage / 100.0
+            if (!description.is30minBasalRatesCapable) {
                 // Check for hours alignment
                 val duration: Long = basal.duration
                 if (duration % 3600000 != 0L) {
                     if (notify && config.APS) {
-                        val notification = Notification(Notification.BASAL_PROFILE_NOT_ALIGNED_TO_HOURS, resourceHelper.gs(R.string.basalprofilenotaligned, from), Notification.NORMAL)
+                        val notification = Notification(
+                            Notification.BASAL_PROFILE_NOT_ALIGNED_TO_HOURS,
+                            resourceHelper.gs(R.string.basalprofilenotaligned, from),
+                            Notification.NORMAL
+                        )
                         rxBus.send(EventNewNotification(notification))
                     }
-                    valid = false
-                }
-                // Check for minimal basal value
-                if (basal.amount < description.basalMinimumRate) {
-                    basal.amount = description.basalMinimumRate
-                    if (notify) sendBelowMinimumNotification(from, rxBus, resourceHelper)
-                    valid = false
-                } else if (basal.amount > description.basalMaximumRate) {
-                    basal.amount = description.basalMaximumRate
-                    if (notify) sendAboveMaximumNotification(from, rxBus, resourceHelper)
-                    valid = false
+                    validityCheck.isValid = false
+                    validityCheck.reasons.add(
+                        resourceHelper.gs(
+                            R.string.basalprofilenotaligned,
+                            from
+                        )
+                    )
+                    break
                 }
             }
+            // Check for minimal basal value
+            if (basalAmount < description.basalMinimumRate) {
+                basal.amount = description.basalMinimumRate
+                if (notify) sendBelowMinimumNotification(from, rxBus, resourceHelper)
+                validityCheck.isValid = false
+                validityCheck.reasons.add(resourceHelper.gs(R.string.minimalbasalvaluereplaced, from))
+                break
+            } else if (basalAmount > description.basalMaximumRate) {
+                basal.amount = description.basalMaximumRate
+                if (notify) sendAboveMaximumNotification(from, rxBus, resourceHelper)
+                validityCheck.isValid = false
+                validityCheck.reasons.add(resourceHelper.gs(R.string.maximumbasalvaluereplaced, from))
+                break
+            }
+            if (!hardLimits.isInRange(basalAmount, 0.01, hardLimits.maxBasal())) {
+                validityCheck.isValid = false
+                validityCheck.reasons.add(resourceHelper.gs(R.string.value_out_of_hard_limits, resourceHelper.gs(R.string.basal_value), basalAmount))
+                break
+            }
         }
-        return valid
+        if (!hardLimits.isInRange(dia, hardLimits.minDia(), hardLimits.maxDia())) {
+            validityCheck.isValid = false
+            validityCheck.reasons.add(resourceHelper.gs(R.string.value_out_of_hard_limits, resourceHelper.gs(R.string.profile_dia), dia))
+        }
+        for (ic in icBlocks)
+            if (!hardLimits.isInRange(ic.amount * 100.0 / percentage, hardLimits.minIC(), hardLimits.maxIC())) {
+                validityCheck.isValid = false
+                validityCheck.reasons.add(resourceHelper.gs(R.string.value_out_of_hard_limits, resourceHelper.gs(R.string.profile_carbs_ratio_value), ic.amount * 100.0 / percentage))
+                break
+            }
+        for (isf in isfBlocks)
+            if (!hardLimits.isInRange(toMgdl(isf.amount * 100.0 / percentage, units), HardLimits.MIN_ISF, HardLimits.MAX_ISF)) {
+                validityCheck.isValid = false
+                validityCheck.reasons.add(resourceHelper.gs(R.string.value_out_of_hard_limits, resourceHelper.gs(R.string.profile_sensitivity_value), isf.amount * 100.0 / percentage))
+                break
+            }
+        for (target in targetBlocks) {
+            if (!hardLimits.isInRange(
+                    Profile.toMgdl(target.lowTarget, units),
+                    HardLimits.VERY_HARD_LIMIT_MIN_BG[0].toDouble(),
+                    HardLimits.VERY_HARD_LIMIT_MIN_BG[1].toDouble()
+                )
+            ) {
+                validityCheck.isValid = false
+                validityCheck.reasons.add(resourceHelper.gs(R.string.value_out_of_hard_limits, resourceHelper.gs(R.string.profile_low_target), target.lowTarget))
+                break
+            }
+            if (!hardLimits.isInRange(
+                    Profile.toMgdl(target.highTarget, units),
+                    HardLimits.VERY_HARD_LIMIT_MAX_BG[0].toDouble(),
+                    HardLimits.VERY_HARD_LIMIT_MAX_BG[1].toDouble()
+                )
+            ) {
+                validityCheck.isValid = false
+                validityCheck.reasons.add(resourceHelper.gs(R.string.value_out_of_hard_limits, resourceHelper.gs(R.string.profile_high_target), target.highTarget))
+                break
+            }
+        }
+        return validityCheck
     }
 
     protected open fun sendBelowMinimumNotification(from: String, rxBus: RxBusWrapper, resourceHelper: ResourceHelper) {
@@ -153,6 +213,7 @@ sealed class ProfileSealed(
             if (getIcTimeFromMidnight(seconds) !=  profile.getIcTimeFromMidnight(seconds)) return false
             if (getTargetLowMgdlTimeFromMidnight(seconds) !=  profile.getTargetLowMgdlTimeFromMidnight(seconds)) return false
             if (getTargetHighMgdlTimeFromMidnight(seconds) !=  profile.getTargetHighMgdlTimeFromMidnight(seconds)) return false
+            if (dia != profile.dia) return false
         }
         return true
     }
diff --git a/core/src/main/java/info/nightscout/androidaps/db/DbObjectBase.kt b/core/src/main/java/info/nightscout/androidaps/db/DbObjectBase.kt
deleted file mode 100644
index 76228abe9b..0000000000
--- a/core/src/main/java/info/nightscout/androidaps/db/DbObjectBase.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package info.nightscout.androidaps.db
-
-interface DbObjectBase {
-
-    val date: Long
-    val pumpId: Long
-}
\ No newline at end of file
diff --git a/core/src/main/java/info/nightscout/androidaps/db/ExtendedBolus.java b/core/src/main/java/info/nightscout/androidaps/db/ExtendedBolus.java
deleted file mode 100644
index f00a49dbe6..0000000000
--- a/core/src/main/java/info/nightscout/androidaps/db/ExtendedBolus.java
+++ /dev/null
@@ -1,306 +0,0 @@
-package info.nightscout.androidaps.db;
-
-/**
- * Created by mike on 21.05.2017.
- */
-
-import android.graphics.Color;
-
-import com.j256.ormlite.field.DatabaseField;
-import com.j256.ormlite.table.DatabaseTable;
-
-import org.json.JSONObject;
-
-import java.util.Objects;
-
-import javax.inject.Inject;
-
-import dagger.android.HasAndroidInjector;
-import info.nightscout.androidaps.Constants;
-import info.nightscout.androidaps.interfaces.ActivePlugin;
-import info.nightscout.androidaps.interfaces.Insulin;
-import info.nightscout.androidaps.interfaces.Interval;
-import info.nightscout.androidaps.plugins.general.overview.graphExtensions.DataPointWithLabelInterface;
-import info.nightscout.androidaps.plugins.general.overview.graphExtensions.PointsWithLabelGraphSeries;
-import info.nightscout.androidaps.utils.DateUtil;
-import info.nightscout.androidaps.utils.DecimalFormatter;
-import info.nightscout.androidaps.utils.JsonHelper;
-import info.nightscout.androidaps.utils.Round;
-
-/**
- * Created by mike on 21.05.2017.
- */
-
-@Deprecated
-@DatabaseTable(tableName = "ExtendedBoluses")
-public class ExtendedBolus implements Interval, DataPointWithLabelInterface {
-
-    @Inject ActivePlugin activePlugin;
-    @Inject DateUtil dateUtil;
-
-    private HasAndroidInjector injector;
-
-    @DatabaseField(id = true)
-    public long date;
-
-    @DatabaseField
-    public boolean isValid = true;
-
-    @DatabaseField(index = true)
-    public long pumpId = 0;
-
-    @DatabaseField
-    public int source = Source.NONE;
-    @DatabaseField
-    public String _id = null; // NS _id
-
-    @DatabaseField
-    public double insulin = 0d;
-    @DatabaseField
-    public int durationInMinutes = 0; // duration == 0 means end of extended bolus
-
-    @DatabaseField
-    public int insulinInterfaceID = Insulin.InsulinType.OREF_RAPID_ACTING.getValue();
-
-    @DatabaseField
-    public double dia = Constants.defaultDIA;
-
-    @Deprecated
-    public ExtendedBolus() {
-        injector = StaticInjector.Companion.getInstance();
-        injector.androidInjector().inject(this);
-    }
-
-    public ExtendedBolus(HasAndroidInjector injector) {
-        this.injector = injector;
-        injector.androidInjector().inject(this);
-    }
-
-    public ExtendedBolus(HasAndroidInjector injector, long date) {
-        this(injector);
-        this.date = date;
-    }
-
-    public ExtendedBolus date(long date) {
-        this.date = date;
-        return this;
-    }
-
-    public ExtendedBolus insulin(double insulin) {
-        this.insulin = insulin;
-        return this;
-    }
-
-    public ExtendedBolus pumpId(long pumpId) {
-        this.pumpId = pumpId;
-        return this;
-    }
-
-    public ExtendedBolus source(int source) {
-        this.source = source;
-        return this;
-    }
-
-    public ExtendedBolus durationInMinutes(int durationInMinutes) {
-        this.durationInMinutes = durationInMinutes;
-        return this;
-    }
-
-    public ExtendedBolus _id(String _id) {
-        this._id = _id;
-        return this;
-    }
-
-    public boolean isEqual(ExtendedBolus other) {
-        if (date != other.date) {
-            return false;
-        }
-        if (durationInMinutes != other.durationInMinutes)
-            return false;
-        if (insulin != other.insulin)
-            return false;
-        if (pumpId != other.pumpId)
-            return false;
-        if (!Objects.equals(_id, other._id))
-            return false;
-        return true;
-    }
-
-    public void copyFrom(ExtendedBolus t) {
-        date = t.date;
-        _id = t._id;
-        durationInMinutes = t.durationInMinutes;
-        insulin = t.insulin;
-        pumpId = t.pumpId;
-    }
-
-    public static ExtendedBolus createFromJson(HasAndroidInjector injector, JSONObject json) {
-        ExtendedBolus extendedBolus = new ExtendedBolus(injector)
-                .source(Source.NIGHTSCOUT)
-                .date(JsonHelper.safeGetLong(json, "mills"))
-                .durationInMinutes(JsonHelper.safeGetInt(json, "duration"))
-                .insulin(JsonHelper.safeGetDouble(json, "relative") / 60 * JsonHelper.safeGetInt(json, "duration"))
-                ._id(JsonHelper.safeGetString(json, "_id"))
-                .pumpId(JsonHelper.safeGetLong(json, "pumpId"));
-        return extendedBolus;
-    }
-    // -------- Interval interface ---------
-
-    Long cuttedEnd = null;
-
-    public long durationInMsec() {
-        return durationInMinutes * 60 * 1000L;
-    }
-
-    public long start() {
-        return date;
-    }
-
-    // planned end time at time of creation
-    public long originalEnd() {
-        return date + durationInMinutes * 60 * 1000L;
-    }
-
-    // end time after cut
-    public long end() {
-        if (cuttedEnd != null)
-            return cuttedEnd;
-        return originalEnd();
-    }
-
-    public void cutEndTo(long end) {
-        cuttedEnd = end;
-    }
-
-    public boolean match(long time) {
-        if (start() <= time && end() >= time)
-            return true;
-        return false;
-    }
-
-    public boolean before(long time) {
-        if (end() < time)
-            return true;
-        return false;
-    }
-
-    public boolean after(long time) {
-        if (start() > time)
-            return true;
-        return false;
-    }
-
-    @Override
-    public boolean isInProgress() {
-        return match(System.currentTimeMillis());
-    }
-
-    @Override
-    public boolean isEndingEvent() {
-        return durationInMinutes == 0;
-    }
-
-    @Override
-    public boolean isValid() {
-        return true;
-    }
-
-    // -------- Interval interface end ---------
-
-    public String log() {
-        return "ExtendedBolus{" +
-                "date= " + date +
-                ", date= " + dateUtil.dateAndTimeString(date) +
-                ", isValid=" + isValid +
-                ", _id= " + _id +
-                ", pumpId= " + pumpId +
-                ", insulin= " + insulin +
-                ", durationInMinutes= " + durationInMinutes +
-                "}";
-    }
-
-    public double absoluteRate() {
-        return Round.roundTo(insulin / durationInMinutes * 60, 0.01);
-    }
-
-    public double insulinSoFar() {
-        return absoluteRate() * getRealDuration() / 60d;
-    }
-
-    public int getRealDuration() {
-        return getDurationToTime(System.currentTimeMillis());
-    }
-
-    private int getDurationToTime(long time) {
-        long endTime = Math.min(time, end());
-        long msecs = endTime - date;
-        return Math.round(msecs / 60f / 1000);
-    }
-
-    public int getPlannedRemainingMinutes() {
-        float remainingMin = (end() - System.currentTimeMillis()) / 1000f / 60;
-        return (remainingMin < 0) ? 0 : Math.round(remainingMin);
-    }
-
-    public String toString() {
-        return "E " + DecimalFormatter.INSTANCE.to2Decimal(absoluteRate()) + "U/h @" +
-                dateUtil.timeString(date) +
-                " " + getRealDuration() + "/" + durationInMinutes + "min";
-    }
-
-    public String toStringMedium() {
-        return DecimalFormatter.INSTANCE.to2Decimal(absoluteRate()) + "U/h "
-                + getRealDuration() + "/" + durationInMinutes + "'";
-    }
-
-    public String toStringTotal() {
-        return DecimalFormatter.INSTANCE.to2Decimal(insulin) + "U ( " +
-                DecimalFormatter.INSTANCE.to2Decimal(absoluteRate()) + " U/h )";
-    }
-
-    // -------- DataPointWithLabelInterface --------
-    @Override
-    public double getX() {
-        return date;
-    }
-
-    // default when no sgv around available
-    private double yValue = 0;
-
-
-    @Override
-    public double getY() {
-        return yValue;
-    }
-
-    @Override
-    public void setY(double y) {
-        yValue = y;
-    }
-
-    @Override
-    public String getLabel() {
-        return toStringTotal();
-    }
-
-    @Override
-    public long getDuration() {
-        return durationInMinutes * 60 * 1000L;
-    }
-
-    @Override
-    public PointsWithLabelGraphSeries.Shape getShape() {
-        return PointsWithLabelGraphSeries.Shape.EXTENDEDBOLUS;
-    }
-
-    @Override
-    public float getSize() {
-        return 10;
-    }
-
-    @Override
-    public int getColor() {
-        return Color.CYAN;
-    }
-
-}
diff --git a/core/src/main/java/info/nightscout/androidaps/db/ICallback.java b/core/src/main/java/info/nightscout/androidaps/db/ICallback.java
deleted file mode 100644
index 7a9360035f..0000000000
--- a/core/src/main/java/info/nightscout/androidaps/db/ICallback.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package info.nightscout.androidaps.db;
-
-import java.util.concurrent.ScheduledFuture;
-
-/**
- * Created by triplem on 05.01.18.
- */
-
-public interface ICallback {
-
-    void setPost(ScheduledFuture<?> post);
-
-    ScheduledFuture<?> getPost();
-
-}
diff --git a/core/src/main/java/info/nightscout/androidaps/db/InsightBolusID.java b/core/src/main/java/info/nightscout/androidaps/db/InsightBolusID.java
deleted file mode 100644
index b860fa5b03..0000000000
--- a/core/src/main/java/info/nightscout/androidaps/db/InsightBolusID.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package info.nightscout.androidaps.db;
-
-import com.j256.ormlite.field.DatabaseField;
-import com.j256.ormlite.table.DatabaseTable;
-
-@DatabaseTable(tableName = "InsightBolusIDs")
-public class InsightBolusID {
-
-    @DatabaseField(generatedId = true)
-    public Long id;
-
-    @DatabaseField
-    public String pumpSerial;
-
-    @DatabaseField
-    public Long timestamp;
-
-    @DatabaseField
-    public Integer bolusID;
-
-    @DatabaseField
-    public Long startID;
-
-    @DatabaseField
-    public Long endID;
-
-}
diff --git a/core/src/main/java/info/nightscout/androidaps/db/InsightHistoryOffset.java b/core/src/main/java/info/nightscout/androidaps/db/InsightHistoryOffset.java
deleted file mode 100644
index 6be8140f05..0000000000
--- a/core/src/main/java/info/nightscout/androidaps/db/InsightHistoryOffset.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package info.nightscout.androidaps.db;
-
-import com.j256.ormlite.field.DatabaseField;
-import com.j256.ormlite.table.DatabaseTable;
-
-@DatabaseTable(tableName = "InsightHistoryOffsets")
-public class InsightHistoryOffset {
-
-    @DatabaseField(id = true, canBeNull = false)
-    public String pumpSerial;
-
-    @DatabaseField
-    public long offset;
-}
diff --git a/core/src/main/java/info/nightscout/androidaps/db/InsightPumpID.java b/core/src/main/java/info/nightscout/androidaps/db/InsightPumpID.java
deleted file mode 100644
index 2e2bf05253..0000000000
--- a/core/src/main/java/info/nightscout/androidaps/db/InsightPumpID.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package info.nightscout.androidaps.db;
-
-import com.j256.ormlite.field.DatabaseField;
-import com.j256.ormlite.table.DatabaseTable;
-
-@DatabaseTable(tableName = "InsightPumpIDs")
-public class InsightPumpID {
-
-    @DatabaseField(generatedId = true)
-    public Long id;
-
-    @DatabaseField
-    public long timestamp;
-
-    @DatabaseField
-    public String eventType;
-
-    @DatabaseField
-    public String pumpSerial;
-
-    @DatabaseField
-    public long eventID;
-
-}
diff --git a/core/src/main/java/info/nightscout/androidaps/db/OHQueueItem.kt b/core/src/main/java/info/nightscout/androidaps/db/OHQueueItem.kt
deleted file mode 100644
index 5876076cbf..0000000000
--- a/core/src/main/java/info/nightscout/androidaps/db/OHQueueItem.kt
+++ /dev/null
@@ -1,14 +0,0 @@
-package info.nightscout.androidaps.db
-
-import com.j256.ormlite.field.DatabaseField
-import com.j256.ormlite.table.DatabaseTable
-
-@DatabaseTable(tableName = "OpenHumansQueue")
-data class OHQueueItem @JvmOverloads constructor(
-    @DatabaseField(generatedId = true)
-    val id: Long = 0,
-    @DatabaseField
-    val file: String = "",
-    @DatabaseField
-    val content: String = ""
-)
\ No newline at end of file
diff --git a/core/src/main/java/info/nightscout/androidaps/db/Source.java b/core/src/main/java/info/nightscout/androidaps/db/Source.java
deleted file mode 100644
index c126794769..0000000000
--- a/core/src/main/java/info/nightscout/androidaps/db/Source.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package info.nightscout.androidaps.db;
-
-/**
- * Created by mike on 21.05.2017.
- */
-
-public class Source {
-    public final static int NONE = 0;
-    public final static int PUMP = 1;       // Pump history
-    public final static int NIGHTSCOUT = 2; // created in NS
-    public final static int USER = 3;       // created by user or driver not using history
-
-    public static String getString(int source) {
-        switch (source) {
-            case PUMP:
-                return "PUMP";
-            case NIGHTSCOUT:
-                return "NIGHTSCOUT";
-            case USER:
-                return "USER";
-        }
-        return "NONE";
-    }
-}
diff --git a/core/src/main/java/info/nightscout/androidaps/db/TemporaryBasal.java b/core/src/main/java/info/nightscout/androidaps/db/TemporaryBasal.java
deleted file mode 100644
index 48390e16ef..0000000000
--- a/core/src/main/java/info/nightscout/androidaps/db/TemporaryBasal.java
+++ /dev/null
@@ -1,372 +0,0 @@
-package info.nightscout.androidaps.db;
-
-import com.j256.ormlite.field.DatabaseField;
-import com.j256.ormlite.table.DatabaseTable;
-
-import java.util.Objects;
-
-import javax.inject.Inject;
-
-import dagger.android.HasAndroidInjector;
-import info.nightscout.androidaps.interfaces.ActivePlugin;
-import info.nightscout.androidaps.interfaces.Interval;
-import info.nightscout.androidaps.interfaces.Profile;
-import info.nightscout.androidaps.interfaces.ProfileFunction;
-import info.nightscout.androidaps.logging.AAPSLogger;
-import info.nightscout.androidaps.utils.DateUtil;
-import info.nightscout.androidaps.utils.DecimalFormatter;
-import info.nightscout.androidaps.utils.sharedPreferences.SP;
-
-/**
- * Created by mike on 21.05.2017.
- */
-
-@Deprecated
-@DatabaseTable(tableName = "TemporaryBasals")
-public class TemporaryBasal implements Interval, DbObjectBase {
-
-    @Inject public AAPSLogger aapsLogger;
-    @Inject public ProfileFunction profileFunction;
-    @Inject public ActivePlugin activePlugin;
-    @Inject public SP sp;
-    @Inject public DateUtil dateUtil;
-
-    private HasAndroidInjector injector;
-
-    @DatabaseField(id = true)
-    public long date;
-
-    @DatabaseField
-    public boolean isValid = true;
-
-    @DatabaseField(index = true)
-    public long pumpId = 0;
-
-    @DatabaseField
-    public int source = Source.NONE;
-    @DatabaseField
-    public String _id = null; // NS _id
-
-    @DatabaseField
-    public int durationInMinutes = 0; // duration == 0 means end of temp basal
-    @DatabaseField
-    public boolean isAbsolute = false;
-
-    public boolean isFakeExtended = false;
-
-    @DatabaseField
-    public int percentRate = 0;
-    @DatabaseField
-    public double absoluteRate = 0d;
-
-    public double netExtendedRate = 0d;
-
-    @Deprecated
-    public TemporaryBasal() {
-        injector = StaticInjector.Companion.getInstance();
-        injector.androidInjector().inject(this);
-    }
-
-    public TemporaryBasal(HasAndroidInjector injector) {
-        this.injector = injector;
-        injector.androidInjector().inject(this);
-    }
-
-    public TemporaryBasal date(long date) {
-        this.date = date;
-        return this;
-    }
-
-    public TemporaryBasal duration(int durationInMinutes) {
-        this.durationInMinutes = durationInMinutes;
-        return this;
-    }
-
-    public TemporaryBasal absolute(double absoluteRate) {
-        this.absoluteRate = absoluteRate;
-        this.isAbsolute = true;
-        return this;
-    }
-
-    public TemporaryBasal percent(int percentRate) {
-        this.percentRate = percentRate;
-        this.isAbsolute = false;
-        return this;
-    }
-
-    public TemporaryBasal source(int source) {
-        this.source = source;
-        return this;
-    }
-
-    public TemporaryBasal pumpId(long pumpId) {
-        this.pumpId = pumpId;
-        return this;
-    }
-
-    public TemporaryBasal(ExtendedBolus extendedBolus) {
-        injector = StaticInjector.Companion.getInstance();
-        injector.androidInjector().inject(this);
-        double basal = profileFunction.getProfile(extendedBolus.date).getBasal(extendedBolus.date);
-        this.date = extendedBolus.date;
-        this.isValid = extendedBolus.isValid;
-        this.source = extendedBolus.source;
-        this._id = extendedBolus._id;
-        this.durationInMinutes = extendedBolus.durationInMinutes;
-        this.isAbsolute = true;
-        this.isFakeExtended = true;
-        this.netExtendedRate = extendedBolus.absoluteRate();
-        this.absoluteRate = basal + extendedBolus.absoluteRate();
-        this.pumpId = extendedBolus.pumpId;
-    }
-
-    public TemporaryBasal clone() {
-        TemporaryBasal t = new TemporaryBasal(injector);
-        t.date = date;
-        t.isValid = isValid;
-        t.source = source;
-        t._id = _id;
-        t.pumpId = pumpId;
-        t.durationInMinutes = durationInMinutes;
-        t.isAbsolute = isAbsolute;
-        t.percentRate = percentRate;
-        t.absoluteRate = absoluteRate;
-        return t;
-    }
-
-    public boolean isEqual(TemporaryBasal other) {
-        if (date != other.date) {
-            return false;
-        }
-        if (durationInMinutes != other.durationInMinutes)
-            return false;
-        if (isAbsolute != other.isAbsolute)
-            return false;
-        if (percentRate != other.percentRate)
-            return false;
-        if (absoluteRate != other.absoluteRate)
-            return false;
-        if (netExtendedRate != other.netExtendedRate)
-            return false;
-        if (isFakeExtended != other.isFakeExtended)
-            return false;
-        if (pumpId != other.pumpId)
-            return false;
-        if (!Objects.equals(_id, other._id))
-            return false;
-        return true;
-    }
-
-    public void copyFrom(TemporaryBasal t) {
-        date = t.date;
-        _id = t._id;
-        durationInMinutes = t.durationInMinutes;
-        isAbsolute = t.isAbsolute;
-        percentRate = t.percentRate;
-        absoluteRate = t.absoluteRate;
-        pumpId = t.pumpId;
-        isFakeExtended = t.isFakeExtended;
-        netExtendedRate = t.netExtendedRate;
-    }
-
-    public void copyFromPump(TemporaryBasal t) {
-        durationInMinutes = t.durationInMinutes;
-        isAbsolute = t.isAbsolute;
-        percentRate = t.percentRate;
-        absoluteRate = t.absoluteRate;
-        pumpId = t.pumpId;
-    }
-
-    // -------- Interval interface ---------
-
-    Long cuttedEnd = null;
-
-    public long durationInMsec() {
-        return durationInMinutes * 60 * 1000L;
-    }
-
-    public long start() {
-        return date;
-    }
-
-    // planned end time at time of creation
-    public long originalEnd() {
-        return date + durationInMinutes * 60 * 1000L;
-    }
-
-    // end time after cut
-    public long end() {
-        if (cuttedEnd != null)
-            return cuttedEnd;
-        return originalEnd();
-    }
-
-    public void cutEndTo(long end) {
-        cuttedEnd = end;
-    }
-
-    public boolean match(long time) {
-        if (start() <= time && end() >= time)
-            return true;
-        return false;
-    }
-
-    public boolean before(long time) {
-        if (end() < time)
-            return true;
-        return false;
-    }
-
-    public boolean after(long time) {
-        if (start() > time)
-            return true;
-        return false;
-    }
-
-    @Override
-    public boolean isInProgress() {
-        return match(System.currentTimeMillis());
-    }
-
-    @Override
-    public boolean isEndingEvent() {
-        return durationInMinutes == 0;
-    }
-
-    @Override
-    public boolean isValid() {
-        return true;
-    }
-
-    // -------- Interval interface end ---------
-
-    public int getRealDuration() {
-        return getDurationToTime(System.currentTimeMillis());
-    }
-
-    private int getDurationToTime(long time) {
-        long endTime = Math.min(time, end());
-        long msecs = endTime - date;
-        return Math.round(msecs / 60f / 1000);
-    }
-
-    public int getPlannedRemainingMinutes() {
-        float remainingMin = (end() - System.currentTimeMillis()) / 1000f / 60;
-        return (remainingMin < 0) ? 0 : Math.round(remainingMin);
-    }
-
-    public int getPlannedRemainingMinutesRoundedUp() {
-        float remainingMin = (end() - System.currentTimeMillis()) / 1000f / 60;
-        return (remainingMin < 0) ? 0 : (int) Math.ceil(remainingMin);
-    }
-
-
-    public double tempBasalConvertedToAbsolute(long time, Profile profile) {
-        if (isFakeExtended) {
-            return profile.getBasal(time) + netExtendedRate;
-        } else if (isAbsolute) {
-            return absoluteRate;
-        } else {
-            return profile.getBasal(time) * percentRate / 100;
-        }
-    }
-
-    public int tempBasalConvertedToPercent(long time, Profile profile) {
-        if (isFakeExtended) {
-            return (int) ((profile.getBasal(time) + netExtendedRate) / profile.getBasal(time)) * 100;
-        } else if (isAbsolute) {
-            return (int) (absoluteRate / profile.getBasal(time) * 100);
-        } else {
-            return percentRate;
-        }
-    }
-
-    public String toString() {
-        return "TemporaryBasal{" +
-                "date=" + date +
-                ", date=" + dateUtil.dateAndTimeString(date) +
-                ", isValid=" + isValid +
-                ", pumpId=" + pumpId +
-                ", _id=" + _id +
-                ", percentRate=" + percentRate +
-                ", absoluteRate=" + absoluteRate +
-                ", durationInMinutes=" + durationInMinutes +
-                ", isAbsolute=" + isAbsolute +
-                ", isFakeExtended=" + isFakeExtended +
-                ", netExtendedRate=" + netExtendedRate +
-                '}';
-    }
-
-    public String toStringFull() {
-        if (isFakeExtended) {
-
-            Profile profile = profileFunction.getProfile();
-            if (profile == null)
-                return "null";
-            Double currentBasalRate = profile.getBasal();
-            double rate = currentBasalRate + netExtendedRate;
-            return DecimalFormatter.INSTANCE.to2Decimal(rate) + "U/h (" + DecimalFormatter.INSTANCE.to2Decimal(netExtendedRate) + "E) @" +
-                    dateUtil.timeString(date) +
-                    " " + getRealDuration() + "/" + durationInMinutes + "'";
-        } else if (isAbsolute) {
-            return DecimalFormatter.INSTANCE.to2Decimal(absoluteRate) + "U/h @" +
-                    dateUtil.timeString(date) +
-                    " " + getRealDuration() + "/" + durationInMinutes + "'";
-        } else { // percent
-            return percentRate + "% @" +
-                    dateUtil.timeString(date) +
-                    " " + getRealDuration() + "/" + durationInMinutes + "'";
-        }
-    }
-
-    public String toStringShort() {
-        if (isAbsolute || isFakeExtended) {
-
-            double rate;
-            if (isFakeExtended) {
-                Profile profile = profileFunction.getProfile();
-                if (profile == null)
-                    return "null";
-                double currentBasalRate = profile.getBasal();
-                rate = currentBasalRate + netExtendedRate;
-            } else {
-                rate = absoluteRate;
-            }
-
-            return DecimalFormatter.INSTANCE.to2Decimal(rate) + "U/h";
-        } else { // percent
-            return percentRate + "%";
-        }
-    }
-
-    public String toStringVeryShort() {
-        Profile profile = profileFunction.getProfile();
-
-        if (profile == null)
-            return "null";
-
-        if (isAbsolute || isFakeExtended) {
-
-            double rate;
-            if (isFakeExtended) {
-                double currentBasalRate = profile.getBasal();
-                rate = currentBasalRate + netExtendedRate;
-            } else {
-                rate = absoluteRate;
-            }
-            return DecimalFormatter.INSTANCE.to2Decimal(rate) + "U/h";
-        } else { // percent
-            return percentRate + "%";
-        }
-    }
-
-    @Override
-    public long getDate() {
-        return this.date;
-    }
-
-    @Override
-    public long getPumpId() {
-        return this.pumpId;
-    }
-}
diff --git a/core/src/main/java/info/nightscout/androidaps/db/Treatment.java b/core/src/main/java/info/nightscout/androidaps/db/Treatment.java
deleted file mode 100644
index 13a691529b..0000000000
--- a/core/src/main/java/info/nightscout/androidaps/db/Treatment.java
+++ /dev/null
@@ -1,282 +0,0 @@
-package info.nightscout.androidaps.db;
-
-import android.graphics.Color;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-
-import com.j256.ormlite.field.DatabaseField;
-import com.j256.ormlite.table.DatabaseTable;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import java.util.Objects;
-
-import javax.inject.Inject;
-
-import dagger.android.HasAndroidInjector;
-import info.nightscout.androidaps.Constants;
-import info.nightscout.androidaps.core.R;
-import info.nightscout.androidaps.interfaces.Profile;
-import info.nightscout.androidaps.database.entities.Bolus;
-import info.nightscout.androidaps.interfaces.ActivePlugin;
-import info.nightscout.androidaps.interfaces.Insulin;
-import info.nightscout.androidaps.interfaces.ProfileFunction;
-import info.nightscout.androidaps.plugins.general.overview.graphExtensions.DataPointWithLabelInterface;
-import info.nightscout.androidaps.plugins.general.overview.graphExtensions.PointsWithLabelGraphSeries;
-import info.nightscout.androidaps.utils.DateUtil;
-import info.nightscout.androidaps.utils.DecimalFormatter;
-import info.nightscout.androidaps.utils.DefaultValueHelper;
-import info.nightscout.androidaps.utils.JsonHelper;
-import info.nightscout.androidaps.utils.resources.ResourceHelper;
-
-@Deprecated
-@DatabaseTable(tableName = Treatment.TABLE_TREATMENTS)
-public class Treatment implements DataPointWithLabelInterface, DbObjectBase {
-    @Inject public DefaultValueHelper defaultValueHelper;
-    @Inject public ResourceHelper resourceHelper;
-    @Inject public ProfileFunction profileFunction;
-    @Inject public ActivePlugin activePlugin;
-    @Inject public DateUtil dateUtil;
-
-    public static final String TABLE_TREATMENTS = "Treatments";
-
-    @DatabaseField(id = true)
-    public long date;
-
-    @DatabaseField
-    public boolean isValid = true;
-
-    @DatabaseField(index = true)
-    public long pumpId = 0;
-
-    @DatabaseField
-    public int source = Source.NONE;
-    @DatabaseField
-    public String _id;
-
-    @DatabaseField
-    public double insulin = 0d;
-    @DatabaseField
-    public double carbs = 0d;
-    @DatabaseField
-    public boolean mealBolus = true; // true for meal bolus , false for correction bolus
-    @DatabaseField
-    public boolean isSMB = false;
-
-    @DatabaseField
-    public int insulinInterfaceID = Insulin.InsulinType.OREF_RAPID_ACTING.getValue(); // currently unused, will be used in the future
-    @DatabaseField
-    public double dia = Constants.defaultDIA; // currently unused, will be used in the future
-    @DatabaseField
-    public String boluscalc;
-
-    public Treatment() {
-        StaticInjector.Companion.getInstance().androidInjector().inject(this); // TODO it will be removed by new database
-    }
-
-    public Treatment(HasAndroidInjector injector) {
-        injector.androidInjector().inject(this);
-    }
-
-    public Treatment(HasAndroidInjector injector, Bolus bolus) {
-        this(injector);
-        date = bolus.getTimestamp();
-        isValid = bolus.isValid();
-        pumpId = (bolus.getInterfaceIDs().getPumpId() != null) ? bolus.getInterfaceIDs().getPumpId() : 0;
-        source = (bolus.getInterfaceIDs().getPumpId() != null) ? Source.PUMP : Source.USER;
-        _id = bolus.getInterfaceIDs().getNightscoutId();
-        insulin = bolus.getAmount();
-        isSMB = bolus.getType() == Bolus.Type.SMB;
-    }
-
-    @NonNull public String toString() {
-        return "Treatment{" +
-                "date= " + date +
-                ", date= " + dateUtil.dateAndTimeString(date) +
-                ", isValid= " + isValid +
-                ", isSMB= " + isSMB +
-                ", _id= " + _id +
-                ", pumpId= " + pumpId +
-                ", insulin= " + insulin +
-                ", carbs= " + carbs +
-                ", mealBolus= " + mealBolus +
-                ", source= " + source +
-                "}";
-    }
-
-    public boolean isDataChanging(Treatment other) {
-        if (date != other.date)
-            return true;
-        if (!isSame(insulin, other.insulin))
-            return true;
-        if (!isSame(carbs, other.carbs))
-            return true;
-        return false;
-    }
-
-    public boolean isEqual(Treatment other) {
-        if (date != other.date)
-            return false;
-        if (!isSame(insulin, other.insulin))
-            return false;
-        if (!isSame(carbs, other.carbs))
-            return false;
-        if (mealBolus != other.mealBolus)
-            return false;
-        if (pumpId != other.pumpId)
-            return false;
-        if (isSMB != other.isSMB)
-            return false;
-        if (!Objects.equals(_id, other._id))
-            return false;
-        return true;
-    }
-
-    public boolean isEqualWithoutPumpId(Treatment other) {
-        if (date != other.date)
-            return false;
-        if (!isSame(insulin, other.insulin))
-            return false;
-        if (!isSame(carbs, other.carbs))
-            return false;
-        if (mealBolus != other.mealBolus)
-            return false;
-        if (isSMB != other.isSMB)
-            return false;
-        if (!Objects.equals(_id, other._id))
-            return false;
-        return true;
-    }
-
-    public boolean isSame(Double d1, Double d2) {
-        double diff = d1 - d2;
-
-        return (Math.abs(diff) <= 0.000001);
-    }
-
-    @Nullable
-    public JSONObject getBoluscalc() {
-        try {
-            if (boluscalc != null)
-                return new JSONObject(boluscalc);
-        } catch (JSONException ignored) {
-        }
-        return null;
-    }
-
-    public double getIc() {
-        JSONObject bw = getBoluscalc();
-        if (bw == null || !bw.has("ic")) {
-            Profile profile = profileFunction.getProfile(date);
-            return profile.getIc(date);
-        }
-        return JsonHelper.safeGetDouble(bw, "ic");
-    }
-
-    /*
-     * mealBolus, _id and isSMB cannot be known coming from pump. Only compare rest
-     * TODO: remove debug toasts
-     */
-    public boolean equalsRePumpHistory(Treatment other) {
-        if (date != other.date) {
-            return false;
-        }
-
-        if (!isSame(insulin, other.insulin))
-            return false;
-
-        if (!isSame(carbs, other.carbs))
-            return false;
-
-        return true;
-    }
-
-    public void copyFrom(Treatment t) {
-        date = t.date;
-        _id = t._id;
-        insulin = t.insulin;
-        carbs = t.carbs;
-        mealBolus = t.mealBolus;
-        pumpId = t.pumpId;
-        isSMB = t.isSMB;
-    }
-
-    public void copyBasics(Treatment t) {
-        date = t.date;
-        insulin = t.insulin;
-        carbs = t.carbs;
-        pumpId = t.pumpId;
-        source = t.source;
-    }
-
-    //  ----------------- DataPointInterface --------------------
-    @Override
-    public double getX() {
-        return date;
-    }
-
-    // default when no sgv around available
-    private double yValue = 0;
-
-    @Override
-    public double getY() {
-        return isSMB ? defaultValueHelper.determineLowLine() : yValue;
-    }
-
-    @Override
-    public String getLabel() {
-        String label = "";
-        if (insulin > 0)
-            label += DecimalFormatter.INSTANCE.toPumpSupportedBolus(insulin, activePlugin.getActivePump(), resourceHelper);
-        if (carbs > 0)
-            label += "~" + resourceHelper.gs(R.string.format_carbs, (int) carbs);
-        return label;
-    }
-
-    @Override
-    public long getDuration() {
-        return 0;
-    }
-
-    @Override
-    public PointsWithLabelGraphSeries.Shape getShape() {
-        if (isSMB)
-            return PointsWithLabelGraphSeries.Shape.SMB;
-        else
-            return PointsWithLabelGraphSeries.Shape.BOLUS;
-    }
-
-    @Override
-    public float getSize() {
-        return 2;
-    }
-
-    @Override
-    public int getColor() {
-        if (isSMB)
-            return resourceHelper.gc(R.color.tempbasal);
-        else if (isValid)
-            return Color.CYAN;
-        else
-            return resourceHelper.gc(android.R.color.holo_red_light);
-    }
-
-    @Override
-    public void setY(double y) {
-        yValue = y;
-    }
-
-    //  ----------------- DataPointInterface end --------------------
-
-    @Override
-    public long getDate() {
-        return this.date;
-    }
-
-    @Override
-    public long getPumpId() {
-        return this.pumpId;
-    }
-}
\ No newline at end of file
diff --git a/core/src/main/java/info/nightscout/androidaps/di/CoreModule.kt b/core/src/main/java/info/nightscout/androidaps/di/CoreModule.kt
index ec2b5bb1ad..556f473524 100644
--- a/core/src/main/java/info/nightscout/androidaps/di/CoreModule.kt
+++ b/core/src/main/java/info/nightscout/androidaps/di/CoreModule.kt
@@ -1,7 +1,8 @@
 package info.nightscout.androidaps.di
 
 import android.content.Context
-import android.preference.PreferenceManager
+import android.telephony.SmsManager
+import androidx.preference.PreferenceManager
 import dagger.Module
 import dagger.Provides
 import info.nightscout.androidaps.logging.AAPSLogger
@@ -32,4 +33,7 @@ open class CoreModule {
     @Singleton
     fun provideAAPSLogger(l: L): AAPSLogger = AAPSLoggerProduction(l)
 
+    @Provides
+    fun smsManager() : SmsManager = SmsManager.getDefault()
+
 }
\ No newline at end of file
diff --git a/core/src/main/java/info/nightscout/androidaps/db/StaticInjector.kt b/core/src/main/java/info/nightscout/androidaps/di/StaticInjector.kt
similarity index 95%
rename from core/src/main/java/info/nightscout/androidaps/db/StaticInjector.kt
rename to core/src/main/java/info/nightscout/androidaps/di/StaticInjector.kt
index 6dea876733..daf3d7c0b2 100644
--- a/core/src/main/java/info/nightscout/androidaps/db/StaticInjector.kt
+++ b/core/src/main/java/info/nightscout/androidaps/di/StaticInjector.kt
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.db
+package info.nightscout.androidaps.di
 
 import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
diff --git a/core/src/main/java/info/nightscout/androidaps/dialogs/BolusProgressDialog.kt b/core/src/main/java/info/nightscout/androidaps/dialogs/BolusProgressDialog.kt
index 5ab17221c5..9d9e323930 100644
--- a/core/src/main/java/info/nightscout/androidaps/dialogs/BolusProgressDialog.kt
+++ b/core/src/main/java/info/nightscout/androidaps/dialogs/BolusProgressDialog.kt
@@ -40,11 +40,7 @@ class BolusProgressDialog : DaggerDialogFragment() {
     private val disposable = CompositeDisposable()
 
     companion object {
-
-        @JvmField
         var bolusEnded = false
-
-        @JvmField
         var stopPressed = false
     }
 
diff --git a/core/src/main/java/info/nightscout/androidaps/dialogs/DialogFragmentWithDate.kt b/core/src/main/java/info/nightscout/androidaps/dialogs/DialogFragmentWithDate.kt
index 0ad6a55114..25ff67e21d 100644
--- a/core/src/main/java/info/nightscout/androidaps/dialogs/DialogFragmentWithDate.kt
+++ b/core/src/main/java/info/nightscout/androidaps/dialogs/DialogFragmentWithDate.kt
@@ -40,7 +40,10 @@ abstract class DialogFragmentWithDate : DaggerDialogFragment() {
 
     override fun onStart() {
         super.onStart()
-        dialog?.window?.setLayout(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT)
+        dialog?.window?.setLayout(
+            ViewGroup.LayoutParams.MATCH_PARENT,
+            ViewGroup.LayoutParams.WRAP_CONTENT
+        )
     }
 
     override fun onSaveInstanceState(savedInstanceState: Bundle) {
@@ -67,22 +70,24 @@ abstract class DialogFragmentWithDate : DaggerDialogFragment() {
         eventTimeView?.text = dateUtil.timeString(eventTime)
 
         // create an OnDateSetListener
-        val dateSetListener = DatePickerDialog.OnDateSetListener { _, year, monthOfYear, dayOfMonth ->
-            val cal = Calendar.getInstance()
-            cal.timeInMillis = eventTime
-            cal.set(Calendar.YEAR, year)
-            cal.set(Calendar.MONTH, monthOfYear)
-            cal.set(Calendar.DAY_OF_MONTH, dayOfMonth)
-            eventTime = cal.timeInMillis
-            eventTimeChanged = true
-            eventDateView?.text = dateUtil.dateString(eventTime)
-        }
+        val dateSetListener =
+            DatePickerDialog.OnDateSetListener { _, year, monthOfYear, dayOfMonth ->
+                val cal = Calendar.getInstance()
+                cal.timeInMillis = eventTime
+                cal.set(Calendar.YEAR, year)
+                cal.set(Calendar.MONTH, monthOfYear)
+                cal.set(Calendar.DAY_OF_MONTH, dayOfMonth)
+                eventTime = cal.timeInMillis
+                eventTimeChanged = true
+                eventDateView?.text = dateUtil.dateString(eventTime)
+            }
 
         eventDateView?.setOnClickListener {
             context?.let {
                 val cal = Calendar.getInstance()
                 cal.timeInMillis = eventTime
-                DatePickerDialog(it, dateSetListener,
+                DatePickerDialog(
+                    it, dateSetListener,
                     cal.get(Calendar.YEAR),
                     cal.get(Calendar.MONTH),
                     cal.get(Calendar.DAY_OF_MONTH)
@@ -96,7 +101,10 @@ abstract class DialogFragmentWithDate : DaggerDialogFragment() {
             cal.timeInMillis = eventTime
             cal.set(Calendar.HOUR_OF_DAY, hour)
             cal.set(Calendar.MINUTE, minute)
-            cal.set(Calendar.SECOND, seconds++) // randomize seconds to prevent creating record of the same time, if user choose time manually
+            cal.set(
+                Calendar.SECOND,
+                seconds++
+            ) // randomize seconds to prevent creating record of the same time, if user choose time manually
             eventTime = cal.timeInMillis
             eventTimeChanged = true
             eventTimeView?.text = dateUtil.timeString(eventTime)
@@ -106,7 +114,8 @@ abstract class DialogFragmentWithDate : DaggerDialogFragment() {
             context?.let {
                 val cal = Calendar.getInstance()
                 cal.timeInMillis = eventTime
-                TimePickerDialog(it, timeSetListener,
+                TimePickerDialog(
+                    it, timeSetListener,
                     cal.get(Calendar.HOUR_OF_DAY),
                     cal.get(Calendar.MINUTE),
                     DateFormat.is24HourFormat(context)
@@ -114,7 +123,8 @@ abstract class DialogFragmentWithDate : DaggerDialogFragment() {
             }
         }
 
-        (view.findViewById(R.id.notes_layout) as View?)?.visibility = sp.getBoolean(R.string.key_show_notes_entry_dialogs, false).toVisibility()
+        (view.findViewById(R.id.notes_layout) as View?)?.visibility =
+            sp.getBoolean(R.string.key_show_notes_entry_dialogs, false).toVisibility()
 
         (view.findViewById(R.id.ok) as Button?)?.setOnClickListener {
             synchronized(okClicked) {
@@ -137,7 +147,7 @@ abstract class DialogFragmentWithDate : DaggerDialogFragment() {
                 it.commitAllowingStateLoss()
             }
         } catch (e: IllegalStateException) {
-            aapsLogger.debug(e.localizedMessage)
+            aapsLogger.debug(e.localizedMessage ?: "")
         }
     }
 
diff --git a/core/src/main/java/info/nightscout/androidaps/dialogs/ErrorDialog.kt b/core/src/main/java/info/nightscout/androidaps/dialogs/ErrorDialog.kt
index 609b70a01e..956dd54804 100644
--- a/core/src/main/java/info/nightscout/androidaps/dialogs/ErrorDialog.kt
+++ b/core/src/main/java/info/nightscout/androidaps/dialogs/ErrorDialog.kt
@@ -1,7 +1,9 @@
 package info.nightscout.androidaps.dialogs
 
+import android.content.Context
 import android.os.Bundle
 import android.os.Handler
+import android.os.Looper
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -17,7 +19,6 @@ import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.UserEntryLogger
 import info.nightscout.androidaps.services.AlarmSoundServiceHelper
 import info.nightscout.androidaps.utils.T
-import org.mozilla.javascript.tools.jsc.Main
 import javax.inject.Inject
 
 class ErrorDialog : DaggerDialogFragment() {
@@ -25,13 +26,14 @@ class ErrorDialog : DaggerDialogFragment() {
     @Inject lateinit var alarmSoundServiceHelper: AlarmSoundServiceHelper
     @Inject lateinit var aapsLogger: AAPSLogger
     @Inject lateinit var uel: UserEntryLogger
+    @Inject lateinit var ctx: Context
 
     var helperActivity: ErrorHelperActivity? = null
     var status: String = ""
     var title: String = ""
     var sound: Int = 0
 
-    private var loopHandler = Handler()
+    private var loopHandler = Handler(Looper.getMainLooper())
 
     private var _binding: DialogErrorBinding? = null
 
@@ -107,9 +109,9 @@ class ErrorDialog : DaggerDialogFragment() {
 
     private fun startAlarm() {
         if (sound != 0)
-            context?.let { context -> alarmSoundServiceHelper.startAlarm(context, sound) }
+            alarmSoundServiceHelper.startAlarm(ctx, sound)
     }
 
     private fun stopAlarm() =
-        context?.let { context -> alarmSoundServiceHelper.stopService(context) }
+        alarmSoundServiceHelper.stopService(ctx)
 }
diff --git a/core/src/main/java/info/nightscout/androidaps/dialogs/ProfileViewerDialog.kt b/core/src/main/java/info/nightscout/androidaps/dialogs/ProfileViewerDialog.kt
index 1f4c88e3ab..ccb87c0704 100644
--- a/core/src/main/java/info/nightscout/androidaps/dialogs/ProfileViewerDialog.kt
+++ b/core/src/main/java/info/nightscout/androidaps/dialogs/ProfileViewerDialog.kt
@@ -17,15 +17,18 @@ import info.nightscout.androidaps.database.AppRepository
 import info.nightscout.androidaps.database.ValueWrapper
 import info.nightscout.androidaps.extensions.getCustomizedName
 import info.nightscout.androidaps.extensions.pureProfileFromJson
+import info.nightscout.androidaps.extensions.toVisibility
 import info.nightscout.androidaps.interfaces.ActivePlugin
 import info.nightscout.androidaps.interfaces.Config
 import info.nightscout.androidaps.interfaces.Profile
 import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.utils.DateUtil
+import info.nightscout.androidaps.utils.HardLimits
 import info.nightscout.androidaps.utils.HtmlHelper
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import org.json.JSONObject
+import java.io.File.separator
 import java.text.DecimalFormat
 import javax.inject.Inject
 
@@ -39,6 +42,7 @@ class ProfileViewerDialog : DaggerDialogFragment() {
     @Inject lateinit var activePlugin: ActivePlugin
     @Inject lateinit var config: Config
     @Inject lateinit var rxBus: RxBusWrapper
+    @Inject lateinit var hardLimits: HardLimits
 
     private var time: Long = 0
 
@@ -149,7 +153,9 @@ class ProfileViewerDialog : DaggerDialogFragment() {
                 }
 
                 binding.noprofile.visibility = View.GONE
-                binding.invalidprofile.visibility = if (profile1.isValid("ProfileViewDialog", activePlugin.activePump, config, resourceHelper, rxBus)) View.GONE else View.VISIBLE
+                val validity = profile1.isValid("ProfileViewDialog", activePlugin.activePump, config, resourceHelper, rxBus, hardLimits)
+                binding.invalidprofile.text = resourceHelper.gs(R.string.invalidprofile) + "\n" + validity.reasons.joinToString(separator = "\n")
+                binding.invalidprofile.visibility = validity.isValid.not().toVisibility()
             }
         else
             profile?.let {
@@ -164,7 +170,9 @@ class ProfileViewerDialog : DaggerDialogFragment() {
                 binding.basalGraph.show(it)
 
                 binding.noprofile.visibility = View.GONE
-                binding.invalidprofile.visibility = if (it.isValid("ProfileViewDialog", activePlugin.activePump, config, resourceHelper, rxBus)) View.GONE else View.VISIBLE
+                val validity = it.isValid("ProfileViewDialog", activePlugin.activePump, config, resourceHelper, rxBus, hardLimits)
+                binding.invalidprofile.text = resourceHelper.gs(R.string.invalidprofile) + "\n" + validity.reasons.joinToString(separator = "\n")
+                binding.invalidprofile.visibility = validity.isValid.not().toVisibility()
             }
     }
 
diff --git a/core/src/main/java/info/nightscout/androidaps/events/EventOfflineChange.kt b/core/src/main/java/info/nightscout/androidaps/events/EventOfflineChange.kt
new file mode 100644
index 0000000000..6b088ae711
--- /dev/null
+++ b/core/src/main/java/info/nightscout/androidaps/events/EventOfflineChange.kt
@@ -0,0 +1,3 @@
+package info.nightscout.androidaps.events
+
+class EventOfflineChange : Event()
\ No newline at end of file
diff --git a/core/src/main/java/info/nightscout/androidaps/events/EventPumpStatusChanged.kt b/core/src/main/java/info/nightscout/androidaps/events/EventPumpStatusChanged.kt
index 0b9ce7ebf0..e65a7fe6e5 100644
--- a/core/src/main/java/info/nightscout/androidaps/events/EventPumpStatusChanged.kt
+++ b/core/src/main/java/info/nightscout/androidaps/events/EventPumpStatusChanged.kt
@@ -10,6 +10,7 @@ class EventPumpStatusChanged : EventStatus {
         CONNECTED,
         HANDSHAKING,
         PERFORMING,
+        WAITING_FOR_DISCONNECTION,
         DISCONNECTING,
         DISCONNECTED
     }
@@ -46,12 +47,13 @@ class EventPumpStatusChanged : EventStatus {
     // status for startup wizard
     override fun getStatus(resourceHelper: ResourceHelper): String {
         return when (status) {
-            Status.CONNECTING    -> String.format(resourceHelper.gs(R.string.connectingfor), secondsElapsed)
-            Status.HANDSHAKING   -> resourceHelper.gs(R.string.handshaking)
-            Status.CONNECTED     -> resourceHelper.gs(R.string.connected)
-            Status.PERFORMING    -> performingAction
-            Status.DISCONNECTING -> resourceHelper.gs(R.string.disconnecting)
-            Status.DISCONNECTED  -> ""
+            Status.CONNECTING                -> String.format(resourceHelper.gs(R.string.connectingfor), secondsElapsed)
+            Status.HANDSHAKING               -> resourceHelper.gs(R.string.handshaking)
+            Status.CONNECTED                 -> resourceHelper.gs(R.string.connected)
+            Status.PERFORMING                -> performingAction
+            Status.WAITING_FOR_DISCONNECTION -> resourceHelper.gs(R.string.waiting_for_disconnection)
+            Status.DISCONNECTING             -> resourceHelper.gs(R.string.disconnecting)
+            Status.DISCONNECTED              -> ""
         }
     }
 }
diff --git a/core/src/main/java/info/nightscout/androidaps/extensions/BlockExtension.kt b/core/src/main/java/info/nightscout/androidaps/extensions/BlockExtension.kt
index a07e88cc39..972a602573 100644
--- a/core/src/main/java/info/nightscout/androidaps/extensions/BlockExtension.kt
+++ b/core/src/main/java/info/nightscout/androidaps/extensions/BlockExtension.kt
@@ -15,7 +15,7 @@ private fun getShiftedTimeSecs(originalSeconds: Int, timeShiftHours: Int): Int {
 
 fun List<Block>.shiftBlock(multiplier: Double, timeShiftHours: Int): List<Block> {
     val newList = arrayListOf<Block>()
-    for (hour in 0..23) newList.add(Block(1000 * 60 * 60, blockValueBySeconds(hour * 3600, multiplier, timeShiftHours)))
+    for (hour in 0..23) newList.add(Block(1000L * 60 * 60, blockValueBySeconds(hour * 3600, multiplier, timeShiftHours)))
     for (i in newList.indices.reversed()) {
         if (i > 0)
             if (newList[i].amount == newList[i - 1].amount) {
@@ -29,7 +29,7 @@ fun List<Block>.shiftBlock(multiplier: Double, timeShiftHours: Int): List<Block>
 fun List<TargetBlock>.shiftTargetBlock(timeShiftHours: Int): List<TargetBlock> {
     val newList = arrayListOf<TargetBlock>()
     for (hour in 0..23)
-        newList.add(TargetBlock(1000 * 60 * 60, lowTargetBlockValueBySeconds(hour * 3600, timeShiftHours), highTargetBlockValueBySeconds(hour * 3600, timeShiftHours)))
+        newList.add(TargetBlock(1000L * 60 * 60, lowTargetBlockValueBySeconds(hour * 3600, timeShiftHours), highTargetBlockValueBySeconds(hour * 3600, timeShiftHours)))
     for (i in newList.indices.reversed()) {
         if (i > 0)
             if (newList[i].lowTarget == newList[i - 1].lowTarget && newList[i].highTarget == newList[i - 1].highTarget) {
diff --git a/core/src/main/java/info/nightscout/androidaps/extensions/BolusCalculatorResultExtension.kt b/core/src/main/java/info/nightscout/androidaps/extensions/BolusCalculatorResultExtension.kt
index b083c1d238..b1f49b603c 100644
--- a/core/src/main/java/info/nightscout/androidaps/extensions/BolusCalculatorResultExtension.kt
+++ b/core/src/main/java/info/nightscout/androidaps/extensions/BolusCalculatorResultExtension.kt
@@ -11,6 +11,7 @@ fun BolusCalculatorResult.toJson(isAdd: Boolean, dateUtil: DateUtil): JSONObject
     JSONObject()
         .put("eventType", TherapyEvent.Type.BOLUS_WIZARD.text)
         .put("created_at", dateUtil.toISOString(timestamp))
+        .put("isValid", isValid)
         .put("bolusCalculatorResult", Gson().toJson(this))
         .put("date", timestamp)
         .put("glucose", glucoseValue)
diff --git a/core/src/main/java/info/nightscout/androidaps/extensions/CarbsExtension.kt b/core/src/main/java/info/nightscout/androidaps/extensions/CarbsExtension.kt
index 24aa4f9cf1..b3c6e6ac81 100644
--- a/core/src/main/java/info/nightscout/androidaps/extensions/CarbsExtension.kt
+++ b/core/src/main/java/info/nightscout/androidaps/extensions/CarbsExtension.kt
@@ -12,6 +12,7 @@ fun Carbs.toJson(isAdd: Boolean, dateUtil: DateUtil): JSONObject =
         .put("eventType", if (amount < 12) TherapyEvent.Type.CARBS_CORRECTION.text else TherapyEvent.Type.MEAL_BOLUS.text)
         .put("carbs", amount)
         .put("created_at", dateUtil.toISOString(timestamp))
+        .put("isValid", isValid)
         .put("date", timestamp).also {
             if (duration != 0L) it.put("duration", duration)
             if (interfaceIDs.pumpId != null) it.put("pumpId", interfaceIDs.pumpId)
diff --git a/core/src/main/java/info/nightscout/androidaps/extensions/DeviceStatusExtension.kt b/core/src/main/java/info/nightscout/androidaps/extensions/DeviceStatusExtension.kt
index 1d5d6dea9c..46aca076d5 100644
--- a/core/src/main/java/info/nightscout/androidaps/extensions/DeviceStatusExtension.kt
+++ b/core/src/main/java/info/nightscout/androidaps/extensions/DeviceStatusExtension.kt
@@ -3,7 +3,7 @@ package info.nightscout.androidaps.extensions
 import android.os.Build
 import info.nightscout.androidaps.database.entities.DeviceStatus
 import info.nightscout.androidaps.interfaces.IobCobCalculator
-import info.nightscout.androidaps.interfaces.LoopInterface
+import info.nightscout.androidaps.interfaces.Loop
 import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.interfaces.Pump
 import info.nightscout.androidaps.plugins.configBuilder.RunningConfiguration
@@ -16,19 +16,19 @@ fun DeviceStatus.toJson(dateUtil: DateUtil): JSONObject =
         .put("created_at", dateUtil.toISOString(timestamp))
         .also {
             if (device != null) it.put("device", device)
-            if (pump != null) it.put("pump", JSONObject(pump))
+            pump?.let { pump -> it.put("pump", JSONObject(pump)) }
             it.put("openaps", JSONObject().also { openaps ->
-                if (enacted != null) openaps.put("enacted", JSONObject(enacted))
-                if (suggested != null) openaps.put("suggested", JSONObject(suggested))
-                if (iob != null) openaps.put("iob", iob)
+                enacted?.let { enacted -> openaps.put("enacted", JSONObject(enacted)) }
+                suggested?.let { suggested -> openaps.put("suggested", JSONObject(suggested)) }
+                iob?.let { iob -> openaps.put("iob", JSONObject(iob)) }
             })
             if (uploaderBattery != 0) it.put("uploaderBattery", uploaderBattery)
-            if (configuration != null) it.put("configuration", JSONObject(configuration))
+            configuration?.let { configuration ->  it.put("configuration", JSONObject(configuration)) }
         }
 
 fun buildDeviceStatus(
     dateUtil: DateUtil,
-    loopPlugin: LoopInterface,
+    loopPlugin: Loop,
     iobCobCalculatorPlugin: IobCobCalculator,
     profileFunction: ProfileFunction,
     pump: Pump,
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..b8f5396b13 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,14 @@
 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.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 +21,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): 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/extensions/GlucoseValueExtension.kt b/core/src/main/java/info/nightscout/androidaps/extensions/GlucoseValueExtension.kt
index 140a409822..a74fdff40b 100644
--- a/core/src/main/java/info/nightscout/androidaps/extensions/GlucoseValueExtension.kt
+++ b/core/src/main/java/info/nightscout/androidaps/extensions/GlucoseValueExtension.kt
@@ -20,6 +20,7 @@ fun GlucoseValue.toJson(isAdd : Boolean, dateUtil: DateUtil): JSONObject =
         .put("device", sourceSensor.text)
         .put("date", timestamp)
         .put("dateString", dateUtil.toISOString(timestamp))
+        .put("isValid", isValid)
         .put("sgv", value)
         .put("direction", trendArrow.text)
         .put("type", "sgv")
diff --git a/core/src/main/java/info/nightscout/androidaps/extensions/HexByteArrayConversion.kt b/core/src/main/java/info/nightscout/androidaps/extensions/HexByteArrayConversion.kt
index 9976da33ba..5f846581ae 100644
--- a/core/src/main/java/info/nightscout/androidaps/extensions/HexByteArrayConversion.kt
+++ b/core/src/main/java/info/nightscout/androidaps/extensions/HexByteArrayConversion.kt
@@ -18,7 +18,6 @@ fun ByteArray.toHex() : String{
     return result.toString()
 }
 
-@kotlin.ExperimentalStdlibApi
 fun String.hexStringToByteArray(): ByteArray {
 
     val result = ByteArray(length / 2)
@@ -29,7 +28,7 @@ fun String.hexStringToByteArray(): ByteArray {
         val secondIndex = HEX_CHARS.indexOf(lowerCased[i + 1])
 
         val octet = firstIndex.shl(4).or(secondIndex)
-        result.set(i.shr(1), octet.toByte())
+        result[i.shr(1)] = octet.toByte()
     }
 
     return result
diff --git a/core/src/main/java/info/nightscout/androidaps/extensions/OfflineEventExtension.kt b/core/src/main/java/info/nightscout/androidaps/extensions/OfflineEventExtension.kt
new file mode 100644
index 0000000000..c18089c6c2
--- /dev/null
+++ b/core/src/main/java/info/nightscout/androidaps/extensions/OfflineEventExtension.kt
@@ -0,0 +1,64 @@
+package info.nightscout.androidaps.extensions
+
+import info.nightscout.androidaps.database.embedments.InterfaceIDs
+import info.nightscout.androidaps.database.entities.OfflineEvent
+import info.nightscout.androidaps.database.entities.TherapyEvent
+import info.nightscout.androidaps.utils.DateUtil
+import info.nightscout.androidaps.utils.JsonHelper
+import info.nightscout.androidaps.utils.T
+import org.json.JSONObject
+
+fun OfflineEvent.toJson(isAdd: Boolean, dateUtil: DateUtil): JSONObject =
+    JSONObject()
+        .put("created_at", dateUtil.toISOString(timestamp))
+        .put("enteredBy", "openaps://" + "AndroidAPS")
+        .put("eventType", TherapyEvent.Type.APS_OFFLINE.text)
+        .put("isValid", isValid)
+        .put("duration", T.msecs(duration).mins())
+        .put("reason", reason.name)
+        .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)
+        }
+
+/* NS PS
+{
+    "enteredBy": "undefined",
+    "eventType": "OpenAPS Offline",
+    "duration": 60,
+    "created_at": "2021-05-27T15:11:52.230Z",
+    "utcOffset": 0,
+    "_id": "60afb6ba3c0d77e3e720f2fe",
+    "mills": 1622128312230,
+    "carbs": null,
+    "insulin": null
+}
+ */
+fun offlineEventFromJson(jsonObject: JSONObject): OfflineEvent? {
+    val timestamp = JsonHelper.safeGetLongAllowNull(jsonObject, "mills", null) ?: return null
+    val duration = JsonHelper.safeGetLong(jsonObject, "duration")
+    val isValid = JsonHelper.safeGetBoolean(jsonObject, "isValid", true)
+    val id = JsonHelper.safeGetStringAllowNull(jsonObject, "_id", 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)
+    val reason = OfflineEvent.Reason.fromString(JsonHelper.safeGetString(jsonObject, "reason", OfflineEvent.Reason.OTHER.name))
+
+
+
+    return OfflineEvent(
+        timestamp = timestamp,
+        duration = T.mins(duration).msecs(),
+        isValid = isValid,
+        reason = reason
+    ).also {
+        it.interfaceIDs.nightscoutId = id
+        it.interfaceIDs.pumpId = pumpId
+        it.interfaceIDs.pumpType = pumpType
+        it.interfaceIDs.pumpSerial = pumpSerial
+    }
+}
+
+
diff --git a/core/src/main/java/info/nightscout/androidaps/extensions/ProfileSwitchExtension.kt b/core/src/main/java/info/nightscout/androidaps/extensions/ProfileSwitchExtension.kt
index 12f25fcdcf..fcb480a87c 100644
--- a/core/src/main/java/info/nightscout/androidaps/extensions/ProfileSwitchExtension.kt
+++ b/core/src/main/java/info/nightscout/androidaps/extensions/ProfileSwitchExtension.kt
@@ -21,6 +21,7 @@ fun ProfileSwitch.toJson(isAdd: Boolean, dateUtil: DateUtil): JSONObject =
     JSONObject()
         .put("created_at", dateUtil.toISOString(timestamp))
         .put("enteredBy", "openaps://" + "AndroidAPS")
+        .put("isValid", isValid)
         .put("eventType", TherapyEvent.Type.PROFILE_SWITCH.text)
         .put("duration", T.msecs(duration).mins())
         .put("profile", getCustomizedName())
diff --git a/core/src/main/java/info/nightscout/androidaps/extensions/TemporaryBasalExtension.kt b/core/src/main/java/info/nightscout/androidaps/extensions/TemporaryBasalExtension.kt
index 35f3c195eb..391fd5fed6 100644
--- a/core/src/main/java/info/nightscout/androidaps/extensions/TemporaryBasalExtension.kt
+++ b/core/src/main/java/info/nightscout/androidaps/extensions/TemporaryBasalExtension.kt
@@ -67,6 +67,7 @@ fun TemporaryBasal.toJson(isAdd: Boolean, profile: Profile, dateUtil: DateUtil,
         .put("created_at", dateUtil.toISOString(timestamp))
         .put("enteredBy", "openaps://" + "AndroidAPS")
         .put("eventType", TherapyEvent.Type.TEMPORARY_BASAL.text)
+        .put("isValid", isValid)
         .put("duration", T.msecs(duration).mins())
         .put("rate", rate)
         .put("type", type.name)
diff --git a/core/src/main/java/info/nightscout/androidaps/extensions/TemporaryTargetExtension.kt b/core/src/main/java/info/nightscout/androidaps/extensions/TemporaryTargetExtension.kt
index 1f7dd4e477..9c45de88ad 100644
--- a/core/src/main/java/info/nightscout/androidaps/extensions/TemporaryTargetExtension.kt
+++ b/core/src/main/java/info/nightscout/androidaps/extensions/TemporaryTargetExtension.kt
@@ -2,10 +2,10 @@ package info.nightscout.androidaps.extensions
 
 import info.nightscout.androidaps.Constants
 import info.nightscout.androidaps.core.R
-import info.nightscout.androidaps.interfaces.Profile
 import info.nightscout.androidaps.database.entities.TemporaryTarget
 import info.nightscout.androidaps.database.entities.TherapyEvent
 import info.nightscout.androidaps.interfaces.GlucoseUnit
+import info.nightscout.androidaps.interfaces.Profile
 import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.utils.DecimalFormatter
 import info.nightscout.androidaps.utils.JsonHelper
@@ -14,6 +14,9 @@ import info.nightscout.androidaps.utils.resources.ResourceHelper
 import org.json.JSONObject
 import java.util.concurrent.TimeUnit
 
+fun TemporaryTarget.isInProgress(dateUtil: DateUtil): Boolean =
+    dateUtil.now() in timestamp..timestamp + duration
+
 fun TemporaryTarget.lowValueToUnitsToString(units: GlucoseUnit): String =
     if (units == GlucoseUnit.MGDL) DecimalFormatter.to0Decimal(this.lowTarget)
     else DecimalFormatter.to1Decimal(this.lowTarget * Constants.MGDL_TO_MMOLL)
diff --git a/core/src/main/java/info/nightscout/androidaps/extensions/TherapyEventExtension.kt b/core/src/main/java/info/nightscout/androidaps/extensions/TherapyEventExtension.kt
index 54b55f33ab..f02488f617 100644
--- a/core/src/main/java/info/nightscout/androidaps/extensions/TherapyEventExtension.kt
+++ b/core/src/main/java/info/nightscout/androidaps/extensions/TherapyEventExtension.kt
@@ -97,10 +97,11 @@ fun therapyEventFromJson(jsonObject: JSONObject): TherapyEvent? {
     return te
 }
 
-fun TherapyEvent.toJson(isAdd: Boolean): JSONObject =
+fun TherapyEvent.toJson(isAdd: Boolean, dateUtil: DateUtil): JSONObject =
     JSONObject()
         .put("eventType", type.text)
-        .put("created_at", timestamp)
+        .put("isValid", isValid)
+        .put("created_at", dateUtil.toISOString(timestamp))
         .put("enteredBy", enteredBy)
         .put("units", if (glucoseUnit == TherapyEvent.GlucoseUnit.MGDL) Constants.MGDL else Constants.MMOL)
         .also {
diff --git a/core/src/main/java/info/nightscout/androidaps/interfaces/ActivePlugin.kt b/core/src/main/java/info/nightscout/androidaps/interfaces/ActivePlugin.kt
index b007705b0b..da514c7dd9 100644
--- a/core/src/main/java/info/nightscout/androidaps/interfaces/ActivePlugin.kt
+++ b/core/src/main/java/info/nightscout/androidaps/interfaces/ActivePlugin.kt
@@ -40,17 +40,18 @@ interface ActivePlugin {
      */
     val activeSensitivity: Sensitivity
 
-    /**
-     *  Currently selected Treatments plugin
-     */
-    val activeTreatments: TreatmentsInterface
-
     /**
      *  Currently selected Overview plugin
      *  Always OverviewPlugin
      */
     val activeOverview: Overview
 
+    /**
+     *  Currently selected Safety plugin
+     *  Always SafetyPlugin
+     */
+    val activeSafety: Safety
+
     /**
      *  List of all registered plugins
      */
diff --git a/core/src/main/java/info/nightscout/androidaps/interfaces/CommandQueueProvider.kt b/core/src/main/java/info/nightscout/androidaps/interfaces/CommandQueueProvider.kt
index 5dce29d8dc..31fb77e6b1 100644
--- a/core/src/main/java/info/nightscout/androidaps/interfaces/CommandQueueProvider.kt
+++ b/core/src/main/java/info/nightscout/androidaps/interfaces/CommandQueueProvider.kt
@@ -38,5 +38,5 @@ interface CommandQueueProvider {
     fun isCustomCommandRunning(customCommandType: Class<out CustomCommand>): Boolean
     fun isCustomCommandInQueue(customCommandType: Class<out CustomCommand>): Boolean
     fun spannedStatus(): Spanned
-    fun isThisProfileSet(profile: Profile): Boolean
+    fun isThisProfileSet(requestedProfile: Profile): Boolean
 }
\ No newline at end of file
diff --git a/core/src/main/java/info/nightscout/androidaps/interfaces/Constraints.kt b/core/src/main/java/info/nightscout/androidaps/interfaces/Constraints.kt
index 95a901f626..709b4c037b 100644
--- a/core/src/main/java/info/nightscout/androidaps/interfaces/Constraints.kt
+++ b/core/src/main/java/info/nightscout/androidaps/interfaces/Constraints.kt
@@ -17,7 +17,6 @@ interface Constraints {
     fun isClosedLoopAllowed(value: Constraint<Boolean>): Constraint<Boolean> = value
     fun isLgsAllowed(value: Constraint<Boolean>): Constraint<Boolean> = value
     fun isAutosensModeEnabled(value: Constraint<Boolean>): Constraint<Boolean> = value
-    fun isAMAModeEnabled(value: Constraint<Boolean>): Constraint<Boolean> = value
     fun isSMBModeEnabled(value: Constraint<Boolean>): Constraint<Boolean> = value
     fun isUAMEnabled(value: Constraint<Boolean>): Constraint<Boolean> = value
     fun isAdvancedFilteringEnabled(value: Constraint<Boolean>): Constraint<Boolean> = value
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 e4feb850d9..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,8 @@ 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)
 
     fun doUpload()
@@ -77,6 +79,16 @@ 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
+    fun processChangedOfflineEventsCompat(): Boolean
+
     fun confirmLastProfileStore(lastSynced: Long)
     fun processChangedProfileStore()
 }
\ No newline at end of file
diff --git a/core/src/main/java/info/nightscout/androidaps/interfaces/DatabaseHelperInterface.kt b/core/src/main/java/info/nightscout/androidaps/interfaces/DatabaseHelperInterface.kt
deleted file mode 100644
index fe783413a0..0000000000
--- a/core/src/main/java/info/nightscout/androidaps/interfaces/DatabaseHelperInterface.kt
+++ /dev/null
@@ -1,29 +0,0 @@
-package info.nightscout.androidaps.interfaces
-
-import info.nightscout.androidaps.db.*
-
-interface DatabaseHelperInterface {
-
-    fun resetDatabases()
-
-    fun createOrUpdate(record: OmnipodHistoryRecord)
-    fun createOrUpdate(record: OHQueueItem)
-    fun delete(extendedBolus: ExtendedBolus)
-    fun createOrUpdate(tempBasal: TemporaryBasal): Boolean
-    @Deprecated("Use new DB")
-    fun findTempBasalByPumpId(id: Long): TemporaryBasal?
-    @Deprecated("Use new DB")
-    fun getTemporaryBasalsDataFromTime(mills: Long, ascending: Boolean): List<TemporaryBasal>
-    fun getAllOmnipodHistoryRecordsFromTimestamp(timestamp: Long, ascending: Boolean): List<OmnipodHistoryRecord>
-    fun findOmnipodHistoryRecordByPumpId(pumpId: Long): OmnipodHistoryRecord?
-    @Deprecated("Use new DB")
-    fun getExtendedBolusByPumpId(pumpId: Long): ExtendedBolus?
-    fun getAllOHQueueItems(maxEntries: Long): List<OHQueueItem>
-
-    // old DB model
-
-    fun getOHQueueSize(): Long
-    fun clearOpenHumansQueue()
-    fun removeAllOHQueueItemsWithIdSmallerThan(id: Long)
-
-}
diff --git a/core/src/main/java/info/nightscout/androidaps/interfaces/Diaconn.kt b/core/src/main/java/info/nightscout/androidaps/interfaces/Diaconn.kt
new file mode 100644
index 0000000000..be3bfa1b87
--- /dev/null
+++ b/core/src/main/java/info/nightscout/androidaps/interfaces/Diaconn.kt
@@ -0,0 +1,8 @@
+package info.nightscout.androidaps.interfaces
+
+import info.nightscout.androidaps.data.PumpEnactResult
+
+interface Diaconn {
+    fun loadHistory(): PumpEnactResult // for history browser
+    fun setUserOptions(): PumpEnactResult // pump etc settings
+}
\ No newline at end of file
diff --git a/core/src/main/java/info/nightscout/androidaps/interfaces/Interval.kt b/core/src/main/java/info/nightscout/androidaps/interfaces/Interval.kt
deleted file mode 100644
index 47c1d64bcf..0000000000
--- a/core/src/main/java/info/nightscout/androidaps/interfaces/Interval.kt
+++ /dev/null
@@ -1,20 +0,0 @@
-package info.nightscout.androidaps.interfaces
-
-interface Interval {
-
-    fun durationInMsec(): Long
-    fun start(): Long
-
-    // planned end time at time of creation
-    fun originalEnd(): Long
-
-    // end time after cut
-    fun end(): Long
-    fun cutEndTo(end: Long)
-    fun match(time: Long): Boolean
-    fun before(time: Long): Boolean
-    fun after(time: Long): Boolean
-    val isInProgress: Boolean
-    val isEndingEvent: Boolean
-    val isValid: Boolean
-}
\ No newline at end of file
diff --git a/core/src/main/java/info/nightscout/androidaps/interfaces/IobCobCalculator.kt b/core/src/main/java/info/nightscout/androidaps/interfaces/IobCobCalculator.kt
index e0e3dfbb0a..9e3a9d428a 100644
--- a/core/src/main/java/info/nightscout/androidaps/interfaces/IobCobCalculator.kt
+++ b/core/src/main/java/info/nightscout/androidaps/interfaces/IobCobCalculator.kt
@@ -27,6 +27,8 @@ interface IobCobCalculator {
     fun iobArrayToString(array: Array<IobTotal>): String
     fun convertToJSONArray(iobArray: Array<IobTotal>): JSONArray
 
+    fun clearCache()
+
     /**
      *  Calculate CobInfo to now()
      *
diff --git a/core/src/main/java/info/nightscout/androidaps/interfaces/LoopInterface.kt b/core/src/main/java/info/nightscout/androidaps/interfaces/Loop.kt
similarity index 76%
rename from core/src/main/java/info/nightscout/androidaps/interfaces/LoopInterface.kt
rename to core/src/main/java/info/nightscout/androidaps/interfaces/Loop.kt
index fb6cb46594..a761e116b0 100644
--- a/core/src/main/java/info/nightscout/androidaps/interfaces/LoopInterface.kt
+++ b/core/src/main/java/info/nightscout/androidaps/interfaces/Loop.kt
@@ -1,9 +1,10 @@
 package info.nightscout.androidaps.interfaces
 
 import info.nightscout.androidaps.data.PumpEnactResult
+import info.nightscout.androidaps.database.entities.OfflineEvent
 import info.nightscout.androidaps.plugins.aps.loop.APSResult
 
-interface LoopInterface {
+interface Loop {
 
     class LastRun {
 
@@ -22,8 +23,9 @@ interface LoopInterface {
 
     var lastRun: LastRun?
     val isSuspended: Boolean
+    var enabled: Boolean
 
-    fun suspendTo(endTime: Long)
-    fun createOfflineEvent(durationInMinutes: Int)
+    fun minutesToEndOfSuspend(): Int
+    fun goToZeroTemp(durationInMinutes: Int, profile: Profile, reason: OfflineEvent.Reason)
     fun suspendLoop(durationInMinutes: Int)
 }
\ No newline at end of file
diff --git a/core/src/main/java/info/nightscout/androidaps/interfaces/PluginBase.kt b/core/src/main/java/info/nightscout/androidaps/interfaces/PluginBase.kt
index c0e83323a7..9e47f94639 100644
--- a/core/src/main/java/info/nightscout/androidaps/interfaces/PluginBase.kt
+++ b/core/src/main/java/info/nightscout/androidaps/interfaces/PluginBase.kt
@@ -26,6 +26,8 @@ abstract class PluginBase(
 
     open val menuIcon: Int
         get() = pluginDescription.pluginIcon
+    open val menuIcon2: Int
+        get() = pluginDescription.pluginIcon2
 
     open val name: String
         get() = if (pluginDescription.pluginName == -1) "UNKNOWN" else resourceHelper.gs(pluginDescription.pluginName)
diff --git a/core/src/main/java/info/nightscout/androidaps/interfaces/PluginDescription.kt b/core/src/main/java/info/nightscout/androidaps/interfaces/PluginDescription.kt
index 7f2d873d23..156fa1781c 100644
--- a/core/src/main/java/info/nightscout/androidaps/interfaces/PluginDescription.kt
+++ b/core/src/main/java/info/nightscout/androidaps/interfaces/PluginDescription.kt
@@ -1,6 +1,9 @@
 package info.nightscout.androidaps.interfaces
 
-open class PluginDescription {
+import info.nightscout.androidaps.annotations.OpenForTesting
+
+@OpenForTesting
+class PluginDescription {
 
     var mainType = PluginType.GENERAL
     var fragmentClass: String? = null
@@ -16,6 +19,7 @@ open class PluginDescription {
     var visibleByDefault = false
     var defaultPlugin = false
     var pluginIcon = -1
+    var pluginIcon2 = -1
 
     fun mainType(mainType: PluginType): PluginDescription = this.also { it.mainType = mainType }
     fun fragmentClass(fragmentClass: String?): PluginDescription = this.also { it.fragmentClass = fragmentClass }
@@ -24,6 +28,7 @@ open class PluginDescription {
     fun neverVisible(neverVisible: Boolean): PluginDescription = this.also { it.neverVisible = neverVisible }
     fun showInList(showInList: Boolean): PluginDescription = this.also { it.showInList = showInList }
     fun pluginIcon(pluginIcon: Int): PluginDescription = this.also { it.pluginIcon = pluginIcon }
+    fun pluginIcon2(pluginIcon2: Int): PluginDescription = this.also { it.pluginIcon2 = pluginIcon2 }
     fun pluginName(pluginName: Int): PluginDescription = this.also { it.pluginName = pluginName }
     fun shortName(shortName: Int): PluginDescription = this.also { it.shortName = shortName }
     fun preferencesId(preferencesId: Int): PluginDescription = this.also { it.preferencesId = preferencesId }
diff --git a/core/src/main/java/info/nightscout/androidaps/interfaces/PluginType.kt b/core/src/main/java/info/nightscout/androidaps/interfaces/PluginType.kt
index 315c2d6809..ca490bda53 100644
--- a/core/src/main/java/info/nightscout/androidaps/interfaces/PluginType.kt
+++ b/core/src/main/java/info/nightscout/androidaps/interfaces/PluginType.kt
@@ -6,5 +6,5 @@ package info.nightscout.androidaps.interfaces
  * set by [info.nightscout.androidaps.interfaces.PluginDescription.mainType]
  */
 enum class PluginType {
-    GENERAL, TREATMENT, SENSITIVITY, PROFILE, APS, PUMP, CONSTRAINTS, LOOP, BGSOURCE, INSULIN
+    GENERAL, SENSITIVITY, PROFILE, APS, PUMP, CONSTRAINTS, LOOP, BGSOURCE, INSULIN
 }
\ No newline at end of file
diff --git a/core/src/main/java/info/nightscout/androidaps/interfaces/Profile.kt b/core/src/main/java/info/nightscout/androidaps/interfaces/Profile.kt
index 3d43cdc60f..2cd9ac88f5 100644
--- a/core/src/main/java/info/nightscout/androidaps/interfaces/Profile.kt
+++ b/core/src/main/java/info/nightscout/androidaps/interfaces/Profile.kt
@@ -6,6 +6,7 @@ import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.utils.DecimalFormatter.to0Decimal
 import info.nightscout.androidaps.utils.DecimalFormatter.to1Decimal
+import info.nightscout.androidaps.utils.HardLimits
 import info.nightscout.androidaps.utils.Round
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import org.joda.time.DateTime
@@ -13,7 +14,9 @@ import org.json.JSONObject
 
 interface Profile {
 
-    fun isValid(from: String, pump: Pump, config: Config, resourceHelper: ResourceHelper, rxBus: RxBusWrapper): Boolean
+    class ValidityCheck(var isValid: Boolean = true, val reasons: ArrayList<String> = arrayListOf())
+
+    fun isValid(from: String, pump: Pump, config: Config, resourceHelper: ResourceHelper, rxBus: RxBusWrapper, hardLimits: HardLimits): ValidityCheck
 
     /**
      * Units used for ISF & target
diff --git a/core/src/main/java/info/nightscout/androidaps/interfaces/ProfileFunction.kt b/core/src/main/java/info/nightscout/androidaps/interfaces/ProfileFunction.kt
index 0b4829dad3..03b2f03590 100644
--- a/core/src/main/java/info/nightscout/androidaps/interfaces/ProfileFunction.kt
+++ b/core/src/main/java/info/nightscout/androidaps/interfaces/ProfileFunction.kt
@@ -46,6 +46,18 @@ interface ProfileFunction {
      */
     fun getRequestedProfile(): ProfileSwitch?
 
+    /**
+     * Build a new circadian profile switch request based on provided profile
+     *
+     * @param profileStore  ProfileStore to use
+     * @param profileName   this profile from profile store
+     * @param durationInMinutes
+     * @param percentage        100 = no modification
+     * @param timeShiftInHours  0 = no modification
+     * @param timestamp         expected time
+     */
+    fun buildProfileSwitch(profileStore: ProfileStore, profileName: String, durationInMinutes: Int, percentage: Int, timeShiftInHours: Int, timestamp: Long): ProfileSwitch
+
     /**
      * Create a new circadian profile switch request based on provided profile
      *
@@ -64,8 +76,9 @@ interface ProfileFunction {
      * @param durationInMinutes
      * @param percentage        100 = no modification
      * @param timeShiftInHours  0 = no modification
+     * @return true if profile switch is created
      */
-    fun createProfileSwitch(durationInMinutes: Int, percentage: Int, timeShiftInHours: Int)
+    fun createProfileSwitch(durationInMinutes: Int, percentage: Int, timeShiftInHours: Int): Boolean
 
     /*
      * Midnight time conversion
diff --git a/core/src/main/java/info/nightscout/androidaps/interfaces/ProfileStore.kt b/core/src/main/java/info/nightscout/androidaps/interfaces/ProfileStore.kt
index 91a00c4dc4..5884128606 100644
--- a/core/src/main/java/info/nightscout/androidaps/interfaces/ProfileStore.kt
+++ b/core/src/main/java/info/nightscout/androidaps/interfaces/ProfileStore.kt
@@ -31,6 +31,15 @@ class ProfileStore(val injector: HasAndroidInjector, val data: JSONObject, val d
         return null
     }
 
+    fun getStartDate(): Long {
+        val iso = JsonHelper.safeGetString(data, "startDate") ?: return 0
+        return try {
+            dateUtil.fromISODateString(iso)
+        } catch (e: Exception) {
+            0
+        }
+    }
+
     fun getDefaultProfile(): PureProfile? = getDefaultProfileName()?.let { getSpecificProfile(it) }
     fun getDefaultProfileJson(): JSONObject? = getDefaultProfileName()?.let { getSpecificProfileJson(it) }
 
diff --git a/core/src/main/java/info/nightscout/androidaps/interfaces/PumpDescription.kt b/core/src/main/java/info/nightscout/androidaps/interfaces/PumpDescription.kt
index 136e899a2c..003d8f569e 100644
--- a/core/src/main/java/info/nightscout/androidaps/interfaces/PumpDescription.kt
+++ b/core/src/main/java/info/nightscout/androidaps/interfaces/PumpDescription.kt
@@ -63,7 +63,7 @@ class PumpDescription() {
         is30minBasalRatesCapable = false
         isRefillingCapable = true
         isBatteryReplaceable = true
-        storesCarbInfo = true
+        storesCarbInfo = false
         supportsTDDs = false
         needsManualTDDLoad = true
         hasCustomUnreachableAlertCheck = false
diff --git a/core/src/main/java/info/nightscout/androidaps/interfaces/PumpSync.kt b/core/src/main/java/info/nightscout/androidaps/interfaces/PumpSync.kt
index ffc7c04d0a..cc14666dac 100644
--- a/core/src/main/java/info/nightscout/androidaps/interfaces/PumpSync.kt
+++ b/core/src/main/java/info/nightscout/androidaps/interfaces/PumpSync.kt
@@ -344,6 +344,21 @@ interface PumpSync {
      **/
     fun invalidateTemporaryBasal(id: Long): Boolean
 
+    /**
+     * Invalidate of temporary basals that failed to start
+     *
+     * If exists, isValid is set false
+     * If db record doesn't exist data is ignored and false returned
+     *
+     *
+     * @param pumpId        pumpId of temporary basal
+     * @param pumpType      pump type like PumpType.ACCU_CHEK_COMBO
+     * @param pumpSerial    pump serial number
+     * @return true if running record is found and invalidated
+     **/
+
+    fun invalidateTemporaryBasalWithPumpId(pumpId: Long, pumpType: PumpType, pumpSerial: String): Boolean
+
     /**
      * Invalidate of temporary basals that failed to start
      * MDT specific
diff --git a/core/src/main/java/info/nightscout/androidaps/interfaces/Safety.kt b/core/src/main/java/info/nightscout/androidaps/interfaces/Safety.kt
new file mode 100644
index 0000000000..d3bc26ae30
--- /dev/null
+++ b/core/src/main/java/info/nightscout/androidaps/interfaces/Safety.kt
@@ -0,0 +1,3 @@
+package info.nightscout.androidaps.interfaces
+
+interface Safety : ConfigExportImport
\ No newline at end of file
diff --git a/core/src/main/java/info/nightscout/androidaps/interfaces/TreatmentServiceInterface.kt b/core/src/main/java/info/nightscout/androidaps/interfaces/TreatmentServiceInterface.kt
deleted file mode 100644
index 3c6b9ae8eb..0000000000
--- a/core/src/main/java/info/nightscout/androidaps/interfaces/TreatmentServiceInterface.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-package info.nightscout.androidaps.interfaces
-
-import info.nightscout.androidaps.db.Treatment
-
-interface TreatmentServiceInterface {
-
-    fun createOrUpdateMedtronic(treatment: Treatment, fromNightScout: Boolean): UpdateReturn
-    fun createOrUpdate(treatment: Treatment): UpdateReturn
-}
\ No newline at end of file
diff --git a/core/src/main/java/info/nightscout/androidaps/interfaces/TreatmentsInterface.java b/core/src/main/java/info/nightscout/androidaps/interfaces/TreatmentsInterface.java
deleted file mode 100644
index 6c0da50113..0000000000
--- a/core/src/main/java/info/nightscout/androidaps/interfaces/TreatmentsInterface.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package info.nightscout.androidaps.interfaces;
-
-import java.util.List;
-
-import info.nightscout.androidaps.data.DetailedBolusInfo;
-import info.nightscout.androidaps.db.ExtendedBolus;
-import info.nightscout.androidaps.db.TemporaryBasal;
-import info.nightscout.androidaps.db.Treatment;
-import info.nightscout.androidaps.plugins.treatments.TreatmentUpdateReturn;
-
-/**
- * Created by mike on 14.06.2016.
- */
-public interface TreatmentsInterface {
-
-    TreatmentServiceInterface getService();
-
-    @Deprecated
-    List<Treatment> getTreatmentsFromHistoryAfterTimestamp(long timestamp);
-
-    boolean addToHistoryTempBasal(TemporaryBasal tempBasal);
-
-    boolean addToHistoryExtendedBolus(ExtendedBolus extendedBolus);
-
-    boolean addToHistoryTreatment(DetailedBolusInfo detailedBolusInfo, boolean allowUpdate);
-
-    TreatmentUpdateReturn createOrUpdateMedtronic(Treatment treatment, boolean fromNightScout);
-
-}
\ No newline at end of file
diff --git a/core/src/main/java/info/nightscout/androidaps/interfaces/UpdateReturn.kt b/core/src/main/java/info/nightscout/androidaps/interfaces/UpdateReturn.kt
deleted file mode 100644
index f0321ba25a..0000000000
--- a/core/src/main/java/info/nightscout/androidaps/interfaces/UpdateReturn.kt
+++ /dev/null
@@ -1,11 +0,0 @@
-package info.nightscout.androidaps.interfaces
-
-class UpdateReturn(var success: Boolean, var newRecord: Boolean) {
-
-    override fun toString(): String {
-        return "UpdateReturn [" +
-            "newRecord=" + newRecord +
-            ", success=" + success +
-            ']'
-    }
-}
\ No newline at end of file
diff --git a/core/src/main/java/info/nightscout/androidaps/logging/UserEntryLogger.kt b/core/src/main/java/info/nightscout/androidaps/logging/UserEntryLogger.kt
index 9bed01b2f0..3e0e70efcb 100644
--- a/core/src/main/java/info/nightscout/androidaps/logging/UserEntryLogger.kt
+++ b/core/src/main/java/info/nightscout/androidaps/logging/UserEntryLogger.kt
@@ -1,5 +1,6 @@
 package info.nightscout.androidaps.logging
 
+import info.nightscout.androidaps.annotations.OpenForTesting
 import info.nightscout.androidaps.database.AppRepository
 import info.nightscout.androidaps.database.entities.ValueWithUnit
 import info.nightscout.androidaps.database.entities.UserEntry.Action
@@ -14,6 +15,7 @@ import io.reactivex.rxkotlin.subscribeBy
 import javax.inject.Inject
 import javax.inject.Singleton
 
+@OpenForTesting
 @Singleton
 class UserEntryLogger @Inject constructor(
     private val aapsLogger: AAPSLogger,
diff --git a/core/src/main/java/info/nightscout/androidaps/plugins/aps/loop/APSResult.kt b/core/src/main/java/info/nightscout/androidaps/plugins/aps/loop/APSResult.kt
index 39202e1a4b..6c7633e693 100644
--- a/core/src/main/java/info/nightscout/androidaps/plugins/aps/loop/APSResult.kt
+++ b/core/src/main/java/info/nightscout/androidaps/plugins/aps/loop/APSResult.kt
@@ -30,6 +30,7 @@ import kotlin.math.max
 /**
  * Created by mike on 09.06.2016.
  */
+@Suppress("LeakingThis")
 open class APSResult @Inject constructor(val injector: HasAndroidInjector) {
 
     @Inject lateinit var aapsLogger: AAPSLogger
@@ -42,7 +43,7 @@ open class APSResult @Inject constructor(val injector: HasAndroidInjector) {
     @Inject lateinit var dateUtil: DateUtil
 
     var date: Long = 0
-    var reason: String? = null
+    var reason: String = ""
     var rate = 0.0
     var percent = 0
     var usePercent = false
@@ -102,16 +103,16 @@ open class APSResult @Inject constructor(val injector: HasAndroidInjector) {
         val pump = activePlugin.activePump
         if (isChangeRequested) {
             // rate
-            var ret: String = if (rate == 0.0 && duration == 0) "${resourceHelper.gs(R.string.canceltemp)}\n"
+            var ret: String = if (rate == 0.0 && duration == 0) "${resourceHelper.gs(R.string.canceltemp)} "
             else if (rate == -1.0) "${resourceHelper.gs(R.string.let_temp_basal_run)}\n"
-            else if (usePercent) "${resourceHelper.gs(R.string.rate)}: ${DecimalFormatter.to2Decimal(percent.toDouble())}% (${DecimalFormatter.to2Decimal(percent * pump.baseBasalRate / 100.0)} U/h)\n" +
-                "${resourceHelper.gs(R.string.duration)}: ${DecimalFormatter.to2Decimal(duration.toDouble())} min\n"
-            else "${resourceHelper.gs(R.string.rate)}: ${DecimalFormatter.to2Decimal(rate)} U/h (${DecimalFormatter.to2Decimal(rate / pump.baseBasalRate * 100)}%)" +
-                "${resourceHelper.gs(R.string.duration)}: ${DecimalFormatter.to2Decimal(duration.toDouble())} min\n"
+            else if (usePercent) "${resourceHelper.gs(R.string.rate)}: ${DecimalFormatter.to2Decimal(percent.toDouble())}% (${DecimalFormatter.to2Decimal(percent * pump.baseBasalRate / 100.0)} U/h) " +
+                "${resourceHelper.gs(R.string.duration)}: ${DecimalFormatter.to2Decimal(duration.toDouble())} min "
+            else "${resourceHelper.gs(R.string.rate)}: ${DecimalFormatter.to2Decimal(rate)} U/h (${DecimalFormatter.to2Decimal(rate / pump.baseBasalRate * 100)}%) " +
+                "${resourceHelper.gs(R.string.duration)}: ${DecimalFormatter.to2Decimal(duration.toDouble())} min "
             // smb
-            if (smb != 0.0) ret += "SMB: ${DecimalFormatter.toPumpSupportedBolus(smb, activePlugin.activePump, resourceHelper)}\n"
+            if (smb != 0.0) ret += "SMB: ${DecimalFormatter.toPumpSupportedBolus(smb, activePlugin.activePump, resourceHelper)} "
             if (isCarbsRequired) {
-                ret += "$carbsRequiredText\n"
+                ret += "$carbsRequiredText "
             }
 
             // reason
@@ -140,7 +141,7 @@ open class APSResult @Inject constructor(val injector: HasAndroidInjector) {
             }
 
             // reason
-            ret += "<b>" + resourceHelper.gs(R.string.reason) + "</b>: " + reason!!.replace("<", "&lt;").replace(">", "&gt;")
+            ret += "<b>" + resourceHelper.gs(R.string.reason) + "</b>: " + reason.replace("<", "&lt;").replace(">", "&gt;")
             return fromHtml(ret)
         }
         return if (isCarbsRequired) {
@@ -156,7 +157,7 @@ open class APSResult @Inject constructor(val injector: HasAndroidInjector) {
 
     protected fun doClone(newResult: APSResult) {
         newResult.date = date
-        newResult.reason = if (reason != null) reason else null
+        newResult.reason = reason
         newResult.rate = rate
         newResult.duration = duration
         newResult.tempBasalRequested = tempBasalRequested
@@ -332,12 +333,12 @@ open class APSResult @Inject constructor(val injector: HasAndroidInjector) {
                     aapsLogger.debug(LTag.APS, "FALSE: Temp equal")
                     return false
                 }
-                // always report zerotemp
+                // always report zero temp
                 if (percent == 0) {
                     aapsLogger.debug(LTag.APS, "TRUE: Zero temp")
                     return true
                 }
-                // always report hightemp
+                // always report high temp
                 if (pump.pumpDescription.tempBasalStyle == PumpDescription.PERCENT) {
                     val pumpLimit = pump.pumpDescription.pumpType.tbrSettings?.maxDose ?: 0.0
                     if (percent.toDouble() == pumpLimit) {
@@ -368,12 +369,12 @@ open class APSResult @Inject constructor(val injector: HasAndroidInjector) {
                     aapsLogger.debug(LTag.APS, "FALSE: Temp equal")
                     return false
                 }
-                // always report zerotemp
+                // always report zero temp
                 if (rate == 0.0) {
                     aapsLogger.debug(LTag.APS, "TRUE: Zero temp")
                     return true
                 }
-                // always report hightemp
+                // always report high temp
                 if (pump.pumpDescription.tempBasalStyle == PumpDescription.ABSOLUTE) {
                     val pumpLimit = pump.pumpDescription.pumpType.tbrSettings?.maxDose ?: 0.0
                     if (rate == pumpLimit) {
diff --git a/core/src/main/java/info/nightscout/androidaps/plugins/bus/RxBusWrapper.kt b/core/src/main/java/info/nightscout/androidaps/plugins/bus/RxBusWrapper.kt
index a1444e296d..d844d69c85 100644
--- a/core/src/main/java/info/nightscout/androidaps/plugins/bus/RxBusWrapper.kt
+++ b/core/src/main/java/info/nightscout/androidaps/plugins/bus/RxBusWrapper.kt
@@ -1,5 +1,6 @@
 package info.nightscout.androidaps.plugins.bus
 
+import info.nightscout.androidaps.annotations.OpenForTesting
 import info.nightscout.androidaps.events.Event
 import info.nightscout.androidaps.utils.rx.AapsSchedulers
 import io.reactivex.Observable
@@ -7,8 +8,9 @@ import io.reactivex.subjects.PublishSubject
 import javax.inject.Inject
 import javax.inject.Singleton
 
+@OpenForTesting
 @Singleton
-open class RxBusWrapper @Inject constructor(
+class RxBusWrapper @Inject constructor(
     val aapsSchedulers: AapsSchedulers
 ) {
 
diff --git a/core/src/main/java/info/nightscout/androidaps/plugins/common/ManufacturerType.kt b/core/src/main/java/info/nightscout/androidaps/plugins/common/ManufacturerType.kt
index 47b977e5d8..a7ac2b5596 100644
--- a/core/src/main/java/info/nightscout/androidaps/plugins/common/ManufacturerType.kt
+++ b/core/src/main/java/info/nightscout/androidaps/plugins/common/ManufacturerType.kt
@@ -9,5 +9,6 @@ enum class ManufacturerType(val description: String) {
     Animas("Animas"),
     Cellnovo("Cellnovo"),
     Roche("Roche"),
-    Ypsomed("Ypsomed");
+    Ypsomed("Ypsomed"),
+    G2e("G2e");
 }
\ No newline at end of file
diff --git a/core/src/main/java/info/nightscout/androidaps/plugins/configBuilder/ConstraintChecker.kt b/core/src/main/java/info/nightscout/androidaps/plugins/configBuilder/ConstraintChecker.kt
index 99476dff8f..3b47c4670a 100644
--- a/core/src/main/java/info/nightscout/androidaps/plugins/configBuilder/ConstraintChecker.kt
+++ b/core/src/main/java/info/nightscout/androidaps/plugins/configBuilder/ConstraintChecker.kt
@@ -1,6 +1,7 @@
 package info.nightscout.androidaps.plugins.configBuilder
 
 import info.nightscout.androidaps.Constants
+import info.nightscout.androidaps.annotations.OpenForTesting
 import info.nightscout.androidaps.interfaces.Profile
 import info.nightscout.androidaps.interfaces.ActivePlugin
 import info.nightscout.androidaps.interfaces.Constraint
@@ -9,6 +10,7 @@ import info.nightscout.androidaps.interfaces.PluginType
 import javax.inject.Inject
 import javax.inject.Singleton
 
+@OpenForTesting
 @Singleton
 class ConstraintChecker @Inject constructor(private val activePlugin: ActivePlugin) : Constraints {
 
@@ -24,9 +26,6 @@ class ConstraintChecker @Inject constructor(private val activePlugin: ActivePlug
     fun isAutosensModeEnabled(): Constraint<Boolean> =
         isAutosensModeEnabled(Constraint(true))
 
-    fun isAMAModeEnabled(): Constraint<Boolean> =
-        isAMAModeEnabled(Constraint(true))
-
     fun isSMBModeEnabled(): Constraint<Boolean> =
         isSMBModeEnabled(Constraint(true))
 
@@ -100,16 +99,6 @@ class ConstraintChecker @Inject constructor(private val activePlugin: ActivePlug
         return value
     }
 
-    override fun isAMAModeEnabled(value: Constraint<Boolean>): Constraint<Boolean> {
-        val constraintsPlugins = activePlugin.getSpecificPluginsListByInterface(Constraints::class.java)
-        for (p in constraintsPlugins) {
-            val constrain = p as Constraints
-            if (!p.isEnabled(PluginType.CONSTRAINTS)) continue
-            constrain.isAMAModeEnabled(value)
-        }
-        return value
-    }
-
     override fun isSMBModeEnabled(value: Constraint<Boolean>): Constraint<Boolean> {
         val constraintsPlugins = activePlugin.getSpecificPluginsListByInterface(Constraints::class.java)
         for (p in constraintsPlugins) {
diff --git a/core/src/main/java/info/nightscout/androidaps/plugins/configBuilder/RunningConfiguration.kt b/core/src/main/java/info/nightscout/androidaps/plugins/configBuilder/RunningConfiguration.kt
index 7b5cb9c382..709ed1b71e 100644
--- a/core/src/main/java/info/nightscout/androidaps/plugins/configBuilder/RunningConfiguration.kt
+++ b/core/src/main/java/info/nightscout/androidaps/plugins/configBuilder/RunningConfiguration.kt
@@ -36,12 +36,14 @@ class RunningConfiguration @Inject constructor(
                 val sensitivityInterface = activePlugin.activeSensitivity
                 val pumpInterface = activePlugin.activePump
                 val overviewInterface = activePlugin.activeOverview
+                val safetyInterface = activePlugin.activeSafety
 
                 json.put("insulin", insulinInterface.id.value)
                 json.put("insulinConfiguration", insulinInterface.configuration())
                 json.put("sensitivity", sensitivityInterface.id.value)
                 json.put("sensitivityConfiguration", sensitivityInterface.configuration())
                 json.put("overviewConfiguration", overviewInterface.configuration())
+                json.put("safetyConfiguration", safetyInterface.configuration())
                 json.put("pump", pumpInterface.model().description)
             } catch (e: JSONException) {
                 aapsLogger.error("Unhandled exception", e)
@@ -88,5 +90,8 @@ class RunningConfiguration @Inject constructor(
 
         if (configuration.has("overviewConfiguration"))
             activePlugin.activeOverview.applyConfiguration(configuration.getJSONObject("overviewConfiguration"))
+
+        if (configuration.has("safetyConfiguration"))
+            activePlugin.activeSafety.applyConfiguration(configuration.getJSONObject("safetyConfiguration"))
     }
 }
\ No newline at end of file
diff --git a/core/src/main/java/info/nightscout/androidaps/plugins/constraints/versionChecker/VersionCheckerUtils.kt b/core/src/main/java/info/nightscout/androidaps/plugins/constraints/versionChecker/VersionCheckerUtils.kt
index edf712bb52..e58fce4dd8 100644
--- a/core/src/main/java/info/nightscout/androidaps/plugins/constraints/versionChecker/VersionCheckerUtils.kt
+++ b/core/src/main/java/info/nightscout/androidaps/plugins/constraints/versionChecker/VersionCheckerUtils.kt
@@ -1,7 +1,6 @@
 package info.nightscout.androidaps.plugins.constraints.versionChecker
 
 import android.content.Context
-import android.net.ConnectivityManager
 import info.nightscout.androidaps.core.R
 import info.nightscout.androidaps.interfaces.Config
 import info.nightscout.androidaps.logging.AAPSLogger
@@ -9,6 +8,7 @@ import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification
 import info.nightscout.androidaps.plugins.general.overview.notifications.Notification
+import info.nightscout.androidaps.receivers.ReceiverStatusStore
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import info.nightscout.androidaps.utils.sharedPreferences.SP
 import java.io.IOException
@@ -24,24 +24,28 @@ class VersionCheckerUtils @Inject constructor(
     val resourceHelper: ResourceHelper,
     val rxBus: RxBusWrapper,
     private val config: Config,
-    val context: Context
+    val context: Context,
+    val receiverStatusStore: ReceiverStatusStore
 ) {
 
-    // check network connection
-    fun isConnected(): Boolean {
-        val connMgr = context.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
-        return connMgr.activeNetworkInfo?.isConnected ?: false
-    }
+    fun isConnected(): Boolean = receiverStatusStore.isConnected
 
     fun triggerCheckVersion() {
 
         if (!sp.contains(R.string.key_last_time_this_version_detected)) {
             // On a new installation, set it as 30 days old in order to warn that there is a new version.
-            sp.putLong(R.string.key_last_time_this_version_detected, System.currentTimeMillis() - TimeUnit.DAYS.toMillis(30))
+            sp.putLong(
+                R.string.key_last_time_this_version_detected,
+                System.currentTimeMillis() - TimeUnit.DAYS.toMillis(30)
+            )
         }
 
         // If we are good, only check once every day.
-        if (System.currentTimeMillis() > sp.getLong(R.string.key_last_time_this_version_detected, 0) + CHECK_EVERY) {
+        if (System.currentTimeMillis() > sp.getLong(
+                R.string.key_last_time_this_version_detected,
+                0
+            ) + CHECK_EVERY
+        ) {
             checkVersion()
         }
     }
@@ -49,7 +53,8 @@ class VersionCheckerUtils @Inject constructor(
     private fun checkVersion() = if (isConnected()) {
         Thread {
             try {
-                val version: String? = findVersion(URL("https://raw.githubusercontent.com/nightscout/AndroidAPS/master/app/build.gradle").readText())
+                val version: String? =
+                    findVersion(URL("https://raw.githubusercontent.com/nightscout/AndroidAPS/master/app/build.gradle").readText())
                 compareWithCurrentVersion(version, config.VERSION_NAME)
             } catch (e: IOException) {
                 aapsLogger.error(LTag.CORE, "Github master version check error: $e")
@@ -81,8 +86,8 @@ class VersionCheckerUtils @Inject constructor(
 
             (newElem - currElem).let {
                 when {
-                    it > 0  -> return onNewVersionDetected(currentVersion, newVersion)
-                    it < 0  -> return onOlderVersionDetected()
+                    it > 0 -> return onNewVersionDetected(currentVersion, newVersion)
+                    it < 0 -> return onOlderVersionDetected()
                     it == 0 -> Unit
                 }
             }
@@ -107,7 +112,11 @@ class VersionCheckerUtils @Inject constructor(
         val now = System.currentTimeMillis()
         if (now > sp.getLong(R.string.key_last_versionchecker_warning, 0) + WARN_EVERY) {
             aapsLogger.debug(LTag.CORE, "Version $currentVersion outdated. Found $newVersion")
-            val notification = Notification(Notification.NEW_VERSION_DETECTED, resourceHelper.gs(R.string.versionavailable, newVersion.toString()), Notification.LOW)
+            val notification = Notification(
+                Notification.NEW_VERSION_DETECTED,
+                resourceHelper.gs(R.string.versionavailable, newVersion.toString()),
+                Notification.LOW
+            )
             rxBus.send(EventNewNotification(notification))
             sp.putLong(R.string.key_last_versionchecker_warning, now)
         }
@@ -126,7 +135,8 @@ class VersionCheckerUtils @Inject constructor(
 
     fun findVersion(file: String?): String? {
         val regex = "(.*)version(.*)\"(((\\d+)\\.)+(\\d+))\"(.*)".toRegex()
-        return file?.lines()?.filter { regex.matches(it) }?.mapNotNull { regex.matchEntire(it)?.groupValues?.getOrNull(3) }?.firstOrNull()
+        return file?.lines()?.filter { regex.matches(it) }
+            ?.mapNotNull { regex.matchEntire(it)?.groupValues?.getOrNull(3) }?.firstOrNull()
     }
 
     companion object {
@@ -142,14 +152,18 @@ fun String.numericVersionPart(): String =
 
 @Suppress("unused") fun findVersion(file: String?): String? {
     val regex = "(.*)version(.*)\"(((\\d+)\\.)+(\\d+))\"(.*)".toRegex()
-    return file?.lines()?.filter { regex.matches(it) }?.mapNotNull { regex.matchEntire(it)?.groupValues?.getOrNull(3) }?.firstOrNull()
+    return file?.lines()?.filter { regex.matches(it) }
+        ?.mapNotNull { regex.matchEntire(it)?.groupValues?.getOrNull(3) }?.firstOrNull()
 }
 
-@Deprecated(replaceWith = ReplaceWith("numericVersionPart()"), message = "Will not work if RCs have another index number in it.")
+@Deprecated(
+    replaceWith = ReplaceWith("numericVersionPart()"),
+    message = "Will not work if RCs have another index number in it."
+)
 fun String.versionStrip() = this.mapNotNull {
     when (it) {
         in '0'..'9' -> it
-        '.' -> it
+        '.'         -> it
         else        -> null
     }
 }.joinToString(separator = "")
\ No newline at end of file
diff --git a/core/src/main/java/info/nightscout/androidaps/plugins/general/actions/defs/CustomActionType.kt b/core/src/main/java/info/nightscout/androidaps/plugins/general/actions/defs/CustomActionType.kt
index fb472d5592..5ffbb25b6b 100644
--- a/core/src/main/java/info/nightscout/androidaps/plugins/general/actions/defs/CustomActionType.kt
+++ b/core/src/main/java/info/nightscout/androidaps/plugins/general/actions/defs/CustomActionType.kt
@@ -1,5 +1,5 @@
 package info.nightscout.androidaps.plugins.general.actions.defs
 
 interface CustomActionType {
-    val key: String?
+    fun getKey(): String
 }
\ No newline at end of file
diff --git a/core/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/PrefFileListProvider.kt b/core/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/PrefFileListProvider.kt
index 86208dce3e..92c3fc4b08 100644
--- a/core/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/PrefFileListProvider.kt
+++ b/core/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/PrefFileListProvider.kt
@@ -1,6 +1,7 @@
 package info.nightscout.androidaps.plugins.general.maintenance
 
 import android.os.Environment
+import info.nightscout.androidaps.annotations.OpenForTesting
 import info.nightscout.androidaps.core.R
 import info.nightscout.androidaps.interfaces.Config
 import info.nightscout.androidaps.plugins.constraints.versionChecker.VersionCheckerUtils
@@ -17,6 +18,8 @@ import javax.inject.Inject
 import javax.inject.Singleton
 import kotlin.math.abs
 
+@Suppress("SpellCheckingInspection")
+@OpenForTesting
 @Singleton
 class PrefFileListProvider @Inject constructor(
     private val resourceHelper: ResourceHelper,
@@ -26,12 +29,15 @@ class PrefFileListProvider @Inject constructor(
     private val storage: Storage,
     private val versionCheckerUtils: VersionCheckerUtils
 ) {
+    @Suppress("DEPRECATION")
+    private val path = File(Environment.getExternalStorageDirectory().toString())
+    private val aapsPath = File(path, "AAPS" + File.separator + "preferences")
+    private val exportsPath = File(path, "AAPS" + File.separator + "exports")
+    private val tempPath = File(path, "AAPS" + File.separator + "temp")
+    private val extraPath = File(path, "AAPS" + File.separator + "extra")
 
     companion object {
 
-        private val path = File(Environment.getExternalStorageDirectory().toString())
-        private val aapsPath = File(path, "AAPS" + File.separator + "preferences")
-        private val exportsPath = File(path, "AAPS" + File.separator + "exports")
         private const val IMPORT_AGE_NOT_YET_OLD_DAYS = 60
     }
 
@@ -90,13 +96,28 @@ class PrefFileListProvider @Inject constructor(
         return File(path, resourceHelper.gs(R.string.app_name) + "Preferences")
     }
 
-    fun ensureExportDirExists() {
+    fun ensureExportDirExists(): File {
         if (!aapsPath.exists()) {
             aapsPath.mkdirs()
         }
         if (!exportsPath.exists()) {
             exportsPath.mkdirs()
         }
+        return exportsPath
+    }
+
+    fun ensureTempDirExists(): File {
+        if (!tempPath.exists()) {
+            tempPath.mkdirs()
+        }
+        return tempPath
+    }
+
+    fun ensureExtraDirExists(): File {
+        if (!extraPath.exists()) {
+            extraPath.mkdirs()
+        }
+        return extraPath
     }
 
     fun newExportFile(): File {
@@ -104,7 +125,7 @@ class PrefFileListProvider @Inject constructor(
         return File(aapsPath, timeLocal + "_" + config.FLAVOR + ".json")
     }
 
-    fun newExportXmlFile(): File {
+    fun newExportCsvFile(): File {
         val timeLocal = LocalDateTime.now().toString(DateTimeFormat.forPattern("yyyy-MM-dd'_'HHmmss"))
         return File(exportsPath, timeLocal + "_UserEntry.csv")
     }
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 77c361d869..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
@@ -81,7 +81,7 @@ class PrefImportListActivity : DaggerAppCompatActivity() {
                 filelistName.text = prefFile.file.name
                 filelistName.tag = prefFile
 
-                filelistDir.text = resourceHelper.gs(R.string.in_directory, prefFile.file.parentFile.absolutePath)
+                filelistDir.text = resourceHelper.gs(R.string.in_directory, prefFile.file.parentFile?.absolutePath)
 
                 val visible = (prefFile.handler != PrefsFormatsHandler.CLASSIC).toVisibility()
                 metalineName.visibility = visible
@@ -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/plugins/general/maintenance/formats/EncryptedPrefsFormat.kt b/core/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/formats/EncryptedPrefsFormat.kt
index 575de38876..6afeb854b5 100644
--- a/core/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/formats/EncryptedPrefsFormat.kt
+++ b/core/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/formats/EncryptedPrefsFormat.kt
@@ -105,7 +105,6 @@ class EncryptedPrefsFormat @Inject constructor(
         }
     }
 
-    @kotlin.ExperimentalStdlibApi
     override fun loadPreferences(file: File, masterPassword: String?): Prefs {
 
         val entries: MutableMap<String, String> = mutableMapOf()
@@ -214,7 +213,7 @@ class EncryptedPrefsFormat @Inject constructor(
         } catch (e: IOException) {
             throw PrefIOError(file.absolutePath)
         } catch (e: JSONException) {
-            throw PrefFormatError("Mallformed preferences JSON file: $e")
+            throw PrefFormatError("Malformed preferences JSON file: $e")
         }
     }
 
diff --git a/core/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphExtensions/Scale.java b/core/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphExtensions/Scale.java
deleted file mode 100644
index 53fa04af6b..0000000000
--- a/core/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphExtensions/Scale.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package info.nightscout.androidaps.plugins.general.overview.graphExtensions;
-
-/**
- * Created by mike on 18.10.2017.
- */
-
-public class Scale {
-    private double multiplier;
-    private final double shift;
-
-    public Scale() {
-        shift = 0;
-    }
-
-    public Scale(double shift) {
-        this.shift = shift;
-    }
-
-    public void setMultiplier(double value) {
-        this.multiplier = value;
-    }
-
-    public double transform(double original) {
-        return original * multiplier + shift;
-    }
-
-    public double getShift() {
-        return shift;
-    }
-}
diff --git a/core/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphExtensions/Scale.kt b/core/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphExtensions/Scale.kt
new file mode 100644
index 0000000000..0c11b7e285
--- /dev/null
+++ b/core/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphExtensions/Scale.kt
@@ -0,0 +1,8 @@
+package info.nightscout.androidaps.plugins.general.overview.graphExtensions
+
+class Scale(var shift: Double = 0.0, var multiplier: Double = 0.0) {
+
+    fun transform(original: Double): Double {
+        return original * multiplier + shift
+    }
+}
\ No newline at end of file
diff --git a/core/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/AutosensDataStore.kt b/core/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/AutosensDataStore.kt
index 5cbfe021a3..e1b9401ad8 100644
--- a/core/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/AutosensDataStore.kt
+++ b/core/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/AutosensDataStore.kt
@@ -1,6 +1,7 @@
 package info.nightscout.androidaps.plugins.iob.iobCobCalculator
 
 import androidx.collection.LongSparseArray
+import info.nightscout.androidaps.annotations.OpenForTesting
 import info.nightscout.androidaps.data.InMemoryGlucoseValue
 import info.nightscout.androidaps.database.AppRepository
 import info.nightscout.androidaps.database.entities.GlucoseValue
@@ -14,6 +15,7 @@ import info.nightscout.androidaps.utils.T
 import kotlin.math.abs
 import kotlin.math.roundToLong
 
+@OpenForTesting
 class AutosensDataStore {
 
     private val dataLock = Any()
@@ -235,7 +237,10 @@ class AutosensDataStore {
         }
         val newBucketedData = ArrayList<InMemoryGlucoseValue>()
         var currentTime = bgReadings[0].timestamp - bgReadings[0].timestamp % T.mins(5).msecs()
-        currentTime = adjustToReferenceTime(currentTime)
+        val adjustedTime = adjustToReferenceTime(currentTime)
+        // after adjusting time may be newer. In this case use T-5min
+        if (adjustedTime > currentTime) currentTime = adjustedTime - T.mins(5).msecs()
+        else currentTime = adjustedTime
         aapsLogger.debug("Adjusted time " + dateUtil.dateAndTimeAndSecondsString(currentTime))
         //log.debug("First reading: " + new Date(currentTime).toLocaleString());
         while (true) {
diff --git a/core/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/AutosensResult.java b/core/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/AutosensResult.java
deleted file mode 100644
index e1debef726..0000000000
--- a/core/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/AutosensResult.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package info.nightscout.androidaps.plugins.iob.iobCobCalculator;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-import org.slf4j.LoggerFactory;
-
-import info.nightscout.androidaps.logging.LTag;
-
-/**
- * Created by mike on 06.01.2017.
- */
-public class AutosensResult {
-
-    //default values to show when autosens algorithm is not called
-    public double ratio = 1d;
-    public double carbsAbsorbed = 0d;
-    public String sensResult = "autosens not available";
-    public String pastSensitivity = "";
-    public String ratioLimit = "";
-
-    public JSONObject json() {
-        JSONObject ret = new JSONObject();
-        try {
-            ret.put("ratio", ratio);
-            ret.put("ratioLimit", ratioLimit);
-            ret.put("pastSensitivity", pastSensitivity);
-            ret.put("sensResult", sensResult);
-            ret.put("ratio", ratio);
-        } catch (JSONException e) {
-            LoggerFactory.getLogger(LTag.CORE.getTag()).error("Unhandled exception", e);
-        }
-        return ret;
-    }
-
-    @Override
-    public String toString() {
-        return json().toString();
-    }
-}
diff --git a/core/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/AutosensResult.kt b/core/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/AutosensResult.kt
new file mode 100644
index 0000000000..f447651e29
--- /dev/null
+++ b/core/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/AutosensResult.kt
@@ -0,0 +1,22 @@
+package info.nightscout.androidaps.plugins.iob.iobCobCalculator
+
+import org.json.JSONObject
+
+class AutosensResult {
+
+    //default values to show when autosens algorithm is not called
+    var ratio = 1.0
+    var carbsAbsorbed = 0.0
+    var sensResult = "autosens not available"
+    var pastSensitivity = ""
+    var ratioLimit = ""
+
+    fun json(): JSONObject = JSONObject()
+        .put("ratio", ratio)
+        .put("ratioLimit", ratioLimit)
+        .put("pastSensitivity", pastSensitivity)
+        .put("sensResult", sensResult)
+        .put("ratio", ratio)
+
+    override fun toString(): String = json().toString()
+}
\ No newline at end of file
diff --git a/core/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/CobInfo.kt b/core/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/CobInfo.kt
index 2676fde7b6..59d9bc1111 100644
--- a/core/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/CobInfo.kt
+++ b/core/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/CobInfo.kt
@@ -1,9 +1,12 @@
 package info.nightscout.androidaps.plugins.iob.iobCobCalculator
 
+import info.nightscout.androidaps.core.R
+import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.utils.DecimalFormatter
+import info.nightscout.androidaps.utils.resources.ResourceHelper
 
 /** All COB up to now, including carbs not yet processed by IobCob calculation.  */
-class CobInfo(val displayCob: Double?, val futureCarbs: Double) {
+class CobInfo(val timestamp: Long, val displayCob: Double?, val futureCarbs: Double) {
 
     fun generateCOBString(): String {
         var cobStringResult = "--g"
@@ -15,4 +18,13 @@ class CobInfo(val displayCob: Double?, val futureCarbs: Double) {
         }
         return cobStringResult
     }
-}
\ No newline at end of file
+
+    fun displayText(resourceHelper: ResourceHelper, dateUtil: DateUtil, isDev: Boolean): String? =
+        if (displayCob != null) {
+            var cobText = resourceHelper.gs(R.string.format_carbs, displayCob.toInt())
+            if (futureCarbs > 0) cobText += "(" + DecimalFormatter.to0Decimal(futureCarbs) + ")"
+            // This is only temporary for debugging
+            if (isDev) cobText += "\n" + dateUtil.timeStringWithSeconds(timestamp)
+            cobText
+        } else null
+}
diff --git a/core/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/data/AutosensData.java b/core/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/data/AutosensData.java
index e3b223937b..bad39f9289 100644
--- a/core/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/data/AutosensData.java
+++ b/core/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/data/AutosensData.java
@@ -108,7 +108,7 @@ public class AutosensData implements DataPointWithLabelInterface {
     @NonNull @Override
     public String toString() {
         return String.format(Locale.ENGLISH, "AutosensData: %s pastSensitivity=%s  delta=%.02f  avgDelta=%.02f bgi=%.02f deviation=%.02f avgDeviation=%.02f absorbed=%.02f carbsFromBolus=%.02f cob=%.02f autosensRatio=%.02f slopeFromMaxDeviation=%.02f slopeFromMinDeviation=%.02f activeCarbsList=%s",
-                dateUtil.dateAndTimeString(time), pastSensitivity, delta, avgDelta, bgi, deviation, avgDeviation, absorbed, carbsFromBolus, cob, autosensResult.ratio, slopeFromMaxDeviation, slopeFromMinDeviation, activeCarbsList.toString());
+                dateUtil.dateAndTimeString(time), pastSensitivity, delta, avgDelta, bgi, deviation, avgDeviation, absorbed, carbsFromBolus, cob, autosensResult.getRatio(), slopeFromMaxDeviation, slopeFromMinDeviation, activeCarbsList.toString());
     }
 
     public List<CarbsInPast> cloneCarbsList() {
diff --git a/core/src/main/java/info/nightscout/androidaps/plugins/pump/PumpSyncImplementation.kt b/core/src/main/java/info/nightscout/androidaps/plugins/pump/PumpSyncImplementation.kt
index 4ea4d4d712..9bef19b5c2 100644
--- a/core/src/main/java/info/nightscout/androidaps/plugins/pump/PumpSyncImplementation.kt
+++ b/core/src/main/java/info/nightscout/androidaps/plugins/pump/PumpSyncImplementation.kt
@@ -11,6 +11,7 @@ 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.logging.UserEntryLogger
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification
 import info.nightscout.androidaps.plugins.general.overview.notifications.Notification
@@ -30,7 +31,8 @@ class PumpSyncImplementation @Inject constructor(
     private val rxBus: RxBusWrapper,
     private val resourceHelper: ResourceHelper,
     private val profileFunction: ProfileFunction,
-    private val repository: AppRepository
+    private val repository: AppRepository,
+    private val uel: UserEntryLogger
 ) : PumpSync {
 
     private val disposable = CompositeDisposable()
@@ -68,9 +70,9 @@ class PumpSyncImplementation @Inject constructor(
             return true
         }
 
-        if (type.description != storedType || serialNumber != storedSerial)
+        if ((type.description != storedType || serialNumber != storedSerial) && timestamp >= storedTimestamp)
             rxBus.send(EventNewNotification(Notification(Notification.WRONG_PUMP_DATA, resourceHelper.gs(R.string.wrong_pump_data), Notification.URGENT)))
-        aapsLogger.error(LTag.PUMP, "Ignoring pump history record  Allowed: ${dateUtil.dateAndTimeAndSecondsString(storedTimestamp)} $storedType $storedSerial Received: $timestamp ${dateUtil.dateAndTimeAndSecondsString(timestamp)}${type.description} $serialNumber")
+        aapsLogger.error(LTag.PUMP, "Ignoring pump history record  Allowed: ${dateUtil.dateAndTimeAndSecondsString(storedTimestamp)} $storedType $storedSerial Received: $timestamp ${dateUtil.dateAndTimeAndSecondsString(timestamp)} ${type.description} $serialNumber")
         return false
     }
 
@@ -213,6 +215,7 @@ class PumpSyncImplementation @Inject constructor(
                 pumpType = pumpType.toDbPumpType(),
                 pumpSerial = pumpSerial)
         )
+        uel.log(UserEntry.Action.CAREPORTAL, pumpType.source, note, ValueWithUnit.Timestamp(timestamp), ValueWithUnit.TherapyEventType(type.toDBbEventType()))
         repository.runTransactionForResult(InsertIfNewByTimestampTherapyEventTransaction(therapyEvent))
             .doOnError {
                 aapsLogger.error(LTag.DATABASE, "Error while saving TherapyEvent", it)
@@ -330,6 +333,19 @@ class PumpSyncImplementation @Inject constructor(
             }
     }
 
+    override fun invalidateTemporaryBasalWithPumpId(pumpId: Long, pumpType: PumpType, pumpSerial: String): Boolean {
+        repository.runTransactionForResult(InvalidateTemporaryBasalTransactionWithPumpId(pumpId, pumpType.toDbPumpType(),
+                                                                                         pumpSerial))
+            .doOnError { aapsLogger.error(LTag.DATABASE, "Error while invalidating TemporaryBasal", it) }
+            .blockingGet()
+            .also { result ->
+                result.invalidated.forEach {
+                    aapsLogger.debug(LTag.DATABASE, "Invalidated TemporaryBasal $it")
+                }
+                return result.invalidated.size > 0
+            }
+    }
+
     override fun invalidateTemporaryBasalWithTempId(temporaryId: Long): Boolean {
         repository.runTransactionForResult(InvalidateTemporaryBasalWithTempIdTransaction(temporaryId))
             .doOnError { aapsLogger.error(LTag.DATABASE, "Error while invalidating TemporaryBasal", it) }
diff --git a/core/src/main/java/info/nightscout/androidaps/plugins/pump/common/bolusInfo/DetailedBolusInfoStorage.kt b/core/src/main/java/info/nightscout/androidaps/plugins/pump/common/bolusInfo/DetailedBolusInfoStorage.kt
index 062d41191f..41e55e4844 100644
--- a/core/src/main/java/info/nightscout/androidaps/plugins/pump/common/bolusInfo/DetailedBolusInfoStorage.kt
+++ b/core/src/main/java/info/nightscout/androidaps/plugins/pump/common/bolusInfo/DetailedBolusInfoStorage.kt
@@ -1,5 +1,6 @@
 package info.nightscout.androidaps.plugins.pump.common.bolusInfo
 
+import info.nightscout.androidaps.annotations.OpenForTesting
 import info.nightscout.androidaps.data.DetailedBolusInfo
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
@@ -9,6 +10,7 @@ import javax.inject.Inject
 import javax.inject.Singleton
 import kotlin.math.abs
 
+@OpenForTesting
 @Singleton
 class DetailedBolusInfoStorage @Inject constructor(
     val aapsLogger: AAPSLogger
@@ -29,7 +31,7 @@ class DetailedBolusInfoStorage @Inject constructor(
             val d = store[i]
             //aapsLogger.debug(LTag.PUMP, "Existing bolus info: " + store[i])
             if (bolusTime > d.timestamp - T.mins(1).msecs() && bolusTime < d.timestamp + T.mins(1).msecs() && abs(store[i].insulin - bolus) < 0.01) {
-                aapsLogger.debug(LTag.PUMP, "Using & removing bolus info: ${store[i]}")
+                aapsLogger.debug(LTag.PUMP, "Using & removing bolus info for time $bolusTime: ${store[i]}")
                 store.removeAt(i)
                 return d
             }
@@ -38,22 +40,22 @@ class DetailedBolusInfoStorage @Inject constructor(
         for (i in store.indices) {
             val d = store[i]
             if (bolusTime > d.timestamp - T.mins(1).msecs() && bolusTime < d.timestamp + T.mins(1).msecs() && bolus <= store[i].insulin + 0.01) {
-                aapsLogger.debug(LTag.PUMP, "Using TIME-ONLY & removing bolus info: ${store[i]}")
+                aapsLogger.debug(LTag.PUMP, "Using TIME-ONLY & removing bolus info for time $bolusTime: ${store[i]}")
                 store.removeAt(i)
                 return d
             }
         }
         // If not found, use last record if amount is the same
-        if (store.size > 0) {
-            val d = store[store.size - 1]
-            if (abs(d.insulin - bolus) < 0.01) {
-                aapsLogger.debug(LTag.PUMP, "Using LAST & removing bolus info: $d")
-                store.removeAt(store.size - 1)
-                return d
-            }
-        }
+        // if (store.size > 0) {
+        //     val d = store[store.size - 1]
+        //     if (abs(d.insulin - bolus) < 0.01) {
+        //         aapsLogger.debug(LTag.PUMP, "Using LAST & removing bolus info for time $bolusTime: $d")
+        //         store.removeAt(store.size - 1)
+        //         return d
+        //     }
+        // }
         //Not found
-        //aapsLogger.debug(LTag.PUMP, "Bolus info not found")
+        aapsLogger.debug(LTag.PUMP, "Bolus info not found for time $bolusTime")
         return null
     }
 }
\ No newline at end of file
diff --git a/core/src/main/java/info/nightscout/androidaps/plugins/pump/common/bolusInfo/TemporaryBasalStorage.kt b/core/src/main/java/info/nightscout/androidaps/plugins/pump/common/bolusInfo/TemporaryBasalStorage.kt
index 0a5ac50f67..78c074e41a 100644
--- a/core/src/main/java/info/nightscout/androidaps/plugins/pump/common/bolusInfo/TemporaryBasalStorage.kt
+++ b/core/src/main/java/info/nightscout/androidaps/plugins/pump/common/bolusInfo/TemporaryBasalStorage.kt
@@ -1,5 +1,6 @@
 package info.nightscout.androidaps.plugins.pump.common.bolusInfo
 
+import info.nightscout.androidaps.annotations.OpenForTesting
 import info.nightscout.androidaps.interfaces.PumpSync
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
@@ -9,6 +10,7 @@ import javax.inject.Inject
 import javax.inject.Singleton
 import kotlin.math.abs
 
+@OpenForTesting
 @Singleton
 class TemporaryBasalStorage @Inject constructor(
     val aapsLogger: AAPSLogger
diff --git a/core/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/PumpCapability.kt b/core/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/PumpCapability.kt
index b8e74bb0a6..1ceac452df 100644
--- a/core/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/PumpCapability.kt
+++ b/core/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/PumpCapability.kt
@@ -23,6 +23,7 @@ enum class PumpCapability {
     MedtronicCapabilities(arrayOf(Bolus, TempBasal, BasalProfileSet, Refill, ReplaceBattery, TDD)),
     OmnipodCapabilities(arrayOf(Bolus, TempBasal, BasalProfileSet, BasalRate30min)),
     YpsomedCapabilities(arrayOf(Bolus, ExtendedBolus, TempBasal, BasalProfileSet, Refill, ReplaceBattery, TDD, ManualTDDLoad)),  // BasalRates (separately grouped)
+    DiaconnCapabilities(arrayOf(Bolus, ExtendedBolus, TempBasal, BasalProfileSet, Refill, ReplaceBattery, TDD, ManualTDDLoad)), //
     BasalRate_Duration15minAllowed,
     BasalRate_Duration30minAllowed,
     BasalRate_Duration15and30minAllowed(arrayOf(BasalRate_Duration15minAllowed, BasalRate_Duration30minAllowed)),
diff --git a/core/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/PumpType.kt b/core/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/PumpType.kt
index 387386f927..daadd2dc78 100644
--- a/core/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/PumpType.kt
+++ b/core/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/PumpType.kt
@@ -2,6 +2,7 @@ package info.nightscout.androidaps.plugins.pump.common.defs
 
 import info.nightscout.androidaps.core.R
 import info.nightscout.androidaps.database.embedments.InterfaceIDs
+import info.nightscout.androidaps.database.entities.UserEntry.Sources
 import info.nightscout.androidaps.plugins.common.ManufacturerType
 import info.nightscout.androidaps.utils.Round
 import info.nightscout.androidaps.utils.resources.ResourceHelper
@@ -50,7 +51,8 @@ enum class PumpType {
         baseBasalMinValue = 0.01,
         baseBasalStep = 0.01,
         baseBasalSpecialSteps = DoseStepSize.ComboBasal,
-        pumpCapability = PumpCapability.ComboCapabilities),
+        pumpCapability = PumpCapability.ComboCapabilities,
+        source = Sources.Combo),
     ACCU_CHEK_SPIRIT(description = "Accu-Chek Spirit",
         manufacturer = ManufacturerType.Roche,
         model = "Spirit",
@@ -90,7 +92,8 @@ enum class PumpType {
         baseBasalMaxValue = null,
         baseBasalStep = 0.01,
         baseBasalSpecialSteps = DoseStepSize.InsightBasal,
-        pumpCapability = PumpCapability.InsightCapabilities),
+        pumpCapability = PumpCapability.InsightCapabilities,
+        source = Sources.Insight),
     ACCU_CHEK_SOLO(description = "Accu-Chek Solo",
         manufacturer = ManufacturerType.Roche,
         model = "Solo",
@@ -133,7 +136,8 @@ enum class PumpType {
         baseBasalMinValue = 0.04,
         baseBasalStep = 0.01,
         baseBasalSpecialSteps = null,
-        pumpCapability = PumpCapability.DanaCapabilities),
+        pumpCapability = PumpCapability.DanaCapabilities,
+        source = Sources.DanaR),
     DANA_R_KOREAN(description = "DanaR Korean",
         manufacturer = ManufacturerType.Sooil,
         model = "DanaRKorean",
@@ -146,7 +150,8 @@ enum class PumpType {
         baseBasalMinValue = 0.1,
         baseBasalStep = 0.01,
         baseBasalSpecialSteps = null,
-        pumpCapability = PumpCapability.DanaCapabilities),
+        pumpCapability = PumpCapability.DanaCapabilities,
+        source = Sources.DanaRC),
     DANA_RS(description = "DanaRS",
         manufacturer = ManufacturerType.Sooil,
         model = "DanaRS",
@@ -159,10 +164,11 @@ enum class PumpType {
         baseBasalMinValue = 0.04,
         baseBasalStep = 0.01,
         baseBasalSpecialSteps = null,
-        pumpCapability = PumpCapability.DanaWithHistoryCapabilities),
+        pumpCapability = PumpCapability.DanaWithHistoryCapabilities,
+        source = Sources.DanaRS),
     DANA_RS_KOREAN(description = "DanaRSKorean", model = "DanaRSKorean", parent = DANA_RS),
-    DANA_I(description = "DanaI", model = "DanaI", parent = DANA_RS),
-    DANA_RV2(description = "DanaRv2", model = "DanaRv2", parent = DANA_RS),
+    DANA_I(description = "DanaI", model = "DanaI", parent = DANA_RS, source = Sources.DanaI),
+    DANA_RV2(description = "DanaRv2", model = "DanaRv2", parent = DANA_RS, source = Sources.DanaRv2),
     OMNIPOD_EROS(description = "Omnipod Eros",
         manufacturer = ManufacturerType.Insulet,
         model = "Eros",
@@ -177,7 +183,8 @@ enum class PumpType {
         baseBasalStep = 0.05,
         baseBasalSpecialSteps = null,
         pumpCapability = PumpCapability.OmnipodCapabilities,
-        hasCustomUnreachableAlertCheck = true),
+        hasCustomUnreachableAlertCheck = true,
+        source = Sources.OmnipodEros),
     OMNIPOD_DASH(description = "Omnipod Dash",
         manufacturer = ManufacturerType.Insulet,
         model = "Dash",
@@ -205,7 +212,8 @@ enum class PumpType {
         baseBasalMinValue = 0.05,
         baseBasalStep = 0.05,
         baseBasalSpecialSteps = null,
-        pumpCapability = PumpCapability.MedtronicCapabilities),
+        pumpCapability = PumpCapability.MedtronicCapabilities,
+        source = Sources.Medtronic),
     MEDTRONIC_515_715(description = "Medtronic 515/715",
         model = "515/715",
         parent = MEDTRONIC_512_712),
@@ -224,7 +232,8 @@ enum class PumpType {
         baseBasalMinValue = 0.025,
         baseBasalStep = 0.025,
         baseBasalSpecialSteps = DoseStepSize.MedtronicVeoBasal,
-        pumpCapability = PumpCapability.MedtronicCapabilities),
+        pumpCapability = PumpCapability.MedtronicCapabilities,
+        source = Sources.Medtronic),
     MEDTRONIC_554_754_VEO(description = "Medtronic 554/754 (Veo)", model = "554/754 (Veo)", parent = MEDTRONIC_523_723_REVEL),
     MEDTRONIC_640G(description = "Medtronic 640G",
         manufacturer = ManufacturerType.Medtronic,
@@ -284,7 +293,25 @@ enum class PumpType {
         model = "USER",
         tbrSettings = DoseSettings(1.0, 15, 24 * 60, 0.0, 500.0),
         extendedBolusSettings = DoseSettings(0.1, 15, 12 * 60, 0.1),
-        pumpCapability = PumpCapability.MDI);
+        pumpCapability = PumpCapability.MDI,
+        source = Sources.MDI),
+
+    //Diaconn Pump
+    DIACONN_G8(description = "DiaconnG8",
+        manufacturer = ManufacturerType.G2e,
+        model = "Diaconn G8",
+        bolusSize = 0.01,
+        specialBolusSize = null,
+        extendedBolusSettings = DoseSettings(0.05, 10, 5 * 60, 0.05),
+        pumpTempBasalType = PumpTempBasalType.Absolute,
+        tbrSettings = DoseSettings(0.01, 30, 24 * 60, 0.0, 6.0),
+        specialBasalDurations = PumpCapability.BasalRate_Duration30minAllowed,
+        baseBasalMinValue = 0.05,
+        baseBasalMaxValue = 3.0,
+        baseBasalStep = 0.01,
+        baseBasalSpecialSteps = null,
+        pumpCapability = PumpCapability.DanaWithHistoryCapabilities,
+        source = Sources.DiaconnG8);
 
     val description: String
     var manufacturer: ManufacturerType? = null
@@ -326,6 +353,7 @@ enum class PumpType {
     var hasCustomUnreachableAlertCheck = false
         private set
     private var parent: PumpType? = null
+    val source: Sources
 
     companion object {
 
@@ -333,9 +361,10 @@ enum class PumpType {
             values().firstOrNull { it.description == desc } ?: GENERIC_AAPS
     }
 
-    constructor(description: String, model: String, parent: PumpType, pumpCapability: PumpCapability? = null) {
+    constructor(description: String, model: String, parent: PumpType, pumpCapability: PumpCapability? = null, source: Sources? = null) {
         this.description = description
         this.parent = parent
+        this.source = source ?: parent.source
         this.pumpCapability = pumpCapability
         parent.model = model
     }
@@ -354,7 +383,8 @@ enum class PumpType {
                 baseBasalStep: Double = 1.0,
                 baseBasalSpecialSteps: DoseStepSize? = null,
                 pumpCapability: PumpCapability,
-                hasCustomUnreachableAlertCheck: Boolean = false) {
+                hasCustomUnreachableAlertCheck: Boolean = false,
+                source: Sources = Sources.VirtualPump) {
         this.description = description
         this.manufacturer = manufacturer
         this.model = model
@@ -370,6 +400,7 @@ enum class PumpType {
         this.baseBasalSpecialSteps = baseBasalSpecialSteps
         this.pumpCapability = pumpCapability
         this.hasCustomUnreachableAlertCheck = hasCustomUnreachableAlertCheck
+        this.source = source
     }
 
     fun getFullDescription(i18nTemplate: String, hasExtendedBasals: Boolean, resourceHelper: ResourceHelper): String {
@@ -444,5 +475,6 @@ enum class PumpType {
             YPSOPUMP                    -> InterfaceIDs.PumpType.YPSOPUMP
             MDI                         -> InterfaceIDs.PumpType.MDI
             USER                        -> InterfaceIDs.PumpType.USER
+            DIACONN_G8                  -> InterfaceIDs.PumpType.DIACONN_G8
         }
 }
\ No newline at end of file
diff --git a/core/src/main/java/info/nightscout/androidaps/plugins/pump/common/utils/DateTimeUtil.java b/core/src/main/java/info/nightscout/androidaps/plugins/pump/common/utils/DateTimeUtil.java
index 32c1d36488..2f37f541a6 100644
--- a/core/src/main/java/info/nightscout/androidaps/plugins/pump/common/utils/DateTimeUtil.java
+++ b/core/src/main/java/info/nightscout/androidaps/plugins/pump/common/utils/DateTimeUtil.java
@@ -6,6 +6,7 @@ package info.nightscout.androidaps.plugins.pump.common.utils;
 
 import org.joda.time.LocalDateTime;
 import org.joda.time.Minutes;
+import org.joda.time.Seconds;
 
 import java.util.Calendar;
 import java.util.GregorianCalendar;
@@ -245,13 +246,17 @@ public class DateTimeUtil {
 
 
     public static int getATechDateDiferenceAsMinutes(Long date1, Long date2) {
-
         Minutes minutes = Minutes.minutesBetween(toLocalDateTime(date1), toLocalDateTime(date2));
-
         return minutes.getMinutes();
     }
 
 
+    public static int getATechDateDiferenceAsSeconds(Long date1, Long date2) {
+        Seconds seconds = Seconds.secondsBetween(toLocalDateTime(date1), toLocalDateTime(date2));
+        return seconds.getSeconds();
+    }
+
+
     public static long getMillisFromATDWithAddedMinutes(long atd, int minutesDiff) {
         GregorianCalendar oldestEntryTime = DateTimeUtil.toGregorianCalendar(atd);
         oldestEntryTime.add(Calendar.MINUTE, minutesDiff);
diff --git a/core/src/main/java/info/nightscout/androidaps/receivers/NetworkChangeReceiver.kt b/core/src/main/java/info/nightscout/androidaps/receivers/NetworkChangeReceiver.kt
index 9233ee1b1b..8ac514a213 100644
--- a/core/src/main/java/info/nightscout/androidaps/receivers/NetworkChangeReceiver.kt
+++ b/core/src/main/java/info/nightscout/androidaps/receivers/NetworkChangeReceiver.kt
@@ -25,7 +25,7 @@ class NetworkChangeReceiver : DaggerBroadcastReceiver() {
         rxBus.send(grabNetworkStatus(context, aapsLogger))
     }
 
-    fun grabNetworkStatus(context: Context, aapsLogger: AAPSLogger): EventNetworkChange {
+    private fun grabNetworkStatus(context: Context, aapsLogger: AAPSLogger): EventNetworkChange {
         val event = EventNetworkChange()
         val cm = context.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
         val networks: Array<Network> = cm.allNetworks
diff --git a/core/src/main/java/info/nightscout/androidaps/receivers/ReceiverStatusStore.kt b/core/src/main/java/info/nightscout/androidaps/receivers/ReceiverStatusStore.kt
index 30090d386f..01bf231324 100644
--- a/core/src/main/java/info/nightscout/androidaps/receivers/ReceiverStatusStore.kt
+++ b/core/src/main/java/info/nightscout/androidaps/receivers/ReceiverStatusStore.kt
@@ -1,5 +1,6 @@
 package info.nightscout.androidaps.receivers
 
+import info.nightscout.androidaps.annotations.OpenForTesting
 import android.content.Context
 import android.content.Intent
 import info.nightscout.androidaps.events.EventChargingState
@@ -8,6 +9,7 @@ import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import javax.inject.Inject
 import javax.inject.Singleton
 
+@OpenForTesting
 @Singleton
 class ReceiverStatusStore @Inject constructor(val context: Context, val rxBus: RxBusWrapper) {
 
diff --git a/core/src/main/java/info/nightscout/androidaps/services/AlarmSoundService.kt b/core/src/main/java/info/nightscout/androidaps/services/AlarmSoundService.kt
index 6480189f41..7af82b750d 100644
--- a/core/src/main/java/info/nightscout/androidaps/services/AlarmSoundService.kt
+++ b/core/src/main/java/info/nightscout/androidaps/services/AlarmSoundService.kt
@@ -7,6 +7,7 @@ import android.media.MediaPlayer
 import android.os.Binder
 import android.os.Handler
 import android.os.IBinder
+import android.os.Looper
 import dagger.android.DaggerService
 import info.nightscout.androidaps.activities.ErrorHelperActivity
 import info.nightscout.androidaps.core.R
@@ -37,7 +38,7 @@ class AlarmSoundService : DaggerService() {
         private const val VOLUME_INCREASE_MIN_DELAY_MILLIS = 2_000L // Minimum delay between volume increments
 
         /*
-         * Delay until the next volumen increment will be the lowest value of VOLUME_INCREASE_MIN_DELAY_MILLIS and
+         * Delay until the next volume increment will be the lowest value of VOLUME_INCREASE_MIN_DELAY_MILLIS and
          * VOLUME_INCREASE_BASE_DELAY_MILLIS - (currentVolumeLevel - 1) ^ VOLUME_INCREASE_DELAY_DECREMENT_EXPONENT * 1000
          *
          */
@@ -53,7 +54,7 @@ class AlarmSoundService : DaggerService() {
     private val binder = LocalBinder()
     override fun onBind(intent: Intent): IBinder = binder
 
-    private val increaseVolumeHandler = Handler()
+    private val increaseVolumeHandler = Handler(Looper.getMainLooper())
     private var currentVolumeLevel = 0
 
     override fun onCreate() {
diff --git a/core/src/main/java/info/nightscout/androidaps/utils/CryptoUtil.kt b/core/src/main/java/info/nightscout/androidaps/utils/CryptoUtil.kt
index 563db53270..4aa7b34084 100644
--- a/core/src/main/java/info/nightscout/androidaps/utils/CryptoUtil.kt
+++ b/core/src/main/java/info/nightscout/androidaps/utils/CryptoUtil.kt
@@ -17,6 +17,7 @@ import javax.crypto.spec.SecretKeySpec
 import javax.inject.Inject
 import javax.inject.Singleton
 
+@Suppress("SpellCheckingInspection")
 @Singleton
 class CryptoUtil @Inject constructor(
     val aapsLogger: AAPSLogger
@@ -39,7 +40,7 @@ class CryptoUtil @Inject constructor(
         return hashRaw.toHex()
     }
 
-    fun hmac256(str: String, secret: String): String? {
+    fun hmac256(str: String, secret: String): String {
         val sha256HMAC = Mac.getInstance("HmacSHA256")
         val secretKey = SecretKeySpec(secret.toByteArray(), "HmacSHA256")
         sha256HMAC.init(secretKey)
@@ -68,7 +69,7 @@ class CryptoUtil @Inject constructor(
             secureRandom.nextBytes(iv)
             val cipherEnc: Cipher = Cipher.getInstance("AES/GCM/NoPadding")
             cipherEnc.init(Cipher.ENCRYPT_MODE, prepCipherKey(passPhrase, salt), GCMParameterSpec(TAG_LENGTH_BIT, iv))
-            encrypted = cipherEnc.doFinal(rawData.toByteArray())
+            encrypted = cipherEnc.doFinal(rawData.toByteArray()) ?: return null
             val byteBuffer: ByteBuffer = ByteBuffer.allocate(1 + iv.size + encrypted.size)
             byteBuffer.put(iv.size.toByte())
             byteBuffer.put(iv)
diff --git a/core/src/main/java/info/nightscout/androidaps/utils/DateUtil.kt b/core/src/main/java/info/nightscout/androidaps/utils/DateUtil.kt
index a65f6de701..6f0a2f6655 100644
--- a/core/src/main/java/info/nightscout/androidaps/utils/DateUtil.kt
+++ b/core/src/main/java/info/nightscout/androidaps/utils/DateUtil.kt
@@ -2,6 +2,7 @@ package info.nightscout.androidaps.utils
 
 import android.content.Context
 import androidx.collection.LongSparseArray
+import info.nightscout.androidaps.annotations.OpenForTesting
 import info.nightscout.androidaps.core.R
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import org.joda.time.DateTime
@@ -26,8 +27,9 @@ import kotlin.math.abs
  * The Class DateUtil. A simple wrapper around SimpleDateFormat to ease the handling of iso date string &lt;-&gt; date obj
  * with TZ
  */
+@OpenForTesting
 @Singleton
-open class DateUtil @Inject constructor(private val context: Context) {
+class DateUtil @Inject constructor(private val context: Context) {
 
     /**
      * The date format in iso.
@@ -56,10 +58,9 @@ open class DateUtil @Inject constructor(private val context: Context) {
      * @param tz     - tz to set to, if not specified uses local timezone
      * @return the iso-formatted date string
      */
-    @JvmOverloads
-    fun toISOString(date: Long, format: String = FORMAT_DATE_ISO_OUT, tz: TimeZone = TimeZone.getTimeZone("UTC")): String {
-        val f: DateFormat = SimpleDateFormat(format, Locale.getDefault())
-        f.timeZone = tz
+    fun toISOString(date: Long): String {
+        val f: DateFormat = SimpleDateFormat(FORMAT_DATE_ISO_OUT, Locale.getDefault())
+        f.timeZone = TimeZone.getTimeZone("UTC")
         return f.format(date)
     }
 
@@ -117,7 +118,7 @@ open class DateUtil @Inject constructor(private val context: Context) {
         return DateTime(mills).toString(DateTimeFormat.forPattern(format))
     }
 
-    private fun timeStringWithSeconds(mills: Long): String {
+    fun timeStringWithSeconds(mills: Long): String {
         var format = "hh:mm:ssa"
         if (android.text.format.DateFormat.is24HourFormat(context)) {
             format = "HH:mm:ss"
diff --git a/core/src/main/java/info/nightscout/androidaps/utils/DefaultValueHelper.kt b/core/src/main/java/info/nightscout/androidaps/utils/DefaultValueHelper.kt
index 20cbb6cbe6..f69a51fd12 100644
--- a/core/src/main/java/info/nightscout/androidaps/utils/DefaultValueHelper.kt
+++ b/core/src/main/java/info/nightscout/androidaps/utils/DefaultValueHelper.kt
@@ -1,6 +1,7 @@
 package info.nightscout.androidaps.utils
 
 import info.nightscout.androidaps.Constants
+import info.nightscout.androidaps.annotations.OpenForTesting
 import info.nightscout.androidaps.core.R
 import info.nightscout.androidaps.interfaces.GlucoseUnit
 import info.nightscout.androidaps.interfaces.Profile
@@ -9,8 +10,9 @@ import info.nightscout.androidaps.utils.sharedPreferences.SP
 import javax.inject.Inject
 import javax.inject.Singleton
 
+@OpenForTesting
 @Singleton
-open class DefaultValueHelper @Inject constructor(
+class DefaultValueHelper @Inject constructor(
     private val sp: SP,
     private val profileFunction: ProfileFunction
 ) {
diff --git a/core/src/main/java/info/nightscout/androidaps/utils/FabricPrivacy.kt b/core/src/main/java/info/nightscout/androidaps/utils/FabricPrivacy.kt
index c956409fb2..ac4f6e56b6 100644
--- a/core/src/main/java/info/nightscout/androidaps/utils/FabricPrivacy.kt
+++ b/core/src/main/java/info/nightscout/androidaps/utils/FabricPrivacy.kt
@@ -5,6 +5,7 @@ import com.google.firebase.analytics.FirebaseAnalytics
 import com.google.firebase.analytics.ktx.analytics
 import com.google.firebase.crashlytics.FirebaseCrashlytics
 import com.google.firebase.ktx.Firebase
+import info.nightscout.androidaps.annotations.OpenForTesting
 import info.nightscout.androidaps.core.R
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
@@ -17,8 +18,9 @@ import javax.inject.Singleton
  * to disable them and make calls from a potentially invalid singleton reference. This wrapper
  * emulates the methods but ignores the request if the instance is null or invalid.
  */
+@OpenForTesting
 @Singleton
-open class FabricPrivacy @Inject constructor(
+class FabricPrivacy @Inject constructor(
     private val aapsLogger: AAPSLogger,
     private val sp: SP
 ) {
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/HardLimits.kt b/core/src/main/java/info/nightscout/androidaps/utils/HardLimits.kt
similarity index 92%
rename from app/src/main/java/info/nightscout/androidaps/utils/HardLimits.kt
rename to core/src/main/java/info/nightscout/androidaps/utils/HardLimits.kt
index 0389b34283..67118d0908 100644
--- a/app/src/main/java/info/nightscout/androidaps/utils/HardLimits.kt
+++ b/core/src/main/java/info/nightscout/androidaps/utils/HardLimits.kt
@@ -1,7 +1,8 @@
 package info.nightscout.androidaps.utils
 
 import android.content.Context
-import info.nightscout.androidaps.R
+import info.nightscout.androidaps.annotations.OpenForTesting
+import info.nightscout.androidaps.core.R
 import info.nightscout.androidaps.database.AppRepository
 import info.nightscout.androidaps.database.transactions.InsertTherapyEventAnnouncementTransaction
 import info.nightscout.androidaps.logging.AAPSLogger
@@ -15,6 +16,7 @@ import javax.inject.Singleton
 import kotlin.math.max
 import kotlin.math.min
 
+@OpenForTesting
 @Singleton
 class HardLimits @Inject constructor(
     private val aapsLogger: AAPSLogger,
@@ -81,9 +83,12 @@ class HardLimits @Inject constructor(
     fun maxIC(): Double = MAX_IC[loadAge()]
 
     // safety checks
-    fun checkOnlyHardLimits(value: Double, valueName: Int, lowLimit: Double, highLimit: Double): Boolean =
+    fun checkHardLimits(value: Double, valueName: Int, lowLimit: Double, highLimit: Double): Boolean =
          value == verifyHardLimits(value, valueName, lowLimit, highLimit)
 
+    fun isInRange(value: Double, lowLimit: Double, highLimit: Double): Boolean =
+        value in lowLimit..highLimit
+
     fun verifyHardLimits(value: Double, valueName: Int, lowLimit: Double, highLimit: Double): Double {
         var newValue = value
         if (newValue < lowLimit || newValue > highLimit) {
@@ -98,4 +103,4 @@ class HardLimits @Inject constructor(
         }
         return newValue
     }
-}
+}
\ No newline at end of file
diff --git a/core/src/main/java/info/nightscout/androidaps/utils/JsonHelper.kt b/core/src/main/java/info/nightscout/androidaps/utils/JsonHelper.kt
index a7c78fa0bb..d592a180b7 100644
--- a/core/src/main/java/info/nightscout/androidaps/utils/JsonHelper.kt
+++ b/core/src/main/java/info/nightscout/androidaps/utils/JsonHelper.kt
@@ -27,7 +27,6 @@ object JsonHelper {
         return result
     }
 
-    @JvmStatic
     fun safeGetString(json: JSONObject?, fieldName: String): String? {
         var result: String? = null
         if (json != null && json.has(fieldName)) {
@@ -39,7 +38,6 @@ object JsonHelper {
         return result
     }
 
-    @JvmStatic
     fun safeGetString(json: JSONObject?, fieldName: String, defaultValue: String): String {
         var result = defaultValue
         if (json != null && json.has(fieldName)) {
@@ -51,7 +49,6 @@ object JsonHelper {
         return result
     }
 
-    @JvmStatic
     fun safeGetStringAllowNull(json: JSONObject?, fieldName: String, defaultValue: String?): String? {
         var result = defaultValue
         if (json != null && json.has(fieldName)) {
@@ -63,7 +60,6 @@ object JsonHelper {
         return result
     }
 
-    @JvmStatic
     fun safeGetDouble(json: JSONObject?, fieldName: String): Double {
         var result = 0.0
         if (json != null && json.has(fieldName)) {
@@ -97,7 +93,6 @@ object JsonHelper {
         return result
     }
 
-    @JvmStatic
     fun safeGetInt(json: JSONObject?, fieldName: String): Int =
         safeGetInt(json, fieldName, 0)
 
@@ -123,7 +118,6 @@ object JsonHelper {
         return result
     }
 
-    @JvmStatic
     fun safeGetLong(json: JSONObject?, fieldName: String): Long {
         var result: Long = 0
         if (json != null && json.has(fieldName)) {
@@ -146,8 +140,6 @@ object JsonHelper {
         return result
     }
 
-    @JvmStatic
-    @JvmOverloads
     fun safeGetBoolean(json: JSONObject?, fieldName: String, defaultValue: Boolean = false): Boolean {
         var result = defaultValue
         if (json != null && json.has(fieldName)) {
diff --git a/core/src/main/java/info/nightscout/androidaps/utils/T.kt b/core/src/main/java/info/nightscout/androidaps/utils/T.kt
index 29915386f1..6a0f540b28 100644
--- a/core/src/main/java/info/nightscout/androidaps/utils/T.kt
+++ b/core/src/main/java/info/nightscout/androidaps/utils/T.kt
@@ -14,12 +14,12 @@ class T(val time: Long = 0L) {
 
     companion object {
 
-        @JvmStatic fun now(): T = T(System.currentTimeMillis())
-        @JvmStatic fun msecs(msec: Long): T = T(msec)
-        @JvmStatic fun secs(sec: Long): T = T(sec * 1000L)
-        @JvmStatic fun mins(min: Long): T = T(min * 60 * 1000L)
-        @JvmStatic fun hours(hour: Long): T = T(hour * 60 * 60 * 1000L)
-        @JvmStatic fun days(day: Long): T = T(day * 24 * 60 * 60 * 1000L)
-        @JvmStatic fun months(month: Long): T = T(month * 31 * 24 * 60 * 60 * 1000L)
+        fun now(): T = T(System.currentTimeMillis())
+        fun msecs(msec: Long): T = T(msec)
+        fun secs(sec: Long): T = T(sec * 1000L)
+        fun mins(min: Long): T = T(min * 60 * 1000L)
+        fun hours(hour: Long): T = T(hour * 60 * 60 * 1000L)
+        fun days(day: Long): T = T(day * 24 * 60 * 60 * 1000L)
+        fun months(month: Long): T = T(month * 31 * 24 * 60 * 60 * 1000L)
     }
 }
\ No newline at end of file
diff --git a/core/src/main/java/info/nightscout/androidaps/utils/Translator.kt b/core/src/main/java/info/nightscout/androidaps/utils/Translator.kt
index 9ee3dbee13..fa71db66b4 100644
--- a/core/src/main/java/info/nightscout/androidaps/utils/Translator.kt
+++ b/core/src/main/java/info/nightscout/androidaps/utils/Translator.kt
@@ -1,6 +1,7 @@
 package info.nightscout.androidaps.utils
 
 import info.nightscout.androidaps.core.R
+import info.nightscout.androidaps.database.entities.OfflineEvent
 import info.nightscout.androidaps.database.entities.TemporaryTarget
 import info.nightscout.androidaps.database.entities.TherapyEvent
 import info.nightscout.androidaps.database.entities.UserEntry.Action
@@ -15,94 +16,93 @@ class Translator @Inject internal constructor(
     private val resourceHelper: ResourceHelper
 ) {
 
-    @Deprecated("use type instead of string")
-    fun translate(text: String): String = text
-
-    fun translate(action: Action): String = when(action) {
-        Action.BOLUS                               -> resourceHelper.gs(R.string.uel_bolus)
-        Action.SMB                                 -> resourceHelper.gs(R.string.smb_shortname)
-        Action.BOLUS_ADVISOR                       -> resourceHelper.gs(R.string.uel_bolus_advisor)
-        Action.EXTENDED_BOLUS                      -> resourceHelper.gs(R.string.uel_extended_bolus)
-        Action.SUPERBOLUS_TBR                      -> resourceHelper.gs(R.string.uel_superbolus_tbr)
-        Action.CARBS                               -> resourceHelper.gs(R.string.uel_carbs)
-        Action.EXTENDED_CARBS                      -> resourceHelper.gs(R.string.uel_extended_carbs)
-        Action.TEMP_BASAL                          -> resourceHelper.gs(R.string.uel_temp_basal)
-        Action.TT                                  -> resourceHelper.gs(R.string.uel_tt)
-        Action.NEW_PROFILE                         -> resourceHelper.gs(R.string.uel_new_profile)
-        Action.CLONE_PROFILE                       -> resourceHelper.gs(R.string.uel_clone_profile)
-        Action.STORE_PROFILE                       -> resourceHelper.gs(R.string.uel_store_profile)
-        Action.PROFILE_SWITCH                      -> resourceHelper.gs(R.string.uel_profile_switch)
-        Action.PROFILE_SWITCH_CLONED               -> resourceHelper.gs(R.string.uel_profile_switch_cloned)
-        Action.CLOSED_LOOP_MODE                    -> resourceHelper.gs(R.string.uel_closed_loop_mode)
-        Action.LGS_LOOP_MODE                       -> resourceHelper.gs(R.string.uel_lgs_loop_mode)
-        Action.OPEN_LOOP_MODE                      -> resourceHelper.gs(R.string.uel_open_loop_mode)
-        Action.LOOP_DISABLED                       -> resourceHelper.gs(R.string.uel_loop_disabled)
-        Action.LOOP_ENABLED                        -> resourceHelper.gs(R.string.uel_loop_enabled)
-        Action.RECONNECT                           -> resourceHelper.gs(R.string.uel_reconnect)
-        Action.DISCONNECT                          -> resourceHelper.gs(R.string.uel_disconnect)
-        Action.RESUME                              -> resourceHelper.gs(R.string.uel_resume)
-        Action.SUSPEND                             -> resourceHelper.gs(R.string.uel_suspend)
-        Action.HW_PUMP_ALLOWED                     -> resourceHelper.gs(R.string.uel_hw_pump_allowed)
-        Action.CLEAR_PAIRING_KEYS                  -> resourceHelper.gs(R.string.uel_clear_pairing_keys)
-        Action.ACCEPTS_TEMP_BASAL                  -> resourceHelper.gs(R.string.uel_accepts_temp_basal)
-        Action.CANCEL_TEMP_BASAL                   -> resourceHelper.gs(R.string.uel_cancel_temp_basal)
-        Action.CANCEL_BOLUS                        -> resourceHelper.gs(R.string.uel_cancel_bolus)
-        Action.CANCEL_EXTENDED_BOLUS               -> resourceHelper.gs(R.string.uel_cancel_extended_bolus)
-        Action.CANCEL_TT                           -> resourceHelper.gs(R.string.uel_cancel_tt)
-        Action.CAREPORTAL                          -> resourceHelper.gs(R.string.uel_careportal)
-        Action.SITE_CHANGE                         -> resourceHelper.gs(R.string.uel_site_change)
-        Action.RESERVOIR_CHANGE                    -> resourceHelper.gs(R.string.uel_reservoir_change)
-        Action.CALIBRATION                         -> resourceHelper.gs(R.string.uel_calibration)
-        Action.PRIME_BOLUS                         -> resourceHelper.gs(R.string.uel_prime_bolus)
-        Action.TREATMENT                           -> resourceHelper.gs(R.string.uel_treatment)
-        Action.CAREPORTAL_NS_REFRESH               -> resourceHelper.gs(R.string.uel_careportal_ns_refresh)
-        Action.PROFILE_SWITCH_NS_REFRESH           -> resourceHelper.gs(R.string.uel_profile_switch_ns_refresh)
-        Action.TREATMENTS_NS_REFRESH               -> resourceHelper.gs(R.string.uel_treatments_ns_refresh)
-        Action.TT_NS_REFRESH                       -> resourceHelper.gs(R.string.uel_tt_ns_refresh)
-        Action.AUTOMATION_REMOVED                  -> resourceHelper.gs(R.string.uel_automation_removed)
-        Action.BG_REMOVED                          -> resourceHelper.gs(R.string.uel_bg_removed)
-        Action.CAREPORTAL_REMOVED                  -> resourceHelper.gs(R.string.uel_careportal_removed)
-        Action.BOLUS_REMOVED                       -> resourceHelper.gs(R.string.uel_bolus_removed)
-        Action.CARBS_REMOVED                       -> resourceHelper.gs(R.string.uel_carbs_removed)
-        Action.TEMP_BASAL_REMOVED                  -> resourceHelper.gs(R.string.uel_temp_basal_removed)
-        Action.EXTENDED_BOLUS_REMOVED              -> resourceHelper.gs(R.string.uel_extended_bolus_removed)
-        Action.FOOD                                -> resourceHelper.gs(R.string.uel_food)
-        Action.FOOD_REMOVED                        -> resourceHelper.gs(R.string.uel_food_removed)
-        Action.PROFILE_REMOVED                     -> resourceHelper.gs(R.string.uel_profile_removed)
-        Action.PROFILE_SWITCH_REMOVED              -> resourceHelper.gs(R.string.uel_profile_switch_removed)
-        Action.RESTART_EVENTS_REMOVED              -> resourceHelper.gs(R.string.uel_restart_events_removed)
-        Action.TREATMENT_REMOVED                   -> resourceHelper.gs(R.string.uel_treatment_removed)
-        Action.TT_REMOVED                          -> resourceHelper.gs(R.string.uel_tt_removed)
-        Action.NS_PAUSED                           -> resourceHelper.gs(R.string.uel_ns_paused)
-        Action.NS_RESUME                           -> resourceHelper.gs(R.string.uel_ns_resume)
-        Action.NS_QUEUE_CLEARED                    -> resourceHelper.gs(R.string.uel_ns_queue_cleared)
-        Action.NS_SETTINGS_COPIED                  -> resourceHelper.gs(R.string.uel_ns_settings_copied)
-        Action.ERROR_DIALOG_OK                     -> resourceHelper.gs(R.string.uel_error_dialog_ok)
-        Action.ERROR_DIALOG_MUTE                   -> resourceHelper.gs(R.string.uel_error_dialog_mute)
-        Action.ERROR_DIALOG_MUTE_5MIN              -> resourceHelper.gs(R.string.uel_error_dialog_mute_5min)
-        Action.OBJECTIVE_STARTED                   -> resourceHelper.gs(R.string.uel_objective_started)
-        Action.OBJECTIVE_UNSTARTED                 -> resourceHelper.gs(R.string.uel_objective_unstarted)
-        Action.OBJECTIVES_SKIPPED                  -> resourceHelper.gs(R.string.uel_objectives_skipped)
-        Action.STAT_RESET                          -> resourceHelper.gs(R.string.uel_stat_reset)
-        Action.DELETE_LOGS                         -> resourceHelper.gs(R.string.uel_delete_logs)
-        Action.DELETE_FUTURE_TREATMENTS            -> resourceHelper.gs(R.string.uel_delete_future_treatments)
-        Action.EXPORT_SETTINGS                     -> resourceHelper.gs(R.string.uel_export_settings)
-        Action.IMPORT_SETTINGS                     -> resourceHelper.gs(R.string.uel_import_settings)
-        Action.RESET_DATABASES                     -> resourceHelper.gs(R.string.uel_reset_databases)
-        Action.EXPORT_DATABASES                    -> resourceHelper.gs(R.string.uel_export_databases)
-        Action.IMPORT_DATABASES                    -> resourceHelper.gs(R.string.uel_import_databases)
-        Action.OTP_EXPORT                          -> resourceHelper.gs(R.string.uel_otp_export)
-        Action.OTP_RESET                           -> resourceHelper.gs(R.string.uel_otp_reset)
-        Action.EXPORT_CSV                          -> resourceHelper.gs(R.string.uel_export_csv)
-        Action.STOP_SMS                            -> resourceHelper.gs(R.string.uel_stop_sms)
-        Action.START_AAPS                          -> resourceHelper.gs(R.string.uel_start_aaps)
-        Action.EXIT_AAPS                           -> resourceHelper.gs(R.string.uel_exit_aaps)
-        Action.PLUGIN_ENABLED                      -> resourceHelper.gs(R.string.uel_plugin_enabled)
-        Action.PLUGIN_DISABLED                     -> resourceHelper.gs(R.string.uel_plugin_disabled)
-        Action.UNKNOWN                             -> resourceHelper.gs(R.string.unknown)
+    fun translate(action: Action): String = when (action) {
+        Action.BOLUS                     -> resourceHelper.gs(R.string.uel_bolus)
+        Action.SMB                       -> resourceHelper.gs(R.string.smb_shortname)
+        Action.BOLUS_ADVISOR             -> resourceHelper.gs(R.string.uel_bolus_advisor)
+        Action.EXTENDED_BOLUS            -> resourceHelper.gs(R.string.uel_extended_bolus)
+        Action.SUPERBOLUS_TBR            -> resourceHelper.gs(R.string.uel_superbolus_tbr)
+        Action.CARBS                     -> resourceHelper.gs(R.string.uel_carbs)
+        Action.EXTENDED_CARBS            -> resourceHelper.gs(R.string.uel_extended_carbs)
+        Action.TEMP_BASAL                -> resourceHelper.gs(R.string.uel_temp_basal)
+        Action.TT                        -> resourceHelper.gs(R.string.uel_tt)
+        Action.NEW_PROFILE               -> resourceHelper.gs(R.string.uel_new_profile)
+        Action.CLONE_PROFILE             -> resourceHelper.gs(R.string.uel_clone_profile)
+        Action.STORE_PROFILE             -> resourceHelper.gs(R.string.uel_store_profile)
+        Action.PROFILE_SWITCH            -> resourceHelper.gs(R.string.uel_profile_switch)
+        Action.PROFILE_SWITCH_CLONED     -> resourceHelper.gs(R.string.uel_profile_switch_cloned)
+        Action.CLOSED_LOOP_MODE          -> resourceHelper.gs(R.string.uel_closed_loop_mode)
+        Action.LGS_LOOP_MODE             -> resourceHelper.gs(R.string.uel_lgs_loop_mode)
+        Action.OPEN_LOOP_MODE            -> resourceHelper.gs(R.string.uel_open_loop_mode)
+        Action.LOOP_DISABLED             -> resourceHelper.gs(R.string.uel_loop_disabled)
+        Action.LOOP_ENABLED              -> resourceHelper.gs(R.string.uel_loop_enabled)
+        Action.RECONNECT                 -> resourceHelper.gs(R.string.uel_reconnect)
+        Action.DISCONNECT                -> resourceHelper.gs(R.string.uel_disconnect)
+        Action.RESUME                    -> resourceHelper.gs(R.string.uel_resume)
+        Action.SUSPEND                   -> resourceHelper.gs(R.string.uel_suspend)
+        Action.HW_PUMP_ALLOWED           -> resourceHelper.gs(R.string.uel_hw_pump_allowed)
+        Action.CLEAR_PAIRING_KEYS        -> resourceHelper.gs(R.string.uel_clear_pairing_keys)
+        Action.ACCEPTS_TEMP_BASAL        -> resourceHelper.gs(R.string.uel_accepts_temp_basal)
+        Action.CANCEL_TEMP_BASAL         -> resourceHelper.gs(R.string.uel_cancel_temp_basal)
+        Action.CANCEL_BOLUS              -> resourceHelper.gs(R.string.uel_cancel_bolus)
+        Action.CANCEL_EXTENDED_BOLUS     -> resourceHelper.gs(R.string.uel_cancel_extended_bolus)
+        Action.CANCEL_TT                 -> resourceHelper.gs(R.string.uel_cancel_tt)
+        Action.CAREPORTAL                -> resourceHelper.gs(R.string.uel_careportal)
+        Action.SITE_CHANGE               -> resourceHelper.gs(R.string.uel_site_change)
+        Action.RESERVOIR_CHANGE          -> resourceHelper.gs(R.string.uel_reservoir_change)
+        Action.CALIBRATION               -> resourceHelper.gs(R.string.uel_calibration)
+        Action.PRIME_BOLUS               -> resourceHelper.gs(R.string.uel_prime_bolus)
+        Action.TREATMENT                 -> resourceHelper.gs(R.string.uel_treatment)
+        Action.CAREPORTAL_NS_REFRESH     -> resourceHelper.gs(R.string.uel_careportal_ns_refresh)
+        Action.PROFILE_SWITCH_NS_REFRESH -> resourceHelper.gs(R.string.uel_profile_switch_ns_refresh)
+        Action.TREATMENTS_NS_REFRESH     -> resourceHelper.gs(R.string.uel_treatments_ns_refresh)
+        Action.TT_NS_REFRESH             -> resourceHelper.gs(R.string.uel_tt_ns_refresh)
+        Action.AUTOMATION_REMOVED        -> resourceHelper.gs(R.string.uel_automation_removed)
+        Action.BG_REMOVED                -> resourceHelper.gs(R.string.uel_bg_removed)
+        Action.CAREPORTAL_REMOVED        -> resourceHelper.gs(R.string.uel_careportal_removed)
+        Action.BOLUS_REMOVED             -> resourceHelper.gs(R.string.uel_bolus_removed)
+        Action.CARBS_REMOVED             -> resourceHelper.gs(R.string.uel_carbs_removed)
+        Action.TEMP_BASAL_REMOVED        -> resourceHelper.gs(R.string.uel_temp_basal_removed)
+        Action.EXTENDED_BOLUS_REMOVED    -> resourceHelper.gs(R.string.uel_extended_bolus_removed)
+        Action.FOOD                      -> resourceHelper.gs(R.string.uel_food)
+        Action.FOOD_REMOVED              -> resourceHelper.gs(R.string.uel_food_removed)
+        Action.PROFILE_REMOVED           -> resourceHelper.gs(R.string.uel_profile_removed)
+        Action.PROFILE_SWITCH_REMOVED    -> resourceHelper.gs(R.string.uel_profile_switch_removed)
+        Action.RESTART_EVENTS_REMOVED    -> resourceHelper.gs(R.string.uel_restart_events_removed)
+        Action.TREATMENT_REMOVED         -> resourceHelper.gs(R.string.uel_treatment_removed)
+        Action.TT_REMOVED                -> resourceHelper.gs(R.string.uel_tt_removed)
+        Action.NS_PAUSED                 -> resourceHelper.gs(R.string.uel_ns_paused)
+        Action.NS_RESUME                 -> resourceHelper.gs(R.string.uel_ns_resume)
+        Action.NS_QUEUE_CLEARED          -> resourceHelper.gs(R.string.uel_ns_queue_cleared)
+        Action.NS_SETTINGS_COPIED        -> resourceHelper.gs(R.string.uel_ns_settings_copied)
+        Action.ERROR_DIALOG_OK           -> resourceHelper.gs(R.string.uel_error_dialog_ok)
+        Action.ERROR_DIALOG_MUTE         -> resourceHelper.gs(R.string.uel_error_dialog_mute)
+        Action.ERROR_DIALOG_MUTE_5MIN    -> resourceHelper.gs(R.string.uel_error_dialog_mute_5min)
+        Action.OBJECTIVE_STARTED         -> resourceHelper.gs(R.string.uel_objective_started)
+        Action.OBJECTIVE_UNSTARTED       -> resourceHelper.gs(R.string.uel_objective_unstarted)
+        Action.OBJECTIVES_SKIPPED        -> resourceHelper.gs(R.string.uel_objectives_skipped)
+        Action.STAT_RESET                -> resourceHelper.gs(R.string.uel_stat_reset)
+        Action.DELETE_LOGS               -> resourceHelper.gs(R.string.uel_delete_logs)
+        Action.DELETE_FUTURE_TREATMENTS  -> resourceHelper.gs(R.string.uel_delete_future_treatments)
+        Action.EXPORT_SETTINGS           -> resourceHelper.gs(R.string.uel_export_settings)
+        Action.IMPORT_SETTINGS           -> resourceHelper.gs(R.string.uel_import_settings)
+        Action.RESET_DATABASES           -> resourceHelper.gs(R.string.uel_reset_databases)
+        Action.EXPORT_DATABASES          -> resourceHelper.gs(R.string.uel_export_databases)
+        Action.IMPORT_DATABASES          -> resourceHelper.gs(R.string.uel_import_databases)
+        Action.OTP_EXPORT                -> resourceHelper.gs(R.string.uel_otp_export)
+        Action.OTP_RESET                 -> resourceHelper.gs(R.string.uel_otp_reset)
+        Action.EXPORT_CSV                -> resourceHelper.gs(R.string.uel_export_csv)
+        Action.STOP_SMS                  -> resourceHelper.gs(R.string.uel_stop_sms)
+        Action.START_AAPS                -> resourceHelper.gs(R.string.uel_start_aaps)
+        Action.EXIT_AAPS                 -> resourceHelper.gs(R.string.uel_exit_aaps)
+        Action.PLUGIN_ENABLED            -> resourceHelper.gs(R.string.uel_plugin_enabled)
+        Action.PLUGIN_DISABLED           -> resourceHelper.gs(R.string.uel_plugin_disabled)
+        Action.LOOP_CHANGE               -> resourceHelper.gs(R.string.uel_loop_change)
+        Action.LOOP_REMOVED              -> resourceHelper.gs(R.string.uel_loop_removed)
+        Action.UNKNOWN                   -> resourceHelper.gs(R.string.unknown)
     }
 
-    fun translate(units: ValueWithUnit?): String = when(units) {
+    fun translate(units: ValueWithUnit?): String = when (units) {
         is ValueWithUnit.Gram        -> resourceHelper.gs(R.string.shortgram)
         is ValueWithUnit.Hour        -> resourceHelper.gs(R.string.shorthour)
         is ValueWithUnit.Insulin     -> resourceHelper.gs(R.string.insulin_unit_shortname)
@@ -114,15 +114,15 @@ class Translator @Inject internal constructor(
         else                         -> ""
     }
 
-    fun translate(meterType: TherapyEvent.MeterType): String = when(meterType) {
-        TherapyEvent.MeterType.FINGER                  -> resourceHelper.gs(R.string.glucosetype_finger)
-        TherapyEvent.MeterType.SENSOR                  -> resourceHelper.gs(R.string.glucosetype_sensor)
-        TherapyEvent.MeterType.MANUAL                  -> resourceHelper.gs(R.string.manual)
+    fun translate(meterType: TherapyEvent.MeterType): String = when (meterType) {
+        TherapyEvent.MeterType.FINGER -> resourceHelper.gs(R.string.glucosetype_finger)
+        TherapyEvent.MeterType.SENSOR -> resourceHelper.gs(R.string.glucosetype_sensor)
+        TherapyEvent.MeterType.MANUAL -> resourceHelper.gs(R.string.manual)
 
-        else                                           -> resourceHelper.gs(R.string.unknown)
+        else                          -> resourceHelper.gs(R.string.unknown)
     }
 
-    fun translate(type: TherapyEvent.Type): String = when(type) {
+    fun translate(type: TherapyEvent.Type): String = when (type) {
         TherapyEvent.Type.FINGER_STICK_BG_VALUE   -> resourceHelper.gs(R.string.careportal_bgcheck)
         TherapyEvent.Type.SNACK_BOLUS             -> resourceHelper.gs(R.string.careportal_snackbolus)
         TherapyEvent.Type.MEAL_BOLUS              -> resourceHelper.gs(R.string.careportal_mealbolus)
@@ -170,21 +170,30 @@ class Translator @Inject internal constructor(
  */
         TherapyEvent.Type.NONE                    -> resourceHelper.gs(R.string.unknown)
 
-        else                                           -> resourceHelper.gs(R.string.unknown)
-    }
-
-    fun translate(reason: TemporaryTarget.Reason): String = when(reason) {
-        TemporaryTarget.Reason.CUSTOM             -> resourceHelper.gs(R.string.custom)
-        TemporaryTarget.Reason.HYPOGLYCEMIA       -> resourceHelper.gs(R.string.hypo)
-        TemporaryTarget.Reason.EATING_SOON        -> resourceHelper.gs(R.string.eatingsoon)
-        TemporaryTarget.Reason.ACTIVITY           -> resourceHelper.gs(R.string.activity)
-        TemporaryTarget.Reason.AUTOMATION         -> resourceHelper.gs(R.string.automation)
-        TemporaryTarget.Reason.WEAR               -> resourceHelper.gs(R.string.wear)
-
         else                                      -> resourceHelper.gs(R.string.unknown)
     }
 
-    fun translate(source: Sources): String = when(source) {
+    fun translate(reason: TemporaryTarget.Reason): String = when (reason) {
+        TemporaryTarget.Reason.CUSTOM       -> resourceHelper.gs(R.string.custom)
+        TemporaryTarget.Reason.HYPOGLYCEMIA -> resourceHelper.gs(R.string.hypo)
+        TemporaryTarget.Reason.EATING_SOON  -> resourceHelper.gs(R.string.eatingsoon)
+        TemporaryTarget.Reason.ACTIVITY     -> resourceHelper.gs(R.string.activity)
+        TemporaryTarget.Reason.AUTOMATION   -> resourceHelper.gs(R.string.automation)
+        TemporaryTarget.Reason.WEAR         -> resourceHelper.gs(R.string.wear)
+
+        else                                -> resourceHelper.gs(R.string.unknown)
+    }
+
+    fun translate(reason: OfflineEvent.Reason): String = when (reason) {
+        OfflineEvent.Reason.SUSPEND         -> resourceHelper.gs(R.string.uel_suspend)
+        OfflineEvent.Reason.DISABLE_LOOP    -> resourceHelper.gs(R.string.disableloop)
+        OfflineEvent.Reason.DISCONNECT_PUMP -> resourceHelper.gs(R.string.uel_disconnect)
+        OfflineEvent.Reason.OTHER           -> resourceHelper.gs(R.string.uel_other)
+
+        else                                -> resourceHelper.gs(R.string.unknown)
+    }
+
+    fun translate(source: Sources): String = when (source) {
         /*
         Sources.TreatmentDialog                    -> TODO()
         Sources.InsulinDialog                      -> TODO()
@@ -255,6 +264,8 @@ class Translator @Inject internal constructor(
         Sources.DanaRC                             -> TODO()
         Sources.DanaRv2                            -> TODO()
         Sources.DanaRS                             -> TODO()
+        Sources.DanaI                              -> TODO()
+        Sources.DiaconnG8                          -> TODO()
         Sources.Insight                            -> TODO()
         Sources.Combo                              -> TODO()
         Sources.Medtronic                          -> TODO()
@@ -270,14 +281,14 @@ class Translator @Inject internal constructor(
         Sources.Stats                              -> TODO()
         Sources.Aaps                               -> TODO()
         */
-        Sources.Automation                         -> resourceHelper.gs(R.string.automation)
-        Sources.Loop                               -> resourceHelper.gs(R.string.loop)
-        Sources.NSClient                           -> resourceHelper.gs(R.string.ns)
-        Sources.Pump                               -> resourceHelper.gs(R.string.pump)
-        Sources.SMS                                -> resourceHelper.gs(R.string.smb_shortname)
-        Sources.Wear                               -> resourceHelper.gs(R.string.wear)
-        Sources.Unknown                            -> resourceHelper.gs(R.string.unknown)
+        Sources.Automation -> resourceHelper.gs(R.string.automation)
+        Sources.Loop       -> resourceHelper.gs(R.string.loop)
+        Sources.NSClient   -> resourceHelper.gs(R.string.ns)
+        Sources.Pump       -> resourceHelper.gs(R.string.pump)
+        Sources.SMS        -> resourceHelper.gs(R.string.smb_shortname)
+        Sources.Wear       -> resourceHelper.gs(R.string.wear)
+        Sources.Unknown    -> resourceHelper.gs(R.string.unknown)
 
-        else                                       -> source.name
+        else               -> source.name
     }
 }
\ No newline at end of file
diff --git a/core/src/main/java/info/nightscout/androidaps/utils/alertDialogs/OKDialog.kt b/core/src/main/java/info/nightscout/androidaps/utils/alertDialogs/OKDialog.kt
index 76e64ebaf3..4182538781 100644
--- a/core/src/main/java/info/nightscout/androidaps/utils/alertDialogs/OKDialog.kt
+++ b/core/src/main/java/info/nightscout/androidaps/utils/alertDialogs/OKDialog.kt
@@ -55,12 +55,10 @@ object OKDialog {
             .setCanceledOnTouchOutside(false)
     }
 
-    @JvmStatic
     fun showConfirmation(activity: FragmentActivity, message: String, ok: Runnable?) {
         showConfirmation(activity, activity.getString(R.string.confirmation), message, ok, null)
     }
 
-    @JvmStatic
     fun showConfirmation(activity: FragmentActivity, message: Spanned, ok: Runnable?) {
         showConfirmation(activity, activity.getString(R.string.confirmation), message, ok, null)
     }
@@ -153,15 +151,11 @@ object OKDialog {
             .setCanceledOnTouchOutside(false)
     }
 
-    @JvmStatic
-    @JvmOverloads
     fun showConfirmation(context: Context, message: String, ok: Runnable?, cancel: Runnable? = null) {
         showConfirmation(context, context.getString(R.string.confirmation), message, ok, cancel)
     }
 
     @SuppressLint("InflateParams")
-    @JvmStatic
-    @JvmOverloads
     fun showConfirmation(context: Context, title: String, message: String, ok: Runnable?, cancel: Runnable? = null) {
         var okClicked = false
         AlertDialogHelper.Builder(context)
@@ -190,8 +184,6 @@ object OKDialog {
     }
 
     @SuppressLint("InflateParams")
-    @JvmStatic
-    @JvmOverloads
     fun showConfirmation(context: Context, title: String, message: String, ok: DialogInterface.OnClickListener?, cancel: DialogInterface.OnClickListener? = null) {
         var okClicked = false
         AlertDialogHelper.Builder(context)
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/locale/LocaleHelper.kt b/core/src/main/java/info/nightscout/androidaps/utils/locale/LocaleHelper.kt
index 29d53e1e53..43da5e85c5 100644
--- a/core/src/main/java/info/nightscout/androidaps/utils/locale/LocaleHelper.kt
+++ b/core/src/main/java/info/nightscout/androidaps/utils/locale/LocaleHelper.kt
@@ -50,7 +50,7 @@ object LocaleHelper {
         configuration.setLocale(newLocale)
         val localeList = LocaleList(newLocale)
         LocaleList.setDefault(localeList)
-        configuration.locales = localeList
+        configuration.setLocales(localeList)
         val context = ctx.createConfigurationContext(configuration)
         return ContextWrapper(context)
     }
diff --git a/core/src/main/java/info/nightscout/androidaps/utils/protection/PasswordCheck.kt b/core/src/main/java/info/nightscout/androidaps/utils/protection/PasswordCheck.kt
index 6e36c3a659..83090741e0 100644
--- a/core/src/main/java/info/nightscout/androidaps/utils/protection/PasswordCheck.kt
+++ b/core/src/main/java/info/nightscout/androidaps/utils/protection/PasswordCheck.kt
@@ -8,10 +8,13 @@ import android.widget.EditText
 import android.widget.TextView
 import androidx.annotation.StringRes
 import info.nightscout.androidaps.core.R
+import info.nightscout.androidaps.interfaces.ActivePlugin
+import info.nightscout.androidaps.plugins.general.maintenance.PrefFileListProvider
 import info.nightscout.androidaps.utils.CryptoUtil
 import info.nightscout.androidaps.utils.ToastUtils
 import info.nightscout.androidaps.utils.alertDialogs.AlertDialogHelper
 import info.nightscout.androidaps.utils.sharedPreferences.SP
+import java.io.File
 import javax.inject.Inject
 import javax.inject.Singleton
 
@@ -20,8 +23,10 @@ const val AUTOFILL_HINT_NEW_PASSWORD = "newPassword"
 
 @Singleton
 class PasswordCheck @Inject constructor(
-    val sp: SP,
-    private val cryptoUtil: CryptoUtil
+    private val sp: SP,
+    private val cryptoUtil: CryptoUtil,
+    private val fileListProvider: PrefFileListProvider,
+    private val activePlugin: ActivePlugin
 ) {
 
     /**
@@ -159,4 +164,18 @@ class PasswordCheck @Inject constructor(
 
         alertDialogBuilder.create().show()
     }
+
+    /**
+     * Check for existing PasswordReset file and
+     * reset password to SN of active pump if file exists
+     */
+    fun passwordResetCheck(context: Context) {
+        val passwordReset = File(fileListProvider.ensureExtraDirExists(), "PasswordReset")
+        if (passwordReset.exists()) {
+            val sn = activePlugin.activePump.serialNumber()
+            sp.putString(R.string.key_master_password, cryptoUtil.hashPassword(sn))
+            passwordReset.delete()
+            ToastUtils.okToast(context, context.getString(R.string.password_set))
+        }
+    }
 }
diff --git a/core/src/main/java/info/nightscout/androidaps/utils/protection/ProtectionCheck.kt b/core/src/main/java/info/nightscout/androidaps/utils/protection/ProtectionCheck.kt
index ca0a3402a6..9bc9a18fe4 100644
--- a/core/src/main/java/info/nightscout/androidaps/utils/protection/ProtectionCheck.kt
+++ b/core/src/main/java/info/nightscout/androidaps/utils/protection/ProtectionCheck.kt
@@ -49,7 +49,6 @@ class ProtectionCheck @Inject constructor(
         }
     }
 
-    @JvmOverloads
     fun queryProtection(activity: FragmentActivity, protection: Protection,
                         ok: Runnable?, cancel: Runnable? = null, fail: Runnable? = null) {
         when (ProtectionType.values()[sp.getInt(protectionTypeResourceIDs[protection.ordinal], ProtectionType.NONE.ordinal)]) {
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/java/info/nightscout/androidaps/utils/sharedPreferences/SPImplementation.kt b/core/src/main/java/info/nightscout/androidaps/utils/sharedPreferences/SPImplementation.kt
index 5231a2e4ad..52f5c61f26 100644
--- a/core/src/main/java/info/nightscout/androidaps/utils/sharedPreferences/SPImplementation.kt
+++ b/core/src/main/java/info/nightscout/androidaps/utils/sharedPreferences/SPImplementation.kt
@@ -90,7 +90,11 @@ class SPImplementation @Inject constructor(
         return try {
             sharedPreferences.getLong(key, defaultValue)
         } catch (e: Exception) {
-            SafeParse.stringToLong(sharedPreferences.getString(key, defaultValue.toString()))
+            try {
+                SafeParse.stringToLong(sharedPreferences.getString(key, defaultValue.toString()))
+            } catch (e: Exception) {
+                defaultValue
+            }
         }
     }
 
diff --git a/core/src/main/java/info/nightscout/androidaps/utils/textValidator/DefaultEditTextValidator.kt b/core/src/main/java/info/nightscout/androidaps/utils/textValidator/DefaultEditTextValidator.kt
index 4306ae20fc..220bc2d980 100644
--- a/core/src/main/java/info/nightscout/androidaps/utils/textValidator/DefaultEditTextValidator.kt
+++ b/core/src/main/java/info/nightscout/androidaps/utils/textValidator/DefaultEditTextValidator.kt
@@ -9,25 +9,26 @@ import com.google.android.material.textfield.TextInputLayout
 import info.nightscout.androidaps.core.R
 import info.nightscout.androidaps.utils.textValidator.validators.*
 
+@Suppress("SpellCheckingInspection")
 class DefaultEditTextValidator : EditTextValidator {
-    protected var mValidator: MultiValidator? = null
-    protected var testErrorString: String? = null
-    protected var emptyAllowed = false
-    protected lateinit var editTextView: EditText
+    private var mValidator: MultiValidator? = null
+    private var testErrorString: String? = null
+    private var emptyAllowed = false
+    private lateinit var editTextView: EditText
     private var tw: TextWatcher? = null
     private var defaultEmptyErrorString: String? = null
 
-    protected var testType: Int
-    protected var classType: String? = null
-    protected var customRegexp: String? = null
-    protected var customFormat: String? = null
-    protected var emptyErrorStringActual: String? = null
-    protected var emptyErrorStringDef: String? = null
-    protected var minLength = 0
-    protected var minNumber = 0
-    protected var maxNumber = 0
-    protected var floatminNumber = 0f
-    protected var floatmaxNumber = 0f
+    private var testType: Int
+    private var classType: String? = null
+    private var customRegexp: String? = null
+    private var customFormat: String? = null
+    private var emptyErrorStringActual: String? = null
+    private var emptyErrorStringDef: String? = null
+    private var minLength = 0
+    private var minNumber = 0
+    private var maxNumber = 0
+    private var floatminNumber = 0f
+    private var floatmaxNumber = 0f
 
     @Suppress("unused")
     constructor(editTextView: EditText, context: Context) {
@@ -56,8 +57,7 @@ class DefaultEditTextValidator : EditTextValidator {
 
     @Throws(IllegalArgumentException::class)
     override fun addValidator(theValidator: Validator) {
-        requireNotNull(theValidator) { "theValidator argument should not be null" }
-        mValidator!!.enqueue(theValidator)
+        mValidator?.enqueue(theValidator)
     }
 
     private fun setEditText(editText: EditText) {
@@ -105,9 +105,9 @@ class DefaultEditTextValidator : EditTextValidator {
             EditTextValidator.TEST_ALPHANUMERIC        -> toAdd = AlphaNumericValidator(
                 if (TextUtils.isEmpty(testErrorString)) context.getString(R.string.error_this_field_cannot_contain_special_character) else testErrorString)
             EditTextValidator.TEST_NUMERIC             -> toAdd = NumericValidator(if (TextUtils.isEmpty(testErrorString)) context.getString(R.string.error_only_numeric_digits_allowed) else testErrorString)
-            EditTextValidator.TEST_NUMERIC_RANGE       -> toAdd = NumericRangeValidator(if (TextUtils.isEmpty(testErrorString)) context.getString(R.string.error_only_numeric_digits_range_allowed, Integer.toString(minNumber), Integer.toString(maxNumber)) else testErrorString, minNumber, maxNumber)
-            EditTextValidator.TEST_FLOAT_NUMERIC_RANGE -> toAdd = FloatNumericRangeValidator(if (TextUtils.isEmpty(testErrorString)) context.getString(R.string.error_only_numeric_digits_range_allowed, java.lang.Float.toString(floatminNumber), java.lang.Float.toString(floatmaxNumber)) else testErrorString, floatminNumber, floatmaxNumber)
-            EditTextValidator.TEST_REGEXP              -> toAdd = RegexpValidator(testErrorString, customRegexp)
+            EditTextValidator.TEST_NUMERIC_RANGE       -> toAdd = NumericRangeValidator(if (TextUtils.isEmpty(testErrorString)) context.getString(R.string.error_only_numeric_digits_range_allowed, minNumber.toString(), maxNumber.toString()) else testErrorString, minNumber, maxNumber)
+            EditTextValidator.TEST_FLOAT_NUMERIC_RANGE -> toAdd = FloatNumericRangeValidator(if (TextUtils.isEmpty(testErrorString)) context.getString(R.string.error_only_numeric_digits_range_allowed, floatminNumber.toString(), floatmaxNumber.toString()) else testErrorString, floatminNumber, floatmaxNumber)
+            EditTextValidator.TEST_REGEXP              -> toAdd = RegexpValidator(testErrorString, customRegexp ?: "")
             EditTextValidator.TEST_CREDITCARD          -> toAdd = CreditCardValidator(if (TextUtils.isEmpty(testErrorString)) context.getString(R.string.error_creditcard_number_not_valid) else testErrorString)
             EditTextValidator.TEST_EMAIL               -> toAdd = EmailValidator(if (TextUtils.isEmpty(testErrorString)) context.getString(R.string.error_email_address_not_valid) else testErrorString)
             EditTextValidator.TEST_PHONE               -> toAdd = PhoneValidator(if (TextUtils.isEmpty(testErrorString)) context.getString(R.string.error_phone_not_valid) else testErrorString)
@@ -185,7 +185,7 @@ class DefaultEditTextValidator : EditTextValidator {
         return this
     }
 
-    fun setEmptyErrorString(emptyErrorString: String?): DefaultEditTextValidator {
+    private fun setEmptyErrorString(emptyErrorString: String?): DefaultEditTextValidator {
         emptyErrorStringActual = if (!TextUtils.isEmpty(emptyErrorString)) {
             emptyErrorString
         } else {
@@ -243,6 +243,7 @@ class DefaultEditTextValidator : EditTextValidator {
             !TextUtils.isEmpty(editTextView.error)
         }
 
+    @Suppress("SpellCheckingInspection")
     data class Parameters(
         val testErrorString: String? = null,
         val emptyAllowed: Boolean = false,
diff --git a/core/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/PinStrengthValidator.kt b/core/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/PinStrengthValidator.kt
index 300ea2f380..8e98ee1fe3 100644
--- a/core/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/PinStrengthValidator.kt
+++ b/core/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/PinStrengthValidator.kt
@@ -6,7 +6,6 @@ class PinStrengthValidator(val _customErrorMessage: String?) : Validator(_custom
 
     val regex = "[0-9]{3,6}".toRegex()
 
-    @kotlin.ExperimentalStdlibApi
     override fun isValid(editText: EditText): Boolean {
         return try {
             val value = editText.text.toString()
diff --git a/core/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/RegexpValidator.kt b/core/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/RegexpValidator.kt
index 56f7278f35..a92d03299e 100644
--- a/core/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/RegexpValidator.kt
+++ b/core/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/RegexpValidator.kt
@@ -7,4 +7,4 @@ import java.util.regex.Pattern
  *
  * @author Andrea Baccega <me></me>@andreabaccega.com>
  */
-open class RegexpValidator(message: String?, _regexp: String?) : PatternValidator(message, Pattern.compile(_regexp))
\ No newline at end of file
+open class RegexpValidator(message: String?, _regexp: String) : PatternValidator(message, Pattern.compile(_regexp))
\ No newline at end of file
diff --git a/core/src/main/java/info/nightscout/androidaps/utils/ui/WeekdayPicker.kt b/core/src/main/java/info/nightscout/androidaps/utils/ui/WeekdayPicker.kt
index e76dc1b2e1..b623b7514b 100644
--- a/core/src/main/java/info/nightscout/androidaps/utils/ui/WeekdayPicker.kt
+++ b/core/src/main/java/info/nightscout/androidaps/utils/ui/WeekdayPicker.kt
@@ -10,7 +10,7 @@ import info.nightscout.androidaps.core.databinding.WeekdayPickerBinding
 import info.nightscout.androidaps.extensions.toVisibility
 import java.util.*
 
-class WeekdayPicker @JvmOverloads constructor(
+class WeekdayPicker constructor(
     context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0
 ) : ConstraintLayout(context, attrs, defStyleAttr) {
 
diff --git a/core/src/main/java/info/nightscout/androidaps/utils/userEntry/UserEntryMapper.kt b/core/src/main/java/info/nightscout/androidaps/utils/userEntry/UserEntryMapper.kt
index 2863d007d2..fb667823e4 100644
--- a/core/src/main/java/info/nightscout/androidaps/utils/userEntry/UserEntryMapper.kt
+++ b/core/src/main/java/info/nightscout/androidaps/utils/userEntry/UserEntryMapper.kt
@@ -129,6 +129,8 @@ class UserEntryMapper {
         DanaRC (UserEntry.Sources.DanaRC),
         DanaRv2 (UserEntry.Sources.DanaRv2),
         DanaRS (UserEntry.Sources.DanaRS),
+        DanaI (UserEntry.Sources.DanaI),
+        DiaconnG8 (UserEntry.Sources.DiaconnG8),
         Insight (UserEntry.Sources.Insight),
         Combo (UserEntry.Sources.Combo),
         Medtronic (UserEntry.Sources.Medtronic),
diff --git a/core/src/main/java/info/nightscout/androidaps/utils/userEntry/UserEntryPresentationHelper.kt b/core/src/main/java/info/nightscout/androidaps/utils/userEntry/UserEntryPresentationHelper.kt
index 0faf232c17..f2627a3d55 100644
--- a/core/src/main/java/info/nightscout/androidaps/utils/userEntry/UserEntryPresentationHelper.kt
+++ b/core/src/main/java/info/nightscout/androidaps/utils/userEntry/UserEntryPresentationHelper.kt
@@ -83,6 +83,8 @@ class UserEntryPresentationHelper @Inject constructor(
         Sources.DanaRC              -> R.drawable.ic_danars_128
         Sources.DanaRv2             -> R.drawable.ic_danars_128
         Sources.DanaRS              -> R.drawable.ic_danars_128
+        Sources.DanaI               -> R.drawable.ic_danai_128
+        Sources.DiaconnG8           -> R.drawable.ic_diaconn_g8
         Sources.Insight             -> R.drawable.ic_insight_128
         Sources.Combo               -> R.drawable.ic_combo_128
         Sources.Medtronic           -> R.drawable.ic_veo_128
@@ -123,6 +125,7 @@ class UserEntryPresentationHelper @Inject constructor(
         is ValueWithUnit.SimpleString          -> valueWithUnit.value
         is ValueWithUnit.TherapyEventMeterType -> translator.translate(valueWithUnit.value)
         is ValueWithUnit.TherapyEventTTReason  -> translator.translate(valueWithUnit.value)
+        is ValueWithUnit.OfflineEventReason    -> translator.translate(valueWithUnit.value)
         is ValueWithUnit.TherapyEventType      -> translator.translate(valueWithUnit.value)
         is ValueWithUnit.Timestamp             -> dateUtil.dateAndTimeAndSecondsString(valueWithUnit.value)
 
@@ -165,10 +168,10 @@ class UserEntryPresentationHelper @Inject constructor(
     ) + "\n"
 
     private fun getCsvEntry(entry: UserEntry): String {
-        val fullvalueWithUnitList = ArrayList(entry.values)
+        val fullValueWithUnitList = ArrayList(entry.values)
         val timestampRec = entry.timestamp.toString()
         val dateTimestampRev = dateUtil.dateAndTimeAndSecondsString(entry.timestamp)
-        val utcOffset = dateUtil.timeStringFromSeconds((entry.utcOffset/1000).toInt())
+        val utcOffset = dateUtil.timeStringFromSeconds((entry.utcOffset / 1000).toInt())
         val action = csvString(entry.action)
         var therapyEvent = ""
         val source = translator.translate(entry.source)
@@ -184,7 +187,7 @@ class UserEntryPresentationHelper @Inject constructor(
         var minute = ""
         var noUnit = ""
 
-        for (valueWithUnit in fullvalueWithUnitList.filterNotNull()) {
+        for (valueWithUnit in fullValueWithUnitList.filterNotNull()) {
             when (valueWithUnit) {
                 is ValueWithUnit.Gram                  -> gram = valueWithUnit.value.toString()
                 is ValueWithUnit.Hour                  -> hour = valueWithUnit.value.toString()
@@ -196,6 +199,7 @@ class UserEntryPresentationHelper @Inject constructor(
                 is ValueWithUnit.SimpleString          -> simpleString = simpleString.addWithSeparator(valueWithUnit.value)
                 is ValueWithUnit.TherapyEventMeterType -> therapyEvent = therapyEvent.addWithSeparator(translator.translate(valueWithUnit.value))
                 is ValueWithUnit.TherapyEventTTReason  -> therapyEvent = therapyEvent.addWithSeparator(translator.translate(valueWithUnit.value))
+                is ValueWithUnit.OfflineEventReason    -> therapyEvent = therapyEvent.addWithSeparator(translator.translate(valueWithUnit.value))
                 is ValueWithUnit.TherapyEventType      -> therapyEvent = therapyEvent.addWithSeparator(translator.translate(valueWithUnit.value))
                 is ValueWithUnit.Timestamp             -> timestamp = dateUtil.dateAndTimeAndSecondsString(valueWithUnit.value)
 
@@ -215,9 +219,9 @@ class UserEntryPresentationHelper @Inject constructor(
         return "$timestampRec;$dateTimestampRev;$utcOffset;$action;$therapyEvent;$source;$note;$simpleString;$timestamp;$bg;$gram;$insulin;$unitPerHour;$percent;$hour;$minute;$noUnit"
     }
 
-    private fun csvString(action: Action): String = "\"" + translator.translate(action).replace("\"", "\"\"").replace("\n"," / ") + "\""
-    private fun csvString(id: Int): String = if (id != 0) "\"" + resourceHelper.gs(id).replace("\"", "\"\"").replace("\n"," / ") + "\"" else ""
-    private fun csvString(s: String): String = if (s != "") "\"" + s.replace("\"", "\"\"").replace("\n"," / ") + "\"" else ""
+    private fun csvString(action: Action): String = "\"" + translator.translate(action).replace("\"", "\"\"").replace("\n", " / ") + "\""
+    private fun csvString(id: Int): String = if (id != 0) "\"" + resourceHelper.gs(id).replace("\"", "\"\"").replace("\n", " / ") + "\"" else ""
+    private fun csvString(s: String): String = if (s != "") "\"" + s.replace("\"", "\"\"").replace("\n", " / ") + "\"" else ""
 
     private fun String.addWithSeparator(add: Any) =
         this + (if (this.isBlank()) "" else " / ") + add.toString()
diff --git a/core/src/main/res/drawable/ic_danai_128.xml b/core/src/main/res/drawable/ic_danai_128.xml
new file mode 100644
index 0000000000..d707b93523
--- /dev/null
+++ b/core/src/main/res/drawable/ic_danai_128.xml
@@ -0,0 +1,418 @@
+<vector android:height="62.75782dp" android:viewportHeight="147.02"
+    android:viewportWidth="299.86" android:width="128dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <group>
+        <clip-path android:pathData="M295,14L299.859,14L299.859,51L295,51ZM295,14"/>
+        <path android:fillColor="#3C3736" android:fillType="nonZero"
+            android:pathData="M296.098,14.633L295.16,14.633L295.16,16.293L295.336,16.293L295.336,48.672L295.16,48.672L295.16,50.332L296.098,50.332C299.445,50.195 299.855,47.871 299.855,46.664L299.855,18.301C299.855,17.09 299.445,14.77 296.098,14.633" android:strokeColor="#00000000"/>
+    </group>
+    <path android:fillColor="#383332" android:fillType="nonZero"
+        android:pathData="M294.395,4.184C287.02,2.922 264.855,2.855 262.91,2.855L262.91,6.594C273.313,5.262 292.477,9.754 295.965,10.602L295.965,8.285C295.965,4.719 294.492,4.215 294.395,4.184" android:strokeColor="#00000000"/>
+    <path android:fillColor="#403D3C" android:fillType="nonZero"
+        android:pathData="M295.789,58.559C273.238,52.734 262.91,54.438 262.91,54.438L262.91,62.109C264.855,62.105 287.039,62.043 294.395,60.781C294.473,60.758 295.398,60.43 295.789,58.559" android:strokeColor="#00000000"/>
+    <path android:fillColor="#454546" android:fillType="nonZero"
+        android:pathData="M294.414,60.777C294.414,60.777 294.41,60.777 294.398,60.781C294.402,60.777 294.41,60.777 294.414,60.777" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M295.965,50.566C273.293,44.684 262.91,46.398 262.91,46.398L262.91,54.828C273.117,53.523 291.754,57.82 295.738,58.785C295.875,58.242 295.965,57.555 295.965,56.68" android:strokeColor="#00000000"/>
+    <path android:fillColor="#3E3A39" android:fillType="nonZero"
+        android:pathData="M262.91,38.359L262.91,46.789C273.313,45.457 292.477,49.949 295.965,50.801L295.965,42.527C273.293,36.645 262.91,38.359 262.91,38.359" android:strokeColor="#00000000"/>
+    <path android:fillColor="#383332" android:fillType="nonZero"
+        android:pathData="M295.965,34.484C273.293,28.605 262.91,30.316 262.91,30.316L262.91,38.75C273.313,37.418 292.477,41.91 295.965,42.762L295.965,40.844" android:strokeColor="#00000000"/>
+    <path android:fillColor="#403D3C" android:fillType="nonZero"
+        android:pathData="M262.91,22.277L262.91,30.711C273.313,29.379 292.477,33.871 295.965,34.723L295.965,26.445C273.293,20.566 262.91,22.277 262.91,22.277" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M295.965,18.406C273.293,12.523 262.91,14.238 262.91,14.238L262.91,22.672C273.313,21.34 292.477,25.832 295.965,26.684L295.965,24.121" android:strokeColor="#00000000"/>
+    <path android:fillColor="#3E3A39" android:fillType="nonZero"
+        android:pathData="M262.91,6.199L262.91,14.633C273.313,13.301 292.477,17.793 295.965,18.641L295.965,10.367C273.293,4.484 262.91,6.199 262.91,6.199" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M269.051,132.742L269.051,85.797L269.055,85.789L268.773,85.582L267.887,84.918L267.641,84.738L267.605,84.711L266.492,83.883L266.492,83.879L266.488,83.879L266.473,83.867L266.461,83.879L263.09,83.879L263.09,85.113L256.367,85.113L256.367,138.926L263.09,138.926L263.09,140.363L266.477,140.363L266.477,140.359L267.605,139.52L267.641,139.492L267.887,139.313L268.773,138.648L269.043,138.449L269.051,138.449L269.051,138.445L269.055,138.441L269.051,138.434" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M265.199,65.406L262.625,65.406L262.625,66.293L261.527,66.293L261.527,81.07L262.297,81.07L262.297,82.32L265.199,82.32C265.68,82.32 266.07,81.934 266.07,81.453L266.07,66.273C266.07,65.793 265.68,65.406 265.199,65.406" android:strokeColor="#00000000"/>
+    <group>
+        <clip-path android:pathData="M0,0L264,0L264,147.02L0,147.02ZM0,0"/>
+        <path android:fillColor="#8D8D8D" android:fillType="nonZero"
+            android:pathData="M263.52,0.305L263.52,-0.004L242.012,-0.004L241.77,0.238L240.355,1.656L54.863,1.871L53.168,0.277L52.922,0.031L17.531,0.031L4.016,2.078C1.27,2.078 0.195,4.16 0.012,5.262L0,5.328L0,139.582C0,144.547 3.848,144.957 3.965,144.973L4.016,144.98L4.066,144.98L17.633,147.02L260.664,146.965C261.582,146.965 262.313,146.703 262.828,146.188C263.504,145.508 263.523,144.66 263.523,144.566L263.523,0.305" android:strokeColor="#00000000"/>
+    </group>
+    <path android:fillColor="#CFE7E9" android:fillType="nonZero"
+        android:pathData="M55.031,1.871L54.207,1.809L54.207,13.008C54.207,24.66 67.41,23.664 67.52,23.684L67.57,23.691L223.898,23.691L223.949,23.684C224.059,23.664 237.887,21.629 239.824,9.941L240.355,1.656" android:strokeColor="#00000000"/>
+    <path android:fillColor="#C6CBCB" android:fillType="nonZero"
+        android:pathData="M60.281,8.258L60.281,22.605C63.766,23.922 67.461,23.676 67.52,23.684L67.57,23.691L223.898,23.691L223.953,23.684C224.059,23.664 237.887,21.816 239.824,11.207L240.031,8.258" android:strokeColor="#00000000"/>
+    <path android:fillColor="#656464" android:fillType="nonZero"
+        android:pathData="M231.227,123.652L231.27,123.605C231.262,123.613 231.254,123.625 231.246,123.633C231.238,123.641 231.23,123.645 231.227,123.652M231.574,38.859C228.25,35.535 223.848,33.703 219.18,33.703L25.199,33.703C19.281,33.703 14.469,37.492 14.469,43.41L14.469,119.41C14.469,120.121 14.543,120.801 14.676,121.445L14.676,121.465L14.68,121.477C14.922,122.637 15.375,123.68 15.984,124.605L16.008,124.664L16.051,124.703C17.938,127.48 21.324,129.113 25.199,129.113L219.18,129.113C223.848,129.113 228.25,127.285 231.574,123.961C234.898,120.637 236.727,116.234 236.727,111.566L236.727,51.254C236.727,46.586 234.898,42.184 231.574,38.859" android:strokeColor="#00000000"/>
+    <path android:fillColor="#A5A6A6" android:fillType="nonZero"
+        android:pathData="M231.246,123.633C231.254,123.625 231.262,123.613 231.27,123.605L231.227,123.652C231.23,123.645 231.238,123.641 231.246,123.633" android:strokeColor="#00000000"/>
+    <path android:fillColor="#A5A6A6" android:fillType="nonZero"
+        android:pathData="M236.727,111.566C236.727,116.234 234.898,120.637 231.574,123.961C228.25,127.285 223.848,129.113 219.18,129.113L160.027,129.113L160.027,129.117L25.199,129.117C21.324,129.117 17.938,127.48 16.051,124.703L16.008,124.664L15.984,124.605C15.375,123.68 14.922,122.637 14.68,121.477L14.676,121.465L14.676,121.445C14.543,120.801 14.469,120.121 14.469,119.41L14.469,43.41C14.469,37.492 19.281,33.703 25.199,33.703L219.18,33.703C223.848,33.703 228.25,35.535 231.574,38.859C234.898,42.184 236.727,46.586 236.727,51.254ZM11.285,36.223C11.504,35.703 11.766,35.211 12.055,34.734ZM235.645,34.434C234.992,33.781 234.289,33.203 233.57,32.656L233.469,32.555L233.344,32.488C231.457,31.105 229.363,30.082 227.137,29.465L227.035,29.418L226.898,29.402C225.305,28.98 223.652,28.742 221.961,28.742L21.742,28.742C15.211,28.742 9.898,34.059 9.898,40.586L9.898,122.23C9.898,128.762 15.211,134.074 21.742,134.074L221.961,134.074C227.113,134.074 231.973,132.055 235.645,128.383C239.313,124.715 241.336,119.855 241.336,114.703L241.336,48.117C241.336,42.965 239.313,38.105 235.645,34.434" android:strokeColor="#00000000"/>
+    <group>
+        <clip-path android:pathData="M0,0L161,0L161,147.02L0,147.02ZM0,0"/>
+        <path android:fillColor="#44403F" android:fillType="nonZero"
+            android:pathData="M26.02,147.02L26.02,115.219C26.02,115.203 26.004,114.059 26.742,113.309C27.184,112.855 27.813,112.629 28.609,112.629L152.094,112.629C152.184,112.629 154.242,112.59 156.328,111.504C158.27,110.492 160.582,108.355 160.582,103.902L160.582,58.367C160.582,53.918 158.27,51.777 156.328,50.77C154.242,49.68 152.184,49.645 152.094,49.641L28.609,49.641C27.813,49.641 27.184,49.414 26.742,48.965C26.004,48.211 26.02,47.07 26.02,47.051L26.02,1.031L25.988,0.035L17.531,0.035L4.012,2.078C1.27,2.078 0.195,4.16 0.012,5.262L0,5.328L0,139.582C0,144.547 3.844,144.957 3.965,144.973L4.016,144.98L4.066,144.98L17.633,147.02" android:strokeColor="#00000000"/>
+    </group>
+    <path android:fillColor="#44403F" android:fillType="nonZero"
+        android:pathData="M195.793,65.492C195.793,72.539 190.082,78.25 183.039,78.25C175.992,78.25 170.281,72.539 170.281,65.492C170.281,58.449 175.992,52.738 183.039,52.738C190.082,52.738 195.793,58.449 195.793,65.492" android:strokeColor="#00000000"/>
+    <path android:fillColor="#44403F" android:fillType="nonZero"
+        android:pathData="M223.41,65.492C223.41,72.363 217.844,77.934 210.973,77.934C204.105,77.934 198.535,72.363 198.535,65.492C198.535,58.625 204.105,53.055 210.973,53.055C217.844,53.055 223.41,58.625 223.41,65.492" android:strokeColor="#00000000"/>
+    <path android:fillColor="#44403F" android:fillType="nonZero"
+        android:pathData="M195.477,93.121C195.477,99.992 189.906,105.559 183.039,105.559C176.168,105.559 170.602,99.992 170.602,93.121C170.602,86.25 176.168,80.684 183.039,80.684C189.906,80.684 195.477,86.25 195.477,93.121" android:strokeColor="#00000000"/>
+    <path android:fillColor="#44403F" android:fillType="nonZero"
+        android:pathData="M223.41,93.121C223.41,99.992 217.844,105.559 210.973,105.559C204.105,105.559 198.535,99.992 198.535,93.121C198.535,86.25 204.105,80.684 210.973,80.684C217.844,80.684 223.41,86.25 223.41,93.121" android:strokeColor="#00000000"/>
+    <path android:fillColor="#717071" android:fillType="nonZero"
+        android:pathData="M192.047,65.492C192.047,70.469 188.012,74.5 183.039,74.5C178.063,74.5 174.031,70.469 174.031,65.492C174.031,60.52 178.063,56.488 183.039,56.488C188.012,56.488 192.047,60.52 192.047,65.492" android:strokeColor="#00000000"/>
+    <path android:fillColor="#717071" android:fillType="nonZero"
+        android:pathData="M219.672,65.492C219.672,70.469 215.641,74.5 210.664,74.5C205.691,74.5 201.66,70.469 201.66,65.492C201.66,60.52 205.691,56.488 210.664,56.488C215.641,56.488 219.672,60.52 219.672,65.492" android:strokeColor="#00000000"/>
+    <path android:fillColor="#717071" android:fillType="nonZero"
+        android:pathData="M192.047,93.121C192.047,98.094 188.012,102.129 183.039,102.129C178.063,102.129 174.031,98.094 174.031,93.121C174.031,88.148 178.063,84.113 183.039,84.113C188.012,84.113 192.047,88.148 192.047,93.121" android:strokeColor="#00000000"/>
+    <path android:fillColor="#717071" android:fillType="nonZero"
+        android:pathData="M219.672,93.121C219.672,98.094 215.641,102.129 210.664,102.129C205.691,102.129 201.66,98.094 201.66,93.121C201.66,88.148 205.691,84.113 210.664,84.113C215.641,84.113 219.672,88.148 219.672,93.121" android:strokeColor="#00000000"/>
+    <path android:fillColor="#A7BAB5" android:fillType="nonZero"
+        android:pathData="M148.629,57.242L51.953,57.242C49.32,57.242 47.172,59.25 47.172,61.723L47.172,100.891C47.172,103.363 49.32,105.371 51.953,105.371L148.629,105.371C151.266,105.371 153.41,103.363 153.41,100.891L153.41,61.723C153.41,59.25 151.266,57.242 148.629,57.242" android:strokeColor="#00000000"/>
+    <path android:fillColor="#9A9B9B" android:fillType="nonZero"
+        android:pathData="M214.883,64.547L209.566,61.16C209.281,60.973 209.008,60.871 208.797,60.871C208.336,60.871 208.281,61.563 208.281,61.863L208.281,69.129C208.281,69.746 208.477,70.117 208.797,70.117C209.09,70.117 209.434,69.918 209.566,69.832L214.883,66.438C215.324,66.156 215.566,65.824 215.566,65.496C215.566,65.168 215.324,64.832 214.883,64.547M206.48,61.863C206.48,59.797 207.727,59.066 208.797,59.066C209.363,59.066 209.949,59.258 210.539,59.637L215.852,63.027C216.816,63.645 217.371,64.543 217.371,65.496C217.371,66.445 216.816,67.344 215.852,67.961L210.539,71.352C209.949,71.73 209.363,71.922 208.797,71.922C207.727,71.922 206.48,71.191 206.48,69.129" android:strokeColor="#00000000"/>
+    <path android:fillColor="#9A9B9B" android:fillType="nonZero"
+        android:pathData="M177.82,94.258C177.191,94.258 176.684,93.746 176.684,93.121C176.684,92.496 177.191,91.984 177.82,91.984L188.258,91.984C188.883,91.984 189.395,92.496 189.395,93.121C189.395,93.746 188.883,94.258 188.258,94.258" android:strokeColor="#00000000"/>
+    <path android:fillColor="#9A9B9B" android:fillType="nonZero"
+        android:pathData="M183.039,71.848C182.496,71.848 182.055,71.406 182.055,70.863L182.055,66.477L177.668,66.477C177.125,66.477 176.684,66.035 176.684,65.492C176.684,64.953 177.125,64.512 177.668,64.512L182.055,64.512L182.055,60.121C182.055,59.582 182.496,59.141 183.039,59.141C183.578,59.141 184.02,59.582 184.02,60.121L184.02,64.512L188.41,64.512C188.953,64.512 189.395,64.953 189.395,65.492C189.395,66.035 188.953,66.477 188.41,66.477L184.02,66.477L184.02,70.863C184.02,71.406 183.578,71.848 183.039,71.848" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M30.617,37.18C30.617,37.801 30.121,38.305 29.512,38.305C28.898,38.305 28.402,37.801 28.402,37.18C28.402,36.559 28.898,36.051 29.512,36.051C30.121,36.051 30.617,36.559 30.617,37.18" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M33.605,39.254C33.605,39.871 33.109,40.379 32.5,40.379C31.887,40.379 31.391,39.871 31.391,39.254C31.391,38.629 31.887,38.125 32.5,38.125C33.109,38.125 33.605,38.629 33.605,39.254" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M30.617,41.324C30.617,41.945 30.121,42.453 29.512,42.453C28.898,42.453 28.402,41.945 28.402,41.324C28.402,40.703 28.898,40.195 29.512,40.195C30.121,40.195 30.617,40.703 30.617,41.324" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M30.617,45.469C30.617,46.09 30.121,46.598 29.512,46.598C28.898,46.598 28.402,46.09 28.402,45.469C28.402,44.848 28.898,44.344 29.512,44.344C30.121,44.344 30.617,44.848 30.617,45.469" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M33.605,43.398C33.605,44.02 33.109,44.523 32.5,44.523C31.887,44.523 31.391,44.02 31.391,43.398C31.391,42.777 31.887,42.27 32.5,42.27C33.109,42.27 33.605,42.777 33.605,43.398" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M36.758,37.18C36.758,37.801 36.262,38.305 35.648,38.305C35.035,38.305 34.539,37.801 34.539,37.18C34.539,36.559 35.035,36.051 35.648,36.051C36.262,36.051 36.758,36.559 36.758,37.18" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M39.742,39.254C39.742,39.871 39.25,40.379 38.637,40.379C38.023,40.379 37.527,39.871 37.527,39.254C37.527,38.629 38.023,38.125 38.637,38.125C39.25,38.125 39.742,38.629 39.742,39.254" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M36.758,41.324C36.758,41.945 36.262,42.453 35.648,42.453C35.035,42.453 34.539,41.945 34.539,41.324C34.539,40.703 35.035,40.195 35.648,40.195C36.262,40.195 36.758,40.703 36.758,41.324" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M36.758,45.469C36.758,46.09 36.262,46.598 35.648,46.598C35.035,46.598 34.539,46.09 34.539,45.469C34.539,44.848 35.035,44.344 35.648,44.344C36.262,44.344 36.758,44.848 36.758,45.469" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M39.742,43.398C39.742,44.02 39.25,44.523 38.637,44.523C38.023,44.523 37.527,44.02 37.527,43.398C37.527,42.777 38.023,42.27 38.637,42.27C39.25,42.27 39.742,42.777 39.742,43.398" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M42.895,37.18C42.895,37.801 42.398,38.305 41.785,38.305C41.176,38.305 40.676,37.801 40.676,37.18C40.676,36.559 41.176,36.051 41.785,36.051C42.398,36.051 42.895,36.559 42.895,37.18" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M45.883,39.254C45.883,39.871 45.387,40.379 44.773,40.379C44.16,40.379 43.664,39.871 43.664,39.254C43.664,38.629 44.16,38.125 44.773,38.125C45.387,38.125 45.883,38.629 45.883,39.254" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M42.895,41.324C42.895,41.945 42.398,42.453 41.785,42.453C41.176,42.453 40.676,41.945 40.676,41.324C40.676,40.703 41.176,40.195 41.785,40.195C42.398,40.195 42.895,40.703 42.895,41.324" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M42.895,45.469C42.895,46.09 42.398,46.598 41.785,46.598C41.176,46.598 40.676,46.09 40.676,45.469C40.676,44.848 41.176,44.344 41.785,44.344C42.398,44.344 42.895,44.848 42.895,45.469" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M45.883,43.398C45.883,44.02 45.387,44.523 44.773,44.523C44.16,44.523 43.664,44.02 43.664,43.398C43.664,42.777 44.16,42.27 44.773,42.27C45.387,42.27 45.883,42.777 45.883,43.398" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M49.031,37.18C49.031,37.801 48.535,38.305 47.922,38.305C47.313,38.305 46.816,37.801 46.816,37.18C46.816,36.559 47.313,36.051 47.922,36.051C48.535,36.051 49.031,36.559 49.031,37.18" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M52.02,39.254C52.02,39.871 51.523,40.379 50.91,40.379C50.301,40.379 49.805,39.871 49.805,39.254C49.805,38.629 50.301,38.125 50.91,38.125C51.523,38.125 52.02,38.629 52.02,39.254" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M49.031,41.324C49.031,41.945 48.535,42.453 47.922,42.453C47.313,42.453 46.816,41.945 46.816,41.324C46.816,40.703 47.313,40.195 47.922,40.195C48.535,40.195 49.031,40.703 49.031,41.324" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M49.031,45.469C49.031,46.09 48.535,46.598 47.922,46.598C47.313,46.598 46.816,46.09 46.816,45.469C46.816,44.848 47.313,44.344 47.922,44.344C48.535,44.344 49.031,44.848 49.031,45.469" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M52.02,43.398C52.02,44.02 51.523,44.523 50.91,44.523C50.301,44.523 49.805,44.02 49.805,43.398C49.805,42.777 50.301,42.27 50.91,42.27C51.523,42.27 52.02,42.777 52.02,43.398" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M55.168,37.18C55.168,37.801 54.672,38.305 54.059,38.305C53.449,38.305 52.953,37.801 52.953,37.18C52.953,36.559 53.449,36.051 54.059,36.051C54.672,36.051 55.168,36.559 55.168,37.18" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M58.156,39.254C58.156,39.871 57.66,40.379 57.047,40.379C56.438,40.379 55.941,39.871 55.941,39.254C55.941,38.629 56.438,38.125 57.047,38.125C57.66,38.125 58.156,38.629 58.156,39.254" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M55.168,41.324C55.168,41.945 54.672,42.453 54.059,42.453C53.449,42.453 52.953,41.945 52.953,41.324C52.953,40.703 53.449,40.195 54.059,40.195C54.672,40.195 55.168,40.703 55.168,41.324" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M55.168,45.469C55.168,46.09 54.672,46.598 54.059,46.598C53.449,46.598 52.953,46.09 52.953,45.469C52.953,44.848 53.449,44.344 54.059,44.344C54.672,44.344 55.168,44.848 55.168,45.469" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M58.156,43.398C58.156,44.02 57.66,44.523 57.047,44.523C56.438,44.523 55.941,44.02 55.941,43.398C55.941,42.777 56.438,42.27 57.047,42.27C57.66,42.27 58.156,42.777 58.156,43.398" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M61.305,37.18C61.305,37.801 60.809,38.305 60.195,38.305C59.586,38.305 59.09,37.801 59.09,37.18C59.09,36.559 59.586,36.051 60.195,36.051C60.809,36.051 61.305,36.559 61.305,37.18" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M64.293,39.254C64.293,39.871 63.797,40.379 63.184,40.379C62.574,40.379 62.078,39.871 62.078,39.254C62.078,38.629 62.574,38.125 63.184,38.125C63.797,38.125 64.293,38.629 64.293,39.254" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M61.305,41.324C61.305,41.945 60.809,42.453 60.195,42.453C59.586,42.453 59.09,41.945 59.09,41.324C59.09,40.703 59.586,40.195 60.195,40.195C60.809,40.195 61.305,40.703 61.305,41.324" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M61.305,45.469C61.305,46.09 60.809,46.598 60.195,46.598C59.586,46.598 59.09,46.09 59.09,45.469C59.09,44.848 59.586,44.344 60.195,44.344C60.809,44.344 61.305,44.848 61.305,45.469" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M64.293,43.398C64.293,44.02 63.797,44.523 63.184,44.523C62.574,44.523 62.078,44.02 62.078,43.398C62.078,42.777 62.574,42.27 63.184,42.27C63.797,42.27 64.293,42.777 64.293,43.398" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M67.441,37.18C67.441,37.801 66.949,38.305 66.336,38.305C65.723,38.305 65.227,37.801 65.227,37.18C65.227,36.559 65.723,36.051 66.336,36.051C66.949,36.051 67.441,36.559 67.441,37.18" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M70.43,39.254C70.43,39.871 69.934,40.379 69.32,40.379C68.711,40.379 68.215,39.871 68.215,39.254C68.215,38.629 68.711,38.125 69.32,38.125C69.934,38.125 70.43,38.629 70.43,39.254" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M67.441,41.324C67.441,41.945 66.949,42.453 66.336,42.453C65.723,42.453 65.227,41.945 65.227,41.324C65.227,40.703 65.723,40.195 66.336,40.195C66.949,40.195 67.441,40.703 67.441,41.324" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M67.441,45.469C67.441,46.09 66.949,46.598 66.336,46.598C65.723,46.598 65.227,46.09 65.227,45.469C65.227,44.848 65.723,44.344 66.336,44.344C66.949,44.344 67.441,44.848 67.441,45.469" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M70.43,43.398C70.43,44.02 69.934,44.523 69.32,44.523C68.711,44.523 68.215,44.02 68.215,43.398C68.215,42.777 68.711,42.27 69.32,42.27C69.934,42.27 70.43,42.777 70.43,43.398" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M73.473,37.18C73.473,37.738 73.023,38.195 72.473,38.195C71.918,38.195 71.473,37.738 71.473,37.18C71.473,36.617 71.918,36.16 72.473,36.16C73.023,36.16 73.473,36.617 73.473,37.18" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M76.461,39.254C76.461,39.813 76.012,40.27 75.461,40.27C74.906,40.27 74.461,39.813 74.461,39.254C74.461,38.691 74.906,38.234 75.461,38.234C76.012,38.234 76.461,38.691 76.461,39.254" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M73.473,41.324C73.473,41.887 73.023,42.344 72.473,42.344C71.918,42.344 71.473,41.887 71.473,41.324C71.473,40.762 71.918,40.309 72.473,40.309C73.023,40.309 73.473,40.762 73.473,41.324" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M73.473,45.469C73.473,46.031 73.023,46.488 72.473,46.488C71.918,46.488 71.473,46.031 71.473,45.469C71.473,44.906 71.918,44.453 72.473,44.453C73.023,44.453 73.473,44.906 73.473,45.469" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M76.461,43.398C76.461,43.961 76.012,44.414 75.461,44.414C74.906,44.414 74.461,43.961 74.461,43.398C74.461,42.836 74.906,42.383 75.461,42.383C76.012,42.383 76.461,42.836 76.461,43.398" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M79.609,37.18C79.609,37.738 79.16,38.195 78.609,38.195C78.055,38.195 77.609,37.738 77.609,37.18C77.609,36.617 78.055,36.16 78.609,36.16C79.16,36.16 79.609,36.617 79.609,37.18" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M82.52,39.254C82.52,39.77 82.105,40.191 81.598,40.191C81.09,40.191 80.672,39.77 80.672,39.254C80.672,38.73 81.09,38.313 81.598,38.313C82.105,38.313 82.52,38.73 82.52,39.254" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M79.609,41.324C79.609,41.887 79.16,42.344 78.609,42.344C78.055,42.344 77.609,41.887 77.609,41.324C77.609,40.762 78.055,40.309 78.609,40.309C79.16,40.309 79.609,40.762 79.609,41.324" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M79.609,45.469C79.609,46.031 79.16,46.488 78.609,46.488C78.055,46.488 77.609,46.031 77.609,45.469C77.609,44.906 78.055,44.453 78.609,44.453C79.16,44.453 79.609,44.906 79.609,45.469" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M82.52,43.398C82.52,43.914 82.105,44.34 81.598,44.34C81.09,44.34 80.672,43.914 80.672,43.398C80.672,42.879 81.09,42.457 81.598,42.457C82.105,42.457 82.52,42.879 82.52,43.398" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M85.672,37.18C85.672,37.699 85.258,38.117 84.746,38.117C84.238,38.117 83.824,37.699 83.824,37.18C83.824,36.66 84.238,36.238 84.746,36.238C85.258,36.238 85.672,36.66 85.672,37.18" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M88.656,39.254C88.656,39.77 88.242,40.191 87.734,40.191C87.227,40.191 86.809,39.77 86.809,39.254C86.809,38.73 87.227,38.313 87.734,38.313C88.242,38.313 88.656,38.73 88.656,39.254" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M85.672,41.324C85.672,41.844 85.258,42.266 84.746,42.266C84.238,42.266 83.824,41.844 83.824,41.324C83.824,40.805 84.238,40.383 84.746,40.383C85.258,40.383 85.672,40.805 85.672,41.324" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M85.672,45.469C85.672,45.988 85.258,46.41 84.746,46.41C84.238,46.41 83.824,45.988 83.824,45.469C83.824,44.949 84.238,44.527 84.746,44.527C85.258,44.527 85.672,44.949 85.672,45.469" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M88.656,43.398C88.656,43.914 88.242,44.34 87.734,44.34C87.227,44.34 86.809,43.914 86.809,43.398C86.809,42.879 87.227,42.457 87.734,42.457C88.242,42.457 88.656,42.879 88.656,43.398" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M91.73,37.18C91.73,37.656 91.352,38.039 90.883,38.039C90.414,38.039 90.035,37.656 90.035,37.18C90.035,36.703 90.414,36.316 90.883,36.316C91.352,36.316 91.73,36.703 91.73,37.18" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M94.719,39.254C94.719,39.727 94.34,40.113 93.871,40.113C93.402,40.113 93.023,39.727 93.023,39.254C93.023,38.773 93.402,38.391 93.871,38.391C94.34,38.391 94.719,38.773 94.719,39.254" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M91.73,41.324C91.73,41.801 91.352,42.188 90.883,42.188C90.414,42.188 90.035,41.801 90.035,41.324C90.035,40.848 90.414,40.465 90.883,40.465C91.352,40.465 91.73,40.848 91.73,41.324" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M91.73,45.469C91.73,45.945 91.352,46.332 90.883,46.332C90.414,46.332 90.035,45.945 90.035,45.469C90.035,44.992 90.414,44.609 90.883,44.609C91.352,44.609 91.73,44.992 91.73,45.469" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M94.719,43.398C94.719,43.875 94.34,44.258 93.871,44.258C93.402,44.258 93.023,43.875 93.023,43.398C93.023,42.922 93.402,42.539 93.871,42.539C94.34,42.539 94.719,42.922 94.719,43.398" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M97.789,37.18C97.789,37.609 97.445,37.961 97.02,37.961C96.598,37.961 96.25,37.609 96.25,37.18C96.25,36.746 96.598,36.395 97.02,36.395C97.445,36.395 97.789,36.746 97.789,37.18" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M100.777,39.254C100.777,39.684 100.434,40.035 100.008,40.035C99.586,40.035 99.238,39.684 99.238,39.254C99.238,38.82 99.586,38.469 100.008,38.469C100.434,38.469 100.777,38.82 100.777,39.254" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M97.789,41.324C97.789,41.758 97.445,42.109 97.02,42.109C96.598,42.109 96.25,41.758 96.25,41.324C96.25,40.891 96.598,40.539 97.02,40.539C97.445,40.539 97.789,40.891 97.789,41.324" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M97.789,45.469C97.789,45.902 97.445,46.254 97.02,46.254C96.598,46.254 96.25,45.902 96.25,45.469C96.25,45.035 96.598,44.688 97.02,44.688C97.445,44.688 97.789,45.035 97.789,45.469" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M100.777,43.398C100.777,43.832 100.434,44.18 100.008,44.18C99.586,44.18 99.238,43.832 99.238,43.398C99.238,42.965 99.586,42.613 100.008,42.613C100.434,42.613 100.777,42.965 100.777,43.398" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M103.93,37.18C103.93,37.609 103.586,37.961 103.156,37.961C102.734,37.961 102.387,37.609 102.387,37.18C102.387,36.746 102.734,36.395 103.156,36.395C103.586,36.395 103.93,36.746 103.93,37.18" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M106.914,39.254C106.914,39.684 106.57,40.035 106.145,40.035C105.723,40.035 105.375,39.684 105.375,39.254C105.375,38.82 105.723,38.469 106.145,38.469C106.57,38.469 106.914,38.82 106.914,39.254" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M103.93,41.324C103.93,41.758 103.586,42.109 103.156,42.109C102.734,42.109 102.387,41.758 102.387,41.324C102.387,40.891 102.734,40.539 103.156,40.539C103.586,40.539 103.93,40.891 103.93,41.324" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M103.93,45.469C103.93,45.902 103.586,46.254 103.156,46.254C102.734,46.254 102.387,45.902 102.387,45.469C102.387,45.035 102.734,44.688 103.156,44.688C103.586,44.688 103.93,45.035 103.93,45.469" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M106.914,43.398C106.914,43.832 106.57,44.18 106.145,44.18C105.723,44.18 105.375,43.832 105.375,43.398C105.375,42.965 105.723,42.613 106.145,42.613C106.57,42.613 106.914,42.965 106.914,43.398" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M109.988,37.18C109.988,37.566 109.68,37.883 109.297,37.883C108.914,37.883 108.602,37.566 108.602,37.18C108.602,36.789 108.914,36.473 109.297,36.473C109.68,36.473 109.988,36.789 109.988,37.18" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M112.977,39.254C112.977,39.641 112.668,39.957 112.281,39.957C111.898,39.957 111.59,39.641 111.59,39.254C111.59,38.863 111.898,38.547 112.281,38.547C112.668,38.547 112.977,38.863 112.977,39.254" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M109.988,41.324C109.988,41.715 109.68,42.031 109.297,42.031C108.914,42.031 108.602,41.715 108.602,41.324C108.602,40.934 108.914,40.617 109.297,40.617C109.68,40.617 109.988,40.934 109.988,41.324" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M109.988,45.469C109.988,45.859 109.68,46.176 109.297,46.176C108.914,46.176 108.602,45.859 108.602,45.469C108.602,45.078 108.914,44.766 109.297,44.766C109.68,44.766 109.988,45.078 109.988,45.469" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M112.977,43.398C112.977,43.789 112.668,44.102 112.281,44.102C111.898,44.102 111.59,43.789 111.59,43.398C111.59,43.008 111.898,42.691 112.281,42.691C112.668,42.691 112.977,43.008 112.977,43.398" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M116.051,37.18C116.051,37.523 115.773,37.805 115.434,37.805C115.094,37.805 114.816,37.523 114.816,37.18C114.816,36.832 115.094,36.551 115.434,36.551C115.773,36.551 116.051,36.832 116.051,37.18" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M119.035,39.254C119.035,39.598 118.762,39.879 118.422,39.879C118.078,39.879 117.805,39.598 117.805,39.254C117.805,38.906 118.078,38.625 118.422,38.625C118.762,38.625 119.035,38.906 119.035,39.254" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M116.051,41.324C116.051,41.672 115.773,41.953 115.434,41.953C115.094,41.953 114.816,41.672 114.816,41.324C114.816,40.98 115.094,40.699 115.434,40.699C115.773,40.699 116.051,40.98 116.051,41.324" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M116.051,45.469C116.051,45.816 115.773,46.098 115.434,46.098C115.094,46.098 114.816,45.816 114.816,45.469C114.816,45.125 115.094,44.844 115.434,44.844C115.773,44.844 116.051,45.125 116.051,45.469" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M119.035,43.398C119.035,43.742 118.762,44.023 118.422,44.023C118.078,44.023 117.805,43.742 117.805,43.398C117.805,43.051 118.078,42.773 118.422,42.773C118.762,42.773 119.035,43.051 119.035,43.398" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M122.188,37.18C122.188,37.523 121.91,37.805 121.57,37.805C121.23,37.805 120.953,37.523 120.953,37.18C120.953,36.832 121.23,36.551 121.57,36.551C121.91,36.551 122.188,36.832 122.188,37.18" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M125.172,39.254C125.172,39.598 124.898,39.879 124.559,39.879C124.219,39.879 123.941,39.598 123.941,39.254C123.941,38.906 124.219,38.625 124.559,38.625C124.898,38.625 125.172,38.906 125.172,39.254" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M122.188,41.324C122.188,41.672 121.91,41.953 121.57,41.953C121.23,41.953 120.953,41.672 120.953,41.324C120.953,40.98 121.23,40.699 121.57,40.699C121.91,40.699 122.188,40.98 122.188,41.324" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M122.188,45.469C122.188,45.816 121.91,46.098 121.57,46.098C121.23,46.098 120.953,45.816 120.953,45.469C120.953,45.125 121.23,44.844 121.57,44.844C121.91,44.844 122.188,45.125 122.188,45.469" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M125.172,43.398C125.172,43.742 124.898,44.023 124.559,44.023C124.219,44.023 123.941,43.742 123.941,43.398C123.941,43.051 124.219,42.773 124.559,42.773C124.898,42.773 125.172,43.051 125.172,43.398" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M128.246,37.18C128.246,37.48 128.008,37.727 127.707,37.727C127.41,37.727 127.168,37.48 127.168,37.18C127.168,36.875 127.41,36.633 127.707,36.633C128.008,36.633 128.246,36.875 128.246,37.18" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M131.156,39.254C131.156,39.512 130.953,39.723 130.695,39.723C130.441,39.723 130.234,39.512 130.234,39.254C130.234,38.992 130.441,38.781 130.695,38.781C130.953,38.781 131.156,38.992 131.156,39.254" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M128.246,41.324C128.246,41.629 128.008,41.871 127.707,41.871C127.41,41.871 127.168,41.629 127.168,41.324C127.168,41.023 127.41,40.777 127.707,40.777C128.008,40.777 128.246,41.023 128.246,41.324" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M128.246,45.469C128.246,45.773 128.008,46.02 127.707,46.02C127.41,46.02 127.168,45.773 127.168,45.469C127.168,45.168 127.41,44.922 127.707,44.922C128.008,44.922 128.246,45.168 128.246,45.469" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M131.156,43.398C131.156,43.656 130.953,43.867 130.695,43.867C130.441,43.867 130.234,43.656 130.234,43.398C130.234,43.137 130.441,42.926 130.695,42.926C130.953,42.926 131.156,43.137 131.156,43.398" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M134.309,37.18C134.309,37.438 134.102,37.648 133.844,37.648C133.59,37.648 133.383,37.438 133.383,37.18C133.383,36.918 133.59,36.707 133.844,36.707C134.102,36.707 134.309,36.918 134.309,37.18" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M137.297,39.254C137.297,39.512 137.09,39.723 136.832,39.723C136.578,39.723 136.371,39.512 136.371,39.254C136.371,38.992 136.578,38.781 136.832,38.781C137.09,38.781 137.297,38.992 137.297,39.254" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M134.309,41.324C134.309,41.586 134.102,41.797 133.844,41.797C133.59,41.797 133.383,41.586 133.383,41.324C133.383,41.066 133.59,40.855 133.844,40.855C134.102,40.855 134.309,41.066 134.309,41.324" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M134.309,45.469C134.309,45.73 134.102,45.941 133.844,45.941C133.59,45.941 133.383,45.73 133.383,45.469C133.383,45.211 133.59,45 133.844,45C134.102,45 134.309,45.211 134.309,45.469" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M137.297,43.398C137.297,43.656 137.09,43.867 136.832,43.867C136.578,43.867 136.371,43.656 136.371,43.398C136.371,43.137 136.578,42.926 136.832,42.926C137.09,42.926 137.297,43.137 137.297,43.398" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M140.367,37.18C140.367,37.395 140.195,37.57 139.98,37.57C139.77,37.57 139.598,37.395 139.598,37.18C139.598,36.965 139.77,36.789 139.98,36.789C140.195,36.789 140.367,36.965 140.367,37.18" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M143.355,39.254C143.355,39.469 143.184,39.645 142.969,39.645C142.758,39.645 142.586,39.469 142.586,39.254C142.586,39.035 142.758,38.859 142.969,38.859C143.184,38.859 143.355,39.035 143.355,39.254" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M140.367,41.324C140.367,41.539 140.195,41.715 139.98,41.715C139.77,41.715 139.598,41.539 139.598,41.324C139.598,41.109 139.77,40.934 139.98,40.934C140.195,40.934 140.367,41.109 140.367,41.324" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M140.367,45.469C140.367,45.684 140.195,45.859 139.98,45.859C139.77,45.859 139.598,45.684 139.598,45.469C139.598,45.254 139.77,45.078 139.98,45.078C140.195,45.078 140.367,45.254 140.367,45.469" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M143.355,43.398C143.355,43.613 143.184,43.789 142.969,43.789C142.758,43.789 142.586,43.613 142.586,43.398C142.586,43.184 142.758,43.008 142.969,43.008C143.184,43.008 143.355,43.184 143.355,43.398" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M146.426,37.18C146.426,37.352 146.289,37.492 146.117,37.492C145.949,37.492 145.813,37.352 145.813,37.18C145.813,37.008 145.949,36.867 146.117,36.867C146.289,36.867 146.426,37.008 146.426,37.18" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M149.414,39.254C149.414,39.426 149.277,39.566 149.105,39.566C148.938,39.566 148.801,39.426 148.801,39.254C148.801,39.078 148.938,38.938 149.105,38.938C149.277,38.938 149.414,39.078 149.414,39.254" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M146.426,41.324C146.426,41.496 146.289,41.637 146.117,41.637C145.949,41.637 145.813,41.496 145.813,41.324C145.813,41.152 145.949,41.012 146.117,41.012C146.289,41.012 146.426,41.152 146.426,41.324" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M146.426,45.469C146.426,45.641 146.289,45.781 146.117,45.781C145.949,45.781 145.813,45.641 145.813,45.469C145.813,45.297 145.949,45.156 146.117,45.156C146.289,45.156 146.426,45.297 146.426,45.469" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M149.414,43.398C149.414,43.57 149.277,43.711 149.105,43.711C148.938,43.711 148.801,43.57 148.801,43.398C148.801,43.223 148.938,43.086 149.105,43.086C149.277,43.086 149.414,43.223 149.414,43.398" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M152.488,37.18C152.488,37.309 152.383,37.414 152.258,37.414C152.129,37.414 152.023,37.309 152.023,37.18C152.023,37.047 152.129,36.941 152.258,36.941C152.383,36.941 152.488,37.047 152.488,37.18" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M155.477,39.254C155.477,39.383 155.371,39.488 155.242,39.488C155.117,39.488 155.012,39.383 155.012,39.254C155.012,39.121 155.117,39.016 155.242,39.016C155.371,39.016 155.477,39.121 155.477,39.254" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M152.488,41.324C152.488,41.453 152.383,41.559 152.258,41.559C152.129,41.559 152.023,41.453 152.023,41.324C152.023,41.195 152.129,41.09 152.258,41.09C152.383,41.09 152.488,41.195 152.488,41.324" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M152.488,45.469C152.488,45.602 152.383,45.703 152.258,45.703C152.129,45.703 152.023,45.602 152.023,45.469C152.023,45.34 152.129,45.234 152.258,45.234C152.383,45.234 152.488,45.34 152.488,45.469" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M155.477,43.398C155.477,43.527 155.371,43.633 155.242,43.633C155.117,43.633 155.012,43.527 155.012,43.398C155.012,43.266 155.117,43.164 155.242,43.164C155.371,43.164 155.477,43.266 155.477,43.398" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M30.656,116.375C30.656,116.996 30.152,117.5 29.531,117.5C28.906,117.5 28.402,116.996 28.402,116.375C28.402,115.75 28.906,115.246 29.531,115.246C30.152,115.246 30.656,115.75 30.656,116.375" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M33.699,118.445C33.699,119.066 33.195,119.574 32.57,119.574C31.949,119.574 31.445,119.066 31.445,118.445C31.445,117.824 31.949,117.316 32.57,117.316C33.195,117.316 33.699,117.824 33.699,118.445" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M30.656,120.52C30.656,121.141 30.152,121.648 29.531,121.648C28.906,121.648 28.402,121.141 28.402,120.52C28.402,119.898 28.906,119.391 29.531,119.391C30.152,119.391 30.656,119.898 30.656,120.52" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M30.656,124.664C30.656,125.285 30.152,125.793 29.531,125.793C28.906,125.793 28.402,125.285 28.402,124.664C28.402,124.043 28.906,123.535 29.531,123.535C30.152,123.535 30.656,124.043 30.656,124.664" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M33.699,122.594C33.699,123.215 33.195,123.719 32.57,123.719C31.949,123.719 31.445,123.215 31.445,122.594C31.445,121.969 31.949,121.465 32.57,121.465C33.195,121.465 33.699,121.969 33.699,122.594" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M36.715,116.375C36.715,116.891 36.293,117.313 35.773,117.313C35.258,117.313 34.832,116.891 34.832,116.375C34.832,115.852 35.258,115.434 35.773,115.434C36.293,115.434 36.715,115.852 36.715,116.375" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M39.754,118.445C39.754,118.965 39.332,119.387 38.813,119.387C38.297,119.387 37.875,118.965 37.875,118.445C37.875,117.926 38.297,117.504 38.813,117.504C39.332,117.504 39.754,117.926 39.754,118.445" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M36.715,120.52C36.715,121.039 36.293,121.461 35.773,121.461C35.258,121.461 34.832,121.039 34.832,120.52C34.832,120 35.258,119.578 35.773,119.578C36.293,119.578 36.715,120 36.715,120.52" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M36.715,124.664C36.715,125.184 36.293,125.605 35.773,125.605C35.258,125.605 34.832,125.184 34.832,124.664C34.832,124.145 35.258,123.723 35.773,123.723C36.293,123.723 36.715,124.145 36.715,124.664" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M39.754,122.594C39.754,123.113 39.332,123.531 38.813,123.531C38.297,123.531 37.875,123.113 37.875,122.594C37.875,122.074 38.297,121.652 38.813,121.652C39.332,121.652 39.754,122.074 39.754,122.594" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M36.715,116.375C36.715,116.891 36.293,117.313 35.773,117.313C35.258,117.313 34.832,116.891 34.832,116.375C34.832,115.852 35.258,115.434 35.773,115.434C36.293,115.434 36.715,115.852 36.715,116.375" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M39.754,118.445C39.754,118.965 39.332,119.387 38.813,119.387C38.297,119.387 37.875,118.965 37.875,118.445C37.875,117.926 38.297,117.504 38.813,117.504C39.332,117.504 39.754,117.926 39.754,118.445" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M36.715,120.52C36.715,121.039 36.293,121.461 35.773,121.461C35.258,121.461 34.832,121.039 34.832,120.52C34.832,120 35.258,119.578 35.773,119.578C36.293,119.578 36.715,120 36.715,120.52" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M36.715,124.664C36.715,125.184 36.293,125.605 35.773,125.605C35.258,125.605 34.832,125.184 34.832,124.664C34.832,124.145 35.258,123.723 35.773,123.723C36.293,123.723 36.715,124.145 36.715,124.664" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M39.754,122.594C39.754,123.113 39.332,123.531 38.813,123.531C38.297,123.531 37.875,123.113 37.875,122.594C37.875,122.074 38.297,121.652 38.813,121.652C39.332,121.652 39.754,122.074 39.754,122.594" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M42.801,116.375C42.801,116.805 42.453,117.156 42.02,117.156C41.586,117.156 41.234,116.805 41.234,116.375C41.234,115.941 41.586,115.59 42.02,115.59C42.453,115.59 42.801,115.941 42.801,116.375" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M45.844,118.445C45.844,118.879 45.492,119.23 45.059,119.23C44.625,119.23 44.273,118.879 44.273,118.445C44.273,118.012 44.625,117.664 45.059,117.664C45.492,117.664 45.844,118.012 45.844,118.445" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M42.801,120.52C42.801,120.949 42.453,121.305 42.02,121.305C41.586,121.305 41.234,120.949 41.234,120.52C41.234,120.086 41.586,119.734 42.02,119.734C42.453,119.734 42.801,120.086 42.801,120.52" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M42.801,124.664C42.801,125.098 42.453,125.449 42.02,125.449C41.586,125.449 41.234,125.098 41.234,124.664C41.234,124.23 41.586,123.879 42.02,123.879C42.453,123.879 42.801,124.23 42.801,124.664" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M45.844,122.594C45.844,123.023 45.492,123.375 45.059,123.375C44.625,123.375 44.273,123.023 44.273,122.594C44.273,122.16 44.625,121.809 45.059,121.809C45.492,121.809 45.844,122.16 45.844,122.594" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M49.047,116.375C49.047,116.805 48.695,117.156 48.262,117.156C47.832,117.156 47.477,116.805 47.477,116.375C47.477,115.941 47.832,115.59 48.262,115.59C48.695,115.59 49.047,115.941 49.047,116.375" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M51.93,118.445C51.93,118.793 51.648,119.07 51.301,119.07C50.957,119.07 50.676,118.793 50.676,118.445C50.676,118.102 50.957,117.82 51.301,117.82C51.648,117.82 51.93,118.102 51.93,118.445" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M49.047,120.52C49.047,120.949 48.695,121.305 48.262,121.305C47.832,121.305 47.477,120.949 47.477,120.52C47.477,120.086 47.832,119.734 48.262,119.734C48.695,119.734 49.047,120.086 49.047,120.52" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M49.047,124.664C49.047,125.098 48.695,125.449 48.262,125.449C47.832,125.449 47.477,125.098 47.477,124.664C47.477,124.23 47.832,123.879 48.262,123.879C48.695,123.879 49.047,124.23 49.047,124.664" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M51.93,122.594C51.93,122.938 51.648,123.219 51.301,123.219C50.957,123.219 50.676,122.938 50.676,122.594C50.676,122.246 50.957,121.965 51.301,121.965C51.648,121.965 51.93,122.246 51.93,122.594" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M55.133,116.375C55.133,116.719 54.852,117 54.508,117C54.16,117 53.883,116.719 53.883,116.375C53.883,116.027 54.16,115.746 54.508,115.746C54.852,115.746 55.133,116.027 55.133,116.375" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M58.016,118.445C58.016,118.707 57.809,118.914 57.547,118.914C57.285,118.914 57.078,118.707 57.078,118.445C57.078,118.188 57.285,117.977 57.547,117.977C57.809,117.977 58.016,118.188 58.016,118.445" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M55.133,120.52C55.133,120.863 54.852,121.145 54.508,121.145C54.16,121.145 53.883,120.863 53.883,120.52C53.883,120.172 54.16,119.891 54.508,119.891C54.852,119.891 55.133,120.172 55.133,120.52" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M55.133,124.664C55.133,125.008 54.852,125.289 54.508,125.289C54.16,125.289 53.883,125.008 53.883,124.664C53.883,124.316 54.16,124.039 54.508,124.039C54.852,124.039 55.133,124.316 55.133,124.664" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M58.016,122.59C58.016,122.852 57.809,123.063 57.547,123.063C57.285,123.063 57.078,122.852 57.078,122.59C57.078,122.332 57.285,122.121 57.547,122.121C57.809,122.121 58.016,122.332 58.016,122.59" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M61.219,116.375C61.219,116.633 61.012,116.844 60.75,116.844C60.492,116.844 60.281,116.633 60.281,116.375C60.281,116.113 60.492,115.902 60.75,115.902C61.012,115.902 61.219,116.113 61.219,116.375" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M64.262,118.445C64.262,118.707 64.051,118.914 63.789,118.914C63.531,118.914 63.32,118.707 63.32,118.445C63.32,118.188 63.531,117.977 63.789,117.977C64.051,117.977 64.262,118.188 64.262,118.445" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M61.219,120.52C61.219,120.777 61.012,120.988 60.75,120.988C60.492,120.988 60.281,120.777 60.281,120.52C60.281,120.258 60.492,120.047 60.75,120.047C61.012,120.047 61.219,120.258 61.219,120.52" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M61.219,124.664C61.219,124.922 61.012,125.133 60.75,125.133C60.492,125.133 60.281,124.922 60.281,124.664C60.281,124.402 60.492,124.191 60.75,124.191C61.012,124.191 61.219,124.402 61.219,124.664" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M64.262,122.59C64.262,122.852 64.051,123.063 63.789,123.063C63.531,123.063 63.32,122.852 63.32,122.59C63.32,122.332 63.531,122.121 63.789,122.121C64.051,122.121 64.262,122.332 64.262,122.59" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M67.309,116.371C67.309,116.543 67.168,116.684 66.996,116.684C66.824,116.684 66.68,116.543 66.68,116.371C66.68,116.199 66.824,116.059 66.996,116.059C67.168,116.059 67.309,116.199 67.309,116.371" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M70.348,118.445C70.348,118.617 70.207,118.758 70.035,118.758C69.863,118.758 69.723,118.617 69.723,118.445C69.723,118.273 69.863,118.133 70.035,118.133C70.207,118.133 70.348,118.273 70.348,118.445" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M67.309,120.52C67.309,120.691 67.168,120.832 66.996,120.832C66.824,120.832 66.68,120.691 66.68,120.52C66.68,120.344 66.824,120.203 66.996,120.203C67.168,120.203 67.309,120.344 67.309,120.52" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M67.309,124.664C67.309,124.836 67.168,124.977 66.996,124.977C66.824,124.977 66.68,124.836 66.68,124.664C66.68,124.488 66.824,124.352 66.996,124.352C67.168,124.352 67.309,124.488 67.309,124.664" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M70.348,122.59C70.348,122.762 70.207,122.906 70.035,122.906C69.863,122.906 69.723,122.762 69.723,122.59C69.723,122.418 69.863,122.277 70.035,122.277C70.207,122.277 70.348,122.418 70.348,122.59" android:strokeColor="#00000000"/>
+    <path android:fillColor="#9FA0A1" android:fillType="nonZero"
+        android:pathData="M157.426,118.492L161.555,118.492C160.918,124.699 155.484,125.578 155.484,125.578C158.07,123.195 157.563,119.586 157.426,118.492" android:strokeColor="#00000000"/>
+    <path android:fillColor="#9FA0A1" android:fillType="nonZero"
+        android:pathData="M125.867,123.109C125.527,123.406 125.074,123.555 124.492,123.555L123.598,123.555L123.598,120.398L124.492,120.398C125.074,120.398 125.527,120.551 125.867,120.848C126.191,121.137 126.359,121.531 126.371,121.98C126.359,122.426 126.191,122.82 125.867,123.109M127.84,119.594C127.199,118.891 126.438,118.531 125.563,118.531L121.289,118.531L121.289,125.422L125.563,125.422C126.438,125.422 127.199,125.066 127.84,124.363C128.477,123.664 128.797,122.891 128.809,121.98C128.797,121.066 128.477,120.293 127.84,119.594" android:strokeColor="#00000000"/>
+    <path android:fillColor="#9FA0A1" android:fillType="nonZero"
+        android:pathData="M133.238,124.16C132.488,124.16 131.887,123.684 131.887,123.102C131.887,122.52 132.488,122.043 133.238,122.043C133.984,122.043 134.59,122.52 134.59,123.102C134.59,123.684 133.984,124.16 133.238,124.16M135.316,118.867C134.238,118.332 133.34,118.301 132.41,118.352C131.863,118.383 131.164,118.504 130.434,118.742C130.305,118.785 130.172,118.832 130.039,118.883C130.121,119.121 130.238,119.332 130.449,119.535L130.473,119.559C131.09,120.125 132.406,119.855 133.348,119.996C134.297,120.137 134.461,121.031 134.461,121.031C133.949,120.758 133.336,120.59 132.668,120.59C130.926,120.59 129.504,121.711 129.504,123.09C129.504,124.422 130.836,125.52 132.508,125.582C132.758,125.59 133.195,125.574 133.785,125.438C135.945,124.934 136.887,125.449 136.887,125.449L136.887,121.754C136.887,119.949 136.203,119.309 135.316,118.867" android:strokeColor="#00000000"/>
+    <path android:fillColor="#9FA0A1" android:fillType="nonZero"
+        android:pathData="M149.84,124.16C149.098,124.16 148.488,123.684 148.488,123.102C148.488,122.52 149.098,122.043 149.84,122.043C150.586,122.043 151.191,122.52 151.191,123.102C151.191,123.684 150.586,124.16 149.84,124.16M151.926,118.867C150.844,118.332 149.945,118.301 149.012,118.352C148.469,118.383 147.766,118.504 147.039,118.742C146.91,118.785 146.777,118.832 146.645,118.883C146.727,119.121 146.844,119.332 147.055,119.535L147.078,119.559C147.695,120.125 149.008,119.855 149.953,119.996C150.898,120.137 151.063,121.031 151.063,121.031C150.551,120.758 149.938,120.59 149.273,120.59C147.527,120.59 146.105,121.711 146.105,123.09C146.105,124.422 147.438,125.52 149.109,125.582C149.359,125.59 149.801,125.574 150.387,125.438C152.547,124.934 153.488,125.449 153.488,125.449L153.488,121.754C153.488,119.949 152.809,119.309 151.926,118.867" android:strokeColor="#00000000"/>
+    <path android:fillColor="#9FA0A1" android:fillType="nonZero"
+        android:pathData="M136.844,114.5L133.953,114.5C134.48,118.031 137.953,118.547 137.953,118.547C136.477,117.184 136.77,115.125 136.844,114.5" android:strokeColor="#00000000"/>
+    <path android:fillColor="#9FA0A1" android:fillType="nonZero"
+        android:pathData="M145.258,121.035C145.258,120.109 144.988,119.516 144.477,119.074C143.98,118.652 143.355,118.484 142.699,118.484C142.102,118.484 141.633,118.609 141.262,118.754C139.313,119.484 138.176,118.723 138.176,118.723L138.176,125.422L140.516,125.422L140.516,120.891C140.516,120.891 140.969,120.418 141.719,120.398C142.469,120.371 142.922,120.824 142.922,121.852L142.918,125.422L145.262,125.422" android:strokeColor="#00000000"/>
+    <path android:fillColor="#9FA0A1" android:fillType="nonZero"
+        android:pathData="M78.035,123.984L78.566,123.984L78.566,119.969L78.035,119.969ZM78.035,123.984" android:strokeColor="#00000000"/>
+    <path android:fillColor="#9FA0A1" android:fillType="nonZero"
+        android:pathData="M79.5,123.988L79.5,119.969L80.043,119.969L82.156,123.125L82.156,119.969L82.664,119.969L82.664,123.988L82.121,123.988L80.008,120.828L80.008,123.988" android:strokeColor="#00000000"/>
+    <path android:fillColor="#9FA0A1" android:fillType="nonZero"
+        android:pathData="M83.379,122.695L83.883,122.652C83.906,122.855 83.961,123.02 84.043,123.148C84.133,123.277 84.27,123.383 84.453,123.461C84.633,123.539 84.84,123.578 85.066,123.578C85.27,123.578 85.449,123.551 85.605,123.488C85.762,123.43 85.875,123.348 85.953,123.242C86.027,123.137 86.066,123.02 86.066,122.898C86.066,122.77 86.027,122.66 85.957,122.566C85.883,122.469 85.762,122.395 85.594,122.328C85.488,122.289 85.246,122.223 84.879,122.133C84.508,122.047 84.254,121.961 84.102,121.883C83.91,121.781 83.766,121.656 83.672,121.508C83.578,121.359 83.531,121.191 83.531,121.004C83.531,120.805 83.59,120.617 83.703,120.441C83.82,120.262 83.988,120.125 84.211,120.039C84.43,119.945 84.676,119.902 84.945,119.902C85.246,119.902 85.508,119.949 85.734,120.043C85.961,120.141 86.141,120.281 86.262,120.465C86.383,120.652 86.449,120.863 86.457,121.102L85.949,121.137C85.918,120.883 85.828,120.691 85.668,120.563C85.512,120.434 85.277,120.371 84.969,120.371C84.645,120.371 84.414,120.426 84.266,120.547C84.117,120.664 84.043,120.805 84.043,120.969C84.043,121.117 84.098,121.234 84.203,121.328C84.301,121.422 84.57,121.52 85.004,121.613C85.434,121.711 85.73,121.797 85.891,121.871C86.129,121.98 86.301,122.117 86.414,122.281C86.52,122.445 86.578,122.637 86.578,122.855C86.578,123.066 86.52,123.27 86.395,123.457C86.27,123.645 86.094,123.793 85.867,123.898C85.637,124.004 85.379,124.059 85.094,124.059C84.727,124.059 84.422,124.004 84.176,123.898C83.93,123.789 83.738,123.633 83.598,123.418C83.461,123.207 83.387,122.965 83.379,122.695" android:strokeColor="#00000000"/>
+    <path android:fillColor="#9FA0A1" android:fillType="nonZero"
+        android:pathData="M89.945,119.969L90.473,119.969L90.473,122.293C90.473,122.699 90.426,123.016 90.336,123.254C90.246,123.488 90.082,123.684 89.84,123.836C89.602,123.984 89.289,124.059 88.906,124.059C88.527,124.059 88.219,123.992 87.977,123.859C87.738,123.73 87.566,123.543 87.469,123.297C87.363,123.051 87.313,122.715 87.313,122.293L87.313,119.969L87.848,119.969L87.848,122.289C87.848,122.637 87.879,122.895 87.941,123.059C88.008,123.227 88.117,123.355 88.277,123.445C88.434,123.531 88.629,123.578 88.855,123.578C89.25,123.578 89.527,123.488 89.691,123.313C89.859,123.133 89.945,122.793 89.945,122.289" android:strokeColor="#00000000"/>
+    <path android:fillColor="#9FA0A1" android:fillType="nonZero"
+        android:pathData="M91.336,123.988L91.336,119.969L91.871,119.969L91.871,123.516L93.848,123.516L93.848,123.988" android:strokeColor="#00000000"/>
+    <path android:fillColor="#9FA0A1" android:fillType="nonZero"
+        android:pathData="M94.574,123.984L95.105,123.984L95.105,119.969L94.574,119.969ZM94.574,123.984" android:strokeColor="#00000000"/>
+    <path android:fillColor="#9FA0A1" android:fillType="nonZero"
+        android:pathData="M96.035,123.988L96.035,119.969L96.582,119.969L98.695,123.125L98.695,119.969L99.203,119.969L99.203,123.988L98.66,123.988L96.547,120.828L96.547,123.988" android:strokeColor="#00000000"/>
+    <path android:fillColor="#9FA0A1" android:fillType="nonZero"
+        android:pathData="M101.781,121.883L102.82,121.883C103.164,121.883 103.41,121.816 103.551,121.688C103.695,121.559 103.77,121.379 103.77,121.148C103.77,120.98 103.723,120.836 103.641,120.715C103.555,120.594 103.445,120.516 103.305,120.477C103.215,120.457 103.051,120.441 102.809,120.441L101.781,120.441ZM101.246,123.988L101.246,119.969L102.766,119.969C103.031,119.969 103.234,119.98 103.375,120.008C103.574,120.039 103.738,120.102 103.871,120.195C104.008,120.289 104.113,120.418 104.195,120.582C104.277,120.75 104.316,120.93 104.316,121.133C104.316,121.473 104.207,121.762 103.988,121.996C103.773,122.234 103.379,122.352 102.813,122.352L101.781,122.352L101.781,123.988" android:strokeColor="#00000000"/>
+    <path android:fillColor="#9FA0A1" android:fillType="nonZero"
+        android:pathData="M107.633,119.969L108.164,119.969L108.164,122.293C108.164,122.699 108.117,123.016 108.027,123.254C107.938,123.488 107.77,123.684 107.531,123.836C107.293,123.984 106.98,124.059 106.594,124.059C106.215,124.059 105.906,123.992 105.668,123.859C105.43,123.73 105.258,123.543 105.152,123.297C105.055,123.051 105.004,122.715 105.004,122.293L105.004,119.969L105.535,119.969L105.535,122.289C105.535,122.637 105.566,122.895 105.629,123.059C105.695,123.227 105.809,123.355 105.965,123.445C106.125,123.531 106.316,123.578 106.547,123.578C106.938,123.578 107.215,123.488 107.383,123.313C107.547,123.133 107.633,122.793 107.633,122.289" android:strokeColor="#00000000"/>
+    <path android:fillColor="#9FA0A1" android:fillType="nonZero"
+        android:pathData="M109.035,123.988L109.035,119.969L109.832,119.969L110.785,122.813C110.871,123.078 110.938,123.277 110.977,123.41C111.02,123.266 111.094,123.047 111.191,122.766L112.152,119.969L112.871,119.969L112.871,123.988L112.355,123.988L112.355,120.625L111.188,123.988L110.707,123.988L109.547,120.566L109.547,123.988" android:strokeColor="#00000000"/>
+    <path android:fillColor="#9FA0A1" android:fillType="nonZero"
+        android:pathData="M114.258,121.883L115.297,121.883C115.641,121.883 115.883,121.816 116.027,121.688C116.172,121.559 116.246,121.379 116.246,121.148C116.246,120.98 116.203,120.836 116.117,120.715C116.035,120.594 115.922,120.516 115.785,120.477C115.691,120.457 115.527,120.441 115.285,120.441L114.258,120.441ZM113.727,123.988L113.727,119.969L115.242,119.969C115.508,119.969 115.715,119.98 115.855,120.008C116.055,120.039 116.215,120.102 116.352,120.195C116.484,120.289 116.59,120.418 116.672,120.582C116.754,120.75 116.797,120.93 116.797,121.133C116.797,121.473 116.688,121.762 116.469,121.996C116.25,122.234 115.859,122.352 115.289,122.352L114.258,122.352L114.258,123.988" android:strokeColor="#00000000"/>
+    <path android:fillColor="#9FA0A1" android:fillType="nonZero"
+        android:pathData="M118.941,126.082C118.789,126.082 118.664,125.957 118.664,125.805L118.664,118.152C118.664,118 118.789,117.879 118.941,117.879C119.098,117.879 119.219,118 119.219,118.152L119.219,125.805C119.219,125.957 119.098,126.082 118.941,126.082" android:strokeColor="#00000000"/>
+    <path android:fillColor="#9FA0A1" android:fillType="nonZero"
+        android:pathData="M160.898,115.699C160.898,116.48 160.27,117.109 159.488,117.109C158.711,117.109 158.078,116.48 158.078,115.699C158.078,114.922 158.711,114.293 159.488,114.293C160.27,114.293 160.898,114.922 160.898,115.699" android:strokeColor="#00000000"/>
+    <path android:fillColor="#DD5643" android:fillType="nonZero"
+        android:pathData="M208.965,92.926C208.965,91.316 208.164,90.16 206.879,90.16C205.574,90.16 204.793,91.316 204.793,92.926C204.793,94.559 205.574,95.723 206.879,95.723C208.164,95.723 208.965,94.559 208.965,92.926M210.352,92.926C210.352,95.297 208.996,96.938 206.879,96.938C204.762,96.938 203.395,95.297 203.395,92.926C203.395,90.566 204.762,88.926 206.879,88.926C208.996,88.926 210.352,90.566 210.352,92.926" android:strokeColor="#00000000"/>
+    <path android:fillColor="#DD5643" android:fillType="nonZero"
+        android:pathData="M216.402,96.746L213.555,93.23C213.301,93.465 212.996,93.738 212.816,93.898L212.816,96.734L211.508,96.734L211.508,89.129L212.816,89.129L212.816,92.258C213.727,91.379 214.992,90.133 215.824,89.117L217.414,89.117C216.473,90.305 215.367,91.438 214.484,92.328L217.973,96.746" android:strokeColor="#00000000"/>
+    <path android:fillColor="#595757" android:fillType="nonZero"
+        android:pathData="M29.691,56.836C29.691,56.395 29.336,56.039 28.895,56.039C28.453,56.039 28.098,56.395 28.098,56.836L28.098,104.637C28.098,105.078 28.453,105.438 28.895,105.438C29.262,105.438 29.559,105.18 29.652,104.844L29.664,104.844L29.664,104.785C29.672,104.734 29.691,104.691 29.691,104.637" android:strokeColor="#00000000"/>
+    <path android:fillColor="#595757" android:fillType="nonZero"
+        android:pathData="M32.785,56.836C32.785,56.395 32.426,56.039 31.988,56.039C31.547,56.039 31.191,56.395 31.191,56.836L31.191,104.637C31.191,105.078 31.547,105.438 31.988,105.438C32.355,105.438 32.652,105.18 32.746,104.844L32.754,104.844L32.754,104.785C32.766,104.734 32.785,104.691 32.785,104.637" android:strokeColor="#00000000"/>
+    <path android:fillColor="#595757" android:fillType="nonZero"
+        android:pathData="M35.879,56.836C35.879,56.395 35.52,56.039 35.082,56.039C34.641,56.039 34.281,56.395 34.281,56.836L34.281,104.637C34.281,105.078 34.641,105.438 35.082,105.438C35.449,105.438 35.746,105.18 35.836,104.844L35.848,104.844L35.848,104.785C35.859,104.734 35.879,104.691 35.879,104.637" android:strokeColor="#00000000"/>
+    <path android:fillColor="#595757" android:fillType="nonZero"
+        android:pathData="M38.973,56.836C38.973,56.395 38.613,56.039 38.172,56.039C37.734,56.039 37.375,56.395 37.375,56.836L37.375,104.637C37.375,105.078 37.734,105.438 38.172,105.438C38.543,105.438 38.84,105.18 38.93,104.844L38.941,104.844L38.941,104.785C38.953,104.734 38.973,104.691 38.973,104.637" android:strokeColor="#00000000"/>
+    <path android:fillColor="#595757" android:fillType="nonZero"
+        android:pathData="M42.066,56.836C42.066,56.395 41.707,56.039 41.266,56.039C40.828,56.039 40.469,56.395 40.469,56.836L40.469,104.637C40.469,105.078 40.828,105.438 41.266,105.438C41.633,105.438 41.93,105.18 42.023,104.844L42.035,104.844L42.035,104.785C42.043,104.734 42.066,104.691 42.066,104.637" android:strokeColor="#00000000"/>
+    <path android:fillColor="#5B5A59" android:fillType="nonZero"
+        android:pathData="M11.285,36.223C11.504,35.707 11.766,35.215 12.055,34.738ZM25.199,129.113C21.324,129.113 17.934,127.484 16.051,124.699L16.012,124.664L15.984,124.605C15.375,123.68 14.922,122.637 14.68,121.477L14.676,121.465L14.676,121.445C14.543,120.801 14.469,120.121 14.469,119.41L14.469,43.41C14.469,37.496 19.281,33.703 25.199,33.703L26.02,33.703L26.02,28.746L21.742,28.746C15.211,28.746 9.898,34.059 9.898,40.586L9.898,122.234C9.898,128.762 15.211,134.074 21.742,134.074L26.02,134.074L26.02,129.113" android:strokeColor="#00000000"/>
+</vector>
diff --git a/core/src/main/res/drawable/ic_danars.xml b/core/src/main/res/drawable/ic_danars.xml
deleted file mode 100644
index efa1c62276..0000000000
--- a/core/src/main/res/drawable/ic_danars.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<vector android:height="100dp" android:viewportHeight="300"
-    android:viewportWidth="600" android:width="200dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#F5F4F0" android:pathData="M454.949,53.543L71.448,53.543L71.448,261.923C71.448,265.098 74.027,267.677 77.203,267.677L454.949,267.677L454.949,53.543Z"/>
-    <path android:fillColor="#383A3B" android:pathData="M440.56,125.63C440.56,118.164 434.498,112.101 427.031,112.101L125.299,112.101C117.833,112.101 111.77,118.164 111.77,125.63L111.77,269.502C111.77,270.139 112.287,270.656 112.923,270.656L438.996,270.656C439.859,270.656 440.56,269.955 440.56,269.092L440.56,125.63Z"/>
-    <path android:fillColor="#433E3E" android:fillType="nonZero" android:pathData="M240.294,109.453L240.294,98.717L245.676,98.717C246.762,98.717 247.577,98.822 248.154,99.002C248.715,99.196 249.156,99.541 249.496,100.036C249.835,100.516 250.005,101.056 250.005,101.641C250.005,102.405 249.716,103.05 249.173,103.575C248.613,104.1 247.747,104.43 246.576,104.564C247,104.744 247.323,104.924 247.543,105.104C248.019,105.479 248.46,105.959 248.884,106.529L250.99,109.453L248.969,109.453L247.373,107.218C246.898,106.574 246.508,106.079 246.202,105.734C245.896,105.404 245.625,105.164 245.387,105.029C245.149,104.879 244.912,104.789 244.657,104.744C244.47,104.699 244.182,104.684 243.757,104.684L241.89,104.684L241.89,109.453L240.294,109.453ZM241.89,103.455L245.353,103.455C246.083,103.455 246.66,103.395 247.085,103.26C247.492,103.125 247.798,102.9 248.019,102.615C248.239,102.315 248.341,102 248.341,101.641C248.341,101.146 248.137,100.726 247.713,100.396C247.306,100.066 246.643,99.901 245.744,99.901L241.89,99.901L241.89,103.455Z"/>
-    <path android:fillColor="#433E3E" android:fillType="nonZero" android:pathData="M251.977,106.004L253.488,105.884C253.573,106.424 253.726,106.859 253.997,107.203C254.252,107.548 254.659,107.833 255.22,108.043C255.763,108.253 256.391,108.358 257.087,108.358C257.698,108.358 258.242,108.283 258.7,108.118C259.175,107.953 259.532,107.743 259.753,107.458C259.99,107.174 260.092,106.874 260.092,106.544C260.092,106.199 259.99,105.914 259.77,105.659C259.549,105.404 259.175,105.194 258.666,105.029C258.343,104.909 257.63,104.729 256.51,104.504C255.389,104.265 254.608,104.04 254.167,103.83C253.59,103.56 253.148,103.23 252.86,102.825C252.588,102.435 252.435,101.985 252.435,101.491C252.435,100.951 252.622,100.441 252.962,99.976C253.318,99.511 253.81,99.151 254.49,98.897C255.152,98.657 255.899,98.537 256.714,98.537C257.613,98.537 258.411,98.672 259.107,98.927C259.786,99.181 260.313,99.556 260.686,100.051C261.06,100.546 261.264,101.116 261.28,101.746L259.736,101.85C259.668,101.161 259.379,100.651 258.904,100.306C258.428,99.961 257.715,99.781 256.781,99.781C255.814,99.781 255.101,99.946 254.659,100.261C254.218,100.576 253.997,100.951 253.997,101.401C253.997,101.79 254.15,102.105 254.456,102.345C254.778,102.6 255.576,102.855 256.883,103.11C258.191,103.38 259.09,103.605 259.583,103.8C260.279,104.085 260.805,104.46 261.145,104.894C261.484,105.344 261.654,105.839 261.654,106.424C261.654,106.994 261.467,107.533 261.094,108.043C260.72,108.538 260.194,108.928 259.498,109.213C258.802,109.498 258.021,109.633 257.155,109.633C256.051,109.633 255.135,109.498 254.388,109.213C253.641,108.928 253.063,108.508 252.639,107.938C252.215,107.368 251.994,106.724 251.977,106.004Z"/>
-    <path android:fillColor="#433E3E" android:fillType="nonZero" android:pathData="M194.159,104.033L196.612,104.033C197.097,104.033 197.484,104.1 197.782,104.234C198.081,104.361 198.327,104.548 198.52,104.794C198.714,105.04 198.856,105.323 198.938,105.651C199.027,105.979 199.072,106.322 199.072,106.687C199.072,107.254 199.005,107.693 198.878,108.014C198.744,108.327 198.565,108.588 198.334,108.804C198.103,109.013 197.857,109.155 197.596,109.222C197.231,109.319 196.903,109.371 196.612,109.371L194.159,109.371L194.159,104.033ZM195.807,105.241L195.807,108.156L196.217,108.156C196.56,108.156 196.806,108.118 196.947,108.044C197.097,107.969 197.208,107.835 197.29,107.641C197.372,107.455 197.417,107.142 197.417,106.717C197.417,106.15 197.32,105.763 197.141,105.554C196.955,105.345 196.649,105.241 196.224,105.241L195.807,105.241Z"/>
-    <path android:fillColor="#433E3E" android:fillType="nonZero" android:pathData="M199.89,104.033L201.374,104.033L201.374,105.04L199.89,105.04L199.89,104.033ZM199.89,105.502L201.374,105.502L201.374,109.371L199.89,109.371L199.89,105.502Z"/>
-    <path android:fillColor="#433E3E" android:fillType="nonZero" android:pathData="M203.67,106.754L202.254,106.605C202.306,106.359 202.388,106.165 202.485,106.024C202.589,105.882 202.731,105.755 202.924,105.651C203.059,105.576 203.245,105.524 203.484,105.479C203.722,105.435 203.976,105.42 204.251,105.42C204.699,105.42 205.057,105.442 205.325,105.494C205.593,105.539 205.817,105.643 205.996,105.8C206.123,105.912 206.219,106.068 206.294,106.27C206.369,106.471 206.406,106.657 206.406,106.844L206.406,108.551C206.406,108.73 206.413,108.871 206.443,108.976C206.465,109.08 206.51,109.214 206.592,109.371L205.198,109.371C205.146,109.274 205.109,109.192 205.094,109.14C205.071,109.087 205.057,109.005 205.042,108.901C204.848,109.087 204.654,109.214 204.46,109.296C204.199,109.408 203.894,109.46 203.551,109.46C203.088,109.46 202.738,109.348 202.5,109.14C202.261,108.923 202.142,108.663 202.142,108.349C202.142,108.051 202.224,107.813 202.395,107.626C202.567,107.432 202.887,107.291 203.349,107.201C203.908,107.09 204.266,107.015 204.43,106.963C204.594,106.918 204.773,106.866 204.96,106.791C204.96,106.605 204.922,106.478 204.84,106.411C204.766,106.337 204.639,106.299 204.445,106.299C204.207,106.299 204.02,106.337 203.901,106.419C203.804,106.478 203.73,106.59 203.67,106.754ZM204.96,107.537C204.751,107.611 204.542,107.671 204.318,107.731C204.02,107.813 203.826,107.887 203.744,107.969C203.662,108.044 203.625,108.133 203.625,108.238C203.625,108.357 203.662,108.454 203.744,108.521C203.826,108.595 203.946,108.633 204.102,108.633C204.266,108.633 204.423,108.595 204.564,108.513C204.706,108.439 204.811,108.335 204.87,108.223C204.93,108.103 204.96,107.954 204.96,107.775L204.96,107.537Z"/>
-    <path android:fillColor="#433E3E" android:fillType="nonZero" android:pathData="M207.373,104.033L208.872,104.033L208.872,105.882C209.021,105.725 209.185,105.614 209.371,105.532C209.565,105.457 209.766,105.42 209.997,105.42C210.467,105.42 210.855,105.584 211.168,105.927C211.473,106.262 211.63,106.747 211.63,107.38C211.63,107.805 211.555,108.178 211.421,108.499C211.28,108.819 211.086,109.058 210.832,109.222C210.586,109.378 210.31,109.46 210.005,109.46C209.744,109.46 209.505,109.401 209.289,109.289C209.133,109.207 208.954,109.043 208.76,108.797L208.76,109.371L207.373,109.371L207.373,104.033ZM208.857,107.425C208.857,107.761 208.924,107.999 209.043,108.148C209.17,108.297 209.326,108.372 209.52,108.372C209.699,108.372 209.848,108.297 209.968,108.156C210.087,108.007 210.146,107.761 210.146,107.41C210.146,107.104 210.087,106.881 209.968,106.739C209.856,106.598 209.714,106.523 209.543,106.523C209.341,106.523 209.177,106.598 209.051,106.747C208.924,106.896 208.857,107.127 208.857,107.425Z"/>
-    <path android:fillColor="#433E3E" android:fillType="nonZero" android:pathData="M216.632,107.805L213.658,107.805C213.688,108.044 213.755,108.223 213.852,108.335C213.993,108.506 214.18,108.588 214.411,108.588C214.56,108.588 214.694,108.551 214.828,108.476C214.91,108.431 214.992,108.349 215.089,108.238L216.55,108.372C216.327,108.759 216.051,109.035 215.738,109.207C215.425,109.371 214.97,109.46 214.381,109.46C213.867,109.46 213.464,109.386 213.173,109.244C212.875,109.095 212.637,108.871 212.443,108.551C212.249,108.238 212.152,107.872 212.152,107.447C212.152,106.844 212.346,106.352 212.734,105.979C213.121,105.606 213.658,105.42 214.336,105.42C214.888,105.42 215.328,105.502 215.648,105.666C215.969,105.837 216.215,106.076 216.379,106.396C216.55,106.717 216.632,107.127 216.632,107.641L216.632,107.805ZM215.127,107.097C215.097,106.806 215.015,106.605 214.895,106.478C214.769,106.359 214.605,106.292 214.396,106.292C214.165,106.292 213.979,106.389 213.837,106.575C213.747,106.694 213.688,106.866 213.665,107.097L215.127,107.097Z"/>
-    <path android:fillColor="#433E3E" android:fillType="nonZero" android:pathData="M220.195,107.857L221.604,108.014C221.522,108.312 221.396,108.566 221.217,108.782C221.045,108.991 220.814,109.162 220.538,109.281C220.262,109.401 219.919,109.46 219.495,109.46C219.085,109.46 218.742,109.423 218.466,109.341C218.19,109.266 217.959,109.147 217.765,108.976C217.564,108.804 217.415,108.603 217.303,108.372C217.191,108.141 217.131,107.835 217.131,107.455C217.131,107.06 217.199,106.724 217.333,106.463C217.437,106.27 217.571,106.091 217.743,105.942C217.914,105.785 218.093,105.673 218.272,105.599C218.563,105.479 218.935,105.42 219.383,105.42C220.016,105.42 220.501,105.532 220.829,105.755C221.157,105.979 221.396,106.314 221.522,106.747L220.128,106.933C220.091,106.769 220.009,106.642 219.89,106.56C219.778,106.478 219.621,106.434 219.427,106.434C219.181,106.434 218.988,106.523 218.831,106.694C218.682,106.873 218.607,107.142 218.607,107.492C218.607,107.813 218.682,108.051 218.831,108.215C218.98,108.379 219.174,108.461 219.405,108.461C219.599,108.461 219.763,108.417 219.897,108.312C220.031,108.215 220.128,108.066 220.195,107.857Z"/>
-    <path android:fillColor="#433E3E" android:fillType="nonZero" android:pathData="M223.632,106.754L222.216,106.605C222.268,106.359 222.35,106.165 222.447,106.024C222.551,105.882 222.693,105.755 222.887,105.651C223.021,105.576 223.207,105.524 223.446,105.479C223.684,105.435 223.938,105.42 224.214,105.42C224.661,105.42 225.019,105.442 225.287,105.494C225.556,105.539 225.779,105.643 225.958,105.8C226.085,105.912 226.182,106.068 226.256,106.27C226.331,106.471 226.368,106.657 226.368,106.844L226.368,108.551C226.368,108.73 226.376,108.871 226.405,108.976C226.428,109.08 226.473,109.214 226.555,109.371L225.16,109.371C225.108,109.274 225.071,109.192 225.056,109.14C225.034,109.087 225.019,109.005 225.004,108.901C224.81,109.087 224.616,109.214 224.422,109.296C224.162,109.408 223.856,109.46 223.513,109.46C223.051,109.46 222.7,109.348 222.462,109.14C222.223,108.923 222.104,108.663 222.104,108.349C222.104,108.051 222.186,107.813 222.357,107.626C222.529,107.432 222.85,107.291 223.312,107.201C223.871,107.09 224.229,107.015 224.393,106.963C224.557,106.918 224.736,106.866 224.922,106.791C224.922,106.605 224.885,106.478 224.803,106.411C224.728,106.337 224.601,106.299 224.408,106.299C224.169,106.299 223.983,106.337 223.863,106.419C223.766,106.478 223.692,106.59 223.632,106.754ZM224.922,107.537C224.713,107.611 224.504,107.671 224.281,107.731C223.983,107.813 223.789,107.887 223.707,107.969C223.625,108.044 223.588,108.133 223.588,108.238C223.588,108.357 223.625,108.454 223.707,108.521C223.789,108.595 223.908,108.633 224.065,108.633C224.229,108.633 224.385,108.595 224.527,108.513C224.668,108.439 224.773,108.335 224.832,108.223C224.892,108.103 224.922,107.954 224.922,107.775L224.922,107.537Z"/>
-    <path android:fillColor="#433E3E" android:fillType="nonZero" android:pathData="M227.27,105.502L228.656,105.502L228.656,106.135C228.79,105.867 228.925,105.673 229.066,105.569C229.215,105.472 229.387,105.42 229.596,105.42C229.812,105.42 230.05,105.487 230.311,105.621L229.857,106.68C229.678,106.605 229.543,106.568 229.439,106.568C229.245,106.568 229.096,106.65 228.984,106.806C228.835,107.037 228.761,107.455 228.761,108.074L228.761,109.371L227.27,109.371L227.27,105.502Z"/>
-    <path android:fillColor="#433E3E" android:fillType="nonZero" android:pathData="M234.978,107.805L232.003,107.805C232.033,108.044 232.1,108.223 232.197,108.335C232.339,108.506 232.525,108.588 232.756,108.588C232.905,108.588 233.04,108.551 233.174,108.476C233.256,108.431 233.338,108.349 233.435,108.238L234.896,108.372C234.672,108.759 234.396,109.035 234.083,109.207C233.77,109.371 233.315,109.46 232.727,109.46C232.212,109.46 231.81,109.386 231.519,109.244C231.221,109.095 230.982,108.871 230.788,108.551C230.594,108.238 230.498,107.872 230.498,107.447C230.498,106.844 230.691,106.352 231.079,105.979C231.467,105.606 232.003,105.42 232.682,105.42C233.233,105.42 233.673,105.502 233.994,105.666C234.314,105.837 234.56,106.076 234.724,106.396C234.896,106.717 234.978,107.127 234.978,107.641L234.978,107.805ZM233.472,107.097C233.442,106.806 233.36,106.605 233.241,106.478C233.114,106.359 232.95,106.292 232.741,106.292C232.51,106.292 232.324,106.389 232.182,106.575C232.093,106.694 232.033,106.866 232.011,107.097L233.472,107.097Z"/>
-    <path android:fillColor="#433E3E" android:fillType="nonZero" android:pathData="M136.573,99.005L142.834,99.005C144.257,99.005 145.324,99.077 146.083,99.207C147.079,99.381 147.933,99.7 148.644,100.163C149.356,100.612 149.878,101.176 150.257,101.842C150.637,102.494 150.803,103.319 150.803,104.289C150.803,105.143 150.637,105.882 150.281,106.49C149.854,107.242 149.261,107.865 148.478,108.328C147.886,108.676 147.079,108.951 146.059,109.154C145.301,109.298 144.304,109.371 143.024,109.371L136.573,109.371L136.573,99.005ZM140.012,100.756L140.012,107.619L142.573,107.619C143.522,107.619 144.21,107.59 144.637,107.532C145.206,107.445 145.656,107.3 146.012,107.098C146.391,106.895 146.7,106.562 146.913,106.099C147.15,105.635 147.269,104.998 147.269,104.202C147.269,103.391 147.15,102.783 146.913,102.349C146.7,101.929 146.368,101.582 145.941,101.35C145.538,101.104 144.992,100.945 144.352,100.858C143.878,100.8 142.953,100.756 141.553,100.756L140.012,100.756Z"/>
-    <path android:fillColor="#433E3E" android:fillType="nonZero" android:pathData="M156.119,104.159L153.179,103.826C153.511,103.102 154.08,102.566 154.886,102.219C155.693,101.871 156.902,101.697 158.491,101.697C159.961,101.697 161.029,101.799 161.74,102.002C162.452,102.219 162.95,102.479 163.234,102.812C163.542,103.131 163.685,103.724 163.685,104.579L163.637,106.909C163.637,107.561 163.685,108.053 163.803,108.357C163.898,108.676 164.088,109.009 164.373,109.371L161.171,109.371C161.076,109.24 160.981,109.038 160.863,108.777C160.791,108.661 160.768,108.589 160.744,108.545C160.175,108.878 159.582,109.125 158.942,109.298C158.325,109.458 157.637,109.544 156.926,109.544C155.669,109.544 154.673,109.327 153.938,108.907C153.202,108.488 152.847,107.966 152.847,107.315C152.847,106.895 153.013,106.519 153.345,106.186C153.677,105.853 154.127,105.606 154.72,105.418C155.337,105.245 156.191,105.085 157.329,104.955C158.847,104.781 159.89,104.622 160.483,104.477L160.483,104.275C160.483,103.898 160.317,103.623 160.009,103.464C159.701,103.29 159.131,103.218 158.278,103.218C157.685,103.218 157.234,103.29 156.926,103.42C156.594,103.565 156.333,103.811 156.119,104.159ZM160.483,105.766C160.056,105.853 159.416,105.954 158.491,106.07C157.59,106.186 156.997,106.301 156.736,106.417C156.309,106.605 156.096,106.837 156.096,107.112C156.096,107.387 156.262,107.633 156.594,107.836C156.949,108.039 157.376,108.14 157.898,108.14C158.491,108.14 159.036,108.024 159.582,107.793C159.961,107.604 160.222,107.387 160.365,107.127C160.436,106.953 160.483,106.634 160.483,106.157L160.483,105.766Z"/>
-    <path android:fillColor="#433E3E" android:fillType="nonZero" android:pathData="M178.06,109.371L174.811,109.371L174.811,105.534C174.811,104.723 174.74,104.202 174.597,103.97C174.479,103.724 174.242,103.536 173.933,103.406C173.625,103.276 173.246,103.218 172.795,103.218C172.249,103.218 171.728,103.304 171.277,103.493C170.826,103.681 170.542,103.942 170.376,104.246C170.21,104.55 170.115,105.129 170.115,105.968L170.115,109.371L166.866,109.371L166.866,101.857L169.878,101.857L169.878,102.972C170.945,102.117 172.297,101.697 173.933,101.697C174.645,101.697 175.309,101.77 175.902,101.929C176.495,102.088 176.945,102.291 177.253,102.537C177.562,102.783 177.775,103.058 177.894,103.362C178.012,103.681 178.06,104.13 178.06,104.709L178.06,109.371Z"/>
-    <path android:fillColor="#433E3E" android:fillType="nonZero" android:pathData="M183.795,104.159L180.854,103.826C181.186,103.102 181.755,102.566 182.562,102.219C183.368,101.871 184.578,101.697 186.167,101.697C187.637,101.697 188.704,101.799 189.416,102.002C190.127,102.219 190.625,102.479 190.91,102.812C191.218,103.131 191.36,103.724 191.36,104.579L191.313,106.909C191.313,107.561 191.36,108.053 191.479,108.357C191.574,108.676 191.764,109.009 192.048,109.371L188.847,109.371C188.752,109.24 188.657,109.038 188.538,108.777C188.467,108.661 188.443,108.589 188.42,108.545C187.85,108.878 187.258,109.125 186.617,109.298C186.001,109.458 185.313,109.544 184.601,109.544C183.344,109.544 182.348,109.327 181.613,108.907C180.878,108.488 180.522,107.966 180.522,107.315C180.522,106.895 180.688,106.519 181.02,106.186C181.352,105.853 181.803,105.606 182.396,105.418C183.012,105.245 183.866,105.085 185.005,104.955C186.522,104.781 187.566,104.622 188.159,104.477L188.159,104.275C188.159,103.898 187.993,103.623 187.684,103.464C187.376,103.29 186.807,103.218 185.953,103.218C185.36,103.218 184.91,103.29 184.601,103.42C184.269,103.565 184.008,103.811 183.795,104.159ZM188.159,105.766C187.732,105.853 187.092,105.954 186.167,106.07C185.265,106.186 184.673,106.301 184.412,106.417C183.985,106.605 183.771,106.837 183.771,107.112C183.771,107.387 183.937,107.633 184.269,107.836C184.625,108.039 185.052,108.14 185.574,108.14C186.167,108.14 186.712,108.024 187.258,107.793C187.637,107.604 187.898,107.387 188.04,107.127C188.111,106.953 188.159,106.634 188.159,106.157L188.159,105.766Z"/>
-    <path android:fillColor="#2C2D2D" android:pathData="M162.999,101.827C161.761,101.301 160.333,99.802 158.542,96.453L162.527,96.453L162.999,101.827Z"/>
-    <path android:fillColor="#7A9C8E" android:pathData="M297.249,141.99C297.249,141.006 296.449,140.207 295.464,140.207L132.456,140.207C131.472,140.207 130.672,141.006 130.672,141.99L130.672,217.397C130.672,218.382 131.472,219.181 132.456,219.181L295.464,219.181C296.449,219.181 297.249,218.382 297.249,217.397L297.249,141.99Z"/>
-    <path android:fillColor="#ADB0AF" android:pathData="M105.948,53.543l1.455,0l0,214.134l-1.455,0z"/>
-    <path android:fillColor="#DEDEDC" android:pathData="M71.448,53.543l1.455,0l0,214.134l-1.455,0z"/>
-    <path android:fillAlpha="0.45" android:fillColor="#CFCCCC" android:pathData="M428.922,56.673C428.922,54.945 427.52,53.543 425.793,53.543L321.32,53.543C319.593,53.543 318.191,54.945 318.191,56.673L318.191,78.478C318.191,80.205 319.593,81.608 321.32,81.608L425.793,81.608C427.52,81.608 428.922,80.205 428.922,78.478L428.922,56.673Z"/>
-    <path android:fillColor="#00000000"
-        android:pathData="M411.023,189.358C411.023,187.31 409.36,185.646 407.31,185.646L382.034,185.646C379.984,185.646 378.321,187.31 378.321,189.358L378.321,215.036C378.321,217.084 379.984,218.747 382.034,218.747L407.31,218.747C409.36,218.747 411.023,217.084 411.023,215.036L411.023,189.358Z"
-        android:strokeColor="#212122" android:strokeWidth="2.29"/>
-    <path android:fillColor="#BD1716" android:fillType="nonZero" android:pathData="M380.083,202.388C380.083,199.92 380.753,197.975 382.091,196.553C383.429,195.152 385.144,194.441 387.256,194.441C388.637,194.441 389.891,194.776 391,195.445C392.108,196.093 392.944,197.013 393.53,198.205C394.116,199.377 394.408,200.715 394.408,202.221C394.408,203.747 394.095,205.107 393.488,206.299C392.882,207.491 392.003,208.411 390.874,209.017C389.766,209.624 388.553,209.937 387.256,209.937C385.834,209.937 384.58,209.603 383.471,208.913C382.363,208.243 381.526,207.302 380.941,206.131C380.376,204.96 380.083,203.705 380.083,202.388ZM382.133,202.43C382.133,204.228 382.614,205.65 383.597,206.696C384.559,207.721 385.772,208.243 387.235,208.243C388.72,208.243 389.954,207.721 390.916,206.675C391.878,205.629 392.359,204.145 392.359,202.221C392.359,200.987 392.15,199.92 391.752,199.021C391.334,198.122 390.728,197.411 389.933,196.909C389.138,196.407 388.26,196.156 387.277,196.156C385.876,196.156 384.663,196.637 383.659,197.599C382.635,198.561 382.133,200.171 382.133,202.43Z"/>
-    <path android:fillColor="#BD1716" android:fillType="nonZero" android:pathData="M396.872,209.686L396.872,194.713L398.859,194.713L398.859,202.137L406.283,194.713L408.98,194.713L402.707,200.778L409.252,209.686L406.638,209.686L401.306,202.116L398.859,204.5L398.859,209.686L396.872,209.686Z"/>
-    <path android:fillColor="#ffffff" android:pathData="M345.079,149.568l3.464,0l0,14.823l-3.464,0z"/>
-    <path android:fillColor="#ffffff" android:pathData="M354.141,154.93l0,3.464l-14.823,0l-0,-3.464z"/>
-    <path android:fillColor="#00000000"
-        android:pathData="M330.497,156.451a16.773,16.351 90,1 0,32.702 0a16.773,16.351 90,1 0,-32.702 0z"
-        android:strokeColor="#212122" android:strokeWidth="2.17"/>
-    <path android:fillColor="#00000000"
-        android:pathData="M330.497,202.063a16.773,16.351 90,1 0,32.702 0a16.773,16.351 90,1 0,-32.702 0z"
-        android:strokeColor="#212122" android:strokeWidth="2.17"/>
-    <path android:fillColor="#ffffff" android:pathData="M339.242,200.325l15.213,0l0,3.474l-15.213,0z"/>
-    <path android:fillColor="#00000000"
-        android:pathData="M378.321,156.979a16.773,16.351 90,1 0,32.702 0a16.773,16.351 90,1 0,-32.702 0z"
-        android:strokeColor="#212122" android:strokeWidth="2.17"/>
-    <path android:fillColor="#ffffff" android:pathData="M406.545,156.464L387.618,165.715L387.618,147.214L406.545,156.464Z"/>
-    <path android:fillColor="#F0EEEB" android:pathData="M454.948,53.543l12.184,0l0,92.718l-12.184,0z"/>
-    <path android:fillColor="#F3F3F1" android:pathData="M528.559,125.185C528.559,123.71 527.362,122.513 525.888,122.513L489.663,122.513C488.188,122.513 486.991,123.71 486.991,125.185L486.991,130.527C486.991,132.002 488.188,133.199 489.663,133.199L525.888,133.199C527.362,133.199 528.559,132.002 528.559,130.527L528.559,125.185Z"/>
-    <path android:fillColor="#F3F3F1" android:pathData="M528.559,67.218C528.559,65.701 527.327,64.469 525.81,64.469L489.741,64.469C488.224,64.469 486.991,65.701 486.991,67.218L486.991,72.718C486.991,74.234 488.224,75.467 489.741,75.467L525.81,75.467C527.327,75.467 528.559,74.234 528.559,72.718L528.559,67.218Z"/>
-    <path android:fillColor="#EAEAE9" android:pathData="M467.133,146.262L467.133,53.544L506.85,76.725L506.85,123.083L467.133,146.262Z"/>
-    <path android:fillColor="#DEDEDC" android:pathData="M487.737,133.582L487.902,65.46C501.618,69.335 515.14,73.017 528.519,74.264L528.519,125.358C513.826,125.559 500.31,128.711 487.737,133.582Z"/>
-    <path android:fillColor="#EAEAE9" android:pathData="M487.756,130.165L487.756,69.292C501.514,72.843 515.14,74.769 528.558,75.911L528.558,122.75C513.821,122.934 500.366,125.699 487.756,130.165Z"/>
-    <path android:fillColor="#D7D7D7" android:pathData="M486.991,99.726C499.145,93.373 514.128,93.086 528.559,91.611L528.559,105.943C514.551,104.974 500.31,105.718 486.991,99.726Z"/>
-    <path android:fillColor="#E3E3E1" android:pathData="M528.745,97.571C528.745,96.657 527.939,95.916 526.946,95.916L488.449,95.916C487.456,95.916 486.65,96.657 486.65,97.571C486.65,97.571 486.35,100.052 486.65,100.88C486.926,101.642 487.456,102.535 488.449,102.535L526.946,102.535C527.939,102.535 528.745,101.794 528.745,100.88L528.745,97.571Z"/>
-    <path android:fillColor="#DEDEDC" android:pathData="M447.369,75.47L450.394,81.983L444.344,81.983L447.369,75.47Z"/>
-    <path android:fillColor="#DEDEDC" android:pathData="M446.037,81.447l2.371,0l0,12.694l-2.371,0z"/>
-    <path android:fillColor="#DEDEDC" android:pathData="M453.356,107.162l1.591,0l0,161.622l-1.591,0z"/>
-    <path android:fillColor="#DEDEDC" android:pathData="M454.949,107.272C454.822,104.097 453.642,101.172 451.589,98.939C448.794,95.9 444.628,94.409 440.209,94.867L440.188,96.387C444.151,95.976 447.887,97.313 450.394,100.039C452.235,102.041 453.292,104.664 453.406,107.511L454.949,107.272Z"/>
-    <path android:fillColor="#DEDEDC" android:pathData="M193.824,94.785l249.552,0l0,1.544l-249.552,0z"/>
-    <path android:fillColor="#DEDEDC" android:pathData="M154.602,52.56C154.255,61.489 156.799,70.363 161.848,77.839C169.149,88.65 180.964,95.496 193.759,96.329L193.824,94.684C181.541,93.885 170.196,87.312 163.188,76.934C158.341,69.756 155.9,61.238 156.232,52.667L154.602,52.56Z"/>
-    <path android:fillColor="#D6D2D2" android:fillType="nonZero" android:pathData="M450.297,106.874C450.339,107.968 450.029,108.845 449.348,109.526C448.677,110.207 447.831,110.548 446.81,110.548C445.954,110.548 445.19,110.3 444.53,109.784C443.653,109.114 443.219,108.164 443.219,106.947C443.219,105.709 443.632,104.759 444.468,104.089C445.128,103.562 445.902,103.294 446.81,103.294C447.821,103.294 448.667,103.645 449.348,104.326C450.019,105.017 450.339,105.874 450.297,106.874ZM449.978,106.936C449.978,106.317 449.658,105.832 449.018,105.512C448.502,105.244 447.749,105.11 446.769,105.11C445.603,105.11 444.736,105.316 444.179,105.729C443.787,106.018 443.591,106.41 443.591,106.926C443.591,107.277 443.684,107.566 443.849,107.793C444.065,108.092 444.406,108.319 444.88,108.484C445.345,108.649 445.964,108.732 446.727,108.732C447.625,108.732 448.306,108.649 448.75,108.484C449.204,108.309 449.513,108.092 449.699,107.834C449.885,107.576 449.978,107.277 449.978,106.936Z"/>
-    <path android:fillColor="#D6D2D2" android:fillType="nonZero" android:pathData="M446.469,113.704L444.571,113.704C444.199,113.704 443.972,113.724 443.88,113.776C443.776,113.817 443.704,113.9 443.642,114.013C443.591,114.127 443.56,114.343 443.56,114.653L443.374,114.653L443.374,111.176L443.56,111.176C443.56,111.496 443.591,111.712 443.653,111.826C443.704,111.939 443.787,112.012 443.88,112.063C443.972,112.104 444.199,112.125 444.571,112.125L449.008,112.125C449.379,112.125 449.606,112.104 449.709,112.063C449.802,112.012 449.874,111.929 449.936,111.815C449.988,111.702 450.019,111.496 450.019,111.176L450.205,111.176L450.205,114.158C450.205,115.138 450.029,115.84 449.678,116.273C449.328,116.696 448.894,116.913 448.368,116.913C447.924,116.913 447.553,116.768 447.233,116.5C446.913,116.221 446.707,115.84 446.593,115.355C446.511,115.035 446.469,114.478 446.469,113.704ZM449.813,113.704L446.862,113.704C446.851,113.817 446.851,113.9 446.851,113.951C446.851,114.364 446.975,114.684 447.212,114.901C447.46,115.128 447.831,115.231 448.347,115.231C448.853,115.231 449.224,115.128 449.462,114.901C449.699,114.684 449.813,114.354 449.813,113.91L449.813,113.704Z"/>
-    <path android:fillColor="#D6D2D2" android:fillType="nonZero" android:pathData="M449.813,120.027L447.027,120.027L447.027,120.171C447.027,120.605 447.171,120.914 447.439,121.11C447.708,121.306 448.11,121.43 448.647,121.482L448.647,121.678L445.066,121.678L445.066,121.482C445.458,121.44 445.778,121.358 446.026,121.224C446.273,121.1 446.438,120.945 446.521,120.78C446.614,120.605 446.655,120.357 446.655,120.027L444.726,120.027C444.354,120.027 444.127,120.047 444.034,120.078C443.952,120.109 443.89,120.171 443.828,120.254C443.776,120.347 443.756,120.491 443.756,120.677L443.756,121.09C443.756,121.729 443.9,122.235 444.199,122.627C444.488,123.009 444.942,123.287 445.541,123.452L445.541,123.638L443.374,123.329L443.374,117.427L443.56,117.427L443.56,117.654C443.56,117.85 443.591,118.015 443.663,118.128C443.714,118.221 443.797,118.283 443.911,118.335C443.993,118.366 444.199,118.386 444.54,118.386L449.039,118.386C449.348,118.386 449.534,118.376 449.606,118.366C449.72,118.335 449.813,118.273 449.874,118.18C449.967,118.046 450.019,117.87 450.019,117.654L450.019,117.427L450.205,117.427L450.205,123.143L448.182,123.143L448.182,122.957C448.677,122.854 449.039,122.72 449.245,122.544C449.462,122.369 449.616,122.121 449.72,121.791C449.782,121.605 449.813,121.255 449.813,120.739L449.813,120.027Z"/>
-    <path android:fillColor="#D6D2D2" android:fillType="nonZero" android:pathData="M450.205,126.672L445.964,130.046L448.904,130.046C449.317,130.046 449.596,129.984 449.74,129.87C449.936,129.705 450.029,129.437 450.019,129.055L450.205,129.055L450.205,131.315L450.019,131.315C449.978,131.026 449.936,130.83 449.874,130.727C449.813,130.634 449.72,130.551 449.585,130.5C449.451,130.448 449.224,130.417 448.904,130.417L443.219,130.417L443.219,130.242L448.904,125.619L444.561,125.619C444.168,125.619 443.9,125.712 443.766,125.898C443.632,126.073 443.56,126.28 443.56,126.507L443.56,126.672L443.374,126.672L443.374,124.247L443.56,124.247C443.56,124.629 443.642,124.887 443.797,125.031C443.941,125.186 444.199,125.258 444.561,125.258L449.389,125.258L449.565,125.114C449.751,124.969 449.864,124.835 449.926,124.732C449.978,124.618 450.009,124.453 450.019,124.247L450.205,124.247L450.205,126.672Z"/>
-    <path android:fillColor="#DEDEDC" android:pathData="M71.257,52.561l83.314,0l0,1.963l-83.314,0z"/>
-    <path android:fillColor="#DEDEDC" android:pathData="M71.448,265.983l40.094,0l0,1.694l-40.094,0z"/>
-    <path android:fillColor="#DEDEDC" android:pathData="M440.562,267.565l12.973,0l0,1.219l-12.973,0z"/>
-</vector>
diff --git a/core/src/main/res/drawable/ic_diaconn_g8.xml b/core/src/main/res/drawable/ic_diaconn_g8.xml
new file mode 100644
index 0000000000..d98c6c2109
--- /dev/null
+++ b/core/src/main/res/drawable/ic_diaconn_g8.xml
@@ -0,0 +1,6100 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt"
+    android:viewportWidth="1000"
+    android:viewportHeight="580"
+    android:width="150dp"
+    android:height="80dp">
+    <path
+        android:pathData="M94.5 1L96.5 2L562 2.5L95.5 3L94.5 1Z"
+        android:fillColor="#BEC0C0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#BEC0C0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M750.5 2L791 2.5L750.5 3L750.5 2Z"
+        android:fillColor="#BEC0C0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#BEC0C0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M792.5 2L793.5 4L792.5 2Z"
+        android:fillColor="#BEC0C0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#BEC0C0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M797.5 2L800 2.5L797.5 3L797.5 2Z"
+        android:fillColor="#BEC0C0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#BEC0C0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M826.5 2L842 2.5L826.5 3L826.5 2Z"
+        android:fillColor="#BEC0C0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#BEC0C0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M565.5 3L569 3.5L565.5 4L565.5 3Z"
+        android:fillColor="#BEC0C0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#BEC0C0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M574.5 4L579 4.5L574.5 5L574.5 4Z"
+        android:fillColor="#BEC0C0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#BEC0C0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M615.5 4L619 4.5L615.5 5L615.5 4Z"
+        android:fillColor="#BEC0C0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#BEC0C0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M620.5 4L625 4.5L620.5 5L620.5 4Z"
+        android:fillColor="#BEC0C0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#BEC0C0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M667.5 4L679 4.5L667.5 5L667.5 4Z"
+        android:fillColor="#BEC0C0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#BEC0C0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M680.5 4L684 4.5L680.5 5L680.5 4Z"
+        android:fillColor="#BEC0C0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#BEC0C0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M719.5 4L730 4.5L719.5 5L719.5 4Z"
+        android:fillColor="#BEC0C0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#BEC0C0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M731.5 4L734 4.5L731.5 5L731.5 4Z"
+        android:fillColor="#BEC0C0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#BEC0C0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M735.5 4L738 4.5L735.5 5L735.5 4Z"
+        android:fillColor="#BEC0C0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#BEC0C0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M799.5 89L801 114.5L800 115.5L799.5 133L799.5 89Z"
+        android:fillColor="#BEC0C0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#BEC0C0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M1.5 90L2 100.5L1 100.5L1.5 90Z"
+        android:fillColor="#BEC0C0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#BEC0C0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M147.5 111L150 111.5L147.5 112L147.5 111Z"
+        android:fillColor="#BEC0C0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#BEC0C0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M142.5 112Q146.9 110.5 146 113.5L144.5 113Q141.5 113.5 142.5 112Z"
+        android:fillColor="#BEC0C0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#BEC0C0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M151.5 112L154 112.5L151.5 113L151.5 112Z"
+        android:fillColor="#BEC0C0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#BEC0C0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M138.5 113L141 113.5L136.5 115L136.5 114L138.5 113Z"
+        android:fillColor="#BEC0C0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#BEC0C0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M129.5 117L129.5 120Q126.5 118.5 129.5 117Z"
+        android:fillColor="#BEC0C0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#BEC0C0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M723.5 122L724.5 124L723.5 122Z"
+        android:fillColor="#BEC0C0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#BEC0C0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M730.5 129L731.5 131L730.5 129Z"
+        android:fillColor="#BEC0C0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#BEC0C0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M799.5 137L800 163.5L799 163.5L799.5 137Z"
+        android:fillColor="#BEC0C0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#BEC0C0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M742.5 156L743 158.5L742 158.5L742.5 156Z"
+        android:fillColor="#BEC0C0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#BEC0C0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M799.5 165L800 167.5L799 167.5L799.5 165Z"
+        android:fillColor="#BEC0C0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#BEC0C0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M799.5 170L800 191.5L799 191.5L799.5 170Z"
+        android:fillColor="#BEC0C0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#BEC0C0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M799.5 193L800 195.5L799 195.5L799.5 193Z"
+        android:fillColor="#BEC0C0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#BEC0C0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M799.5 197L800 199.5L799 199.5L799.5 197Z"
+        android:fillColor="#BEC0C0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#BEC0C0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M648.5 199L652.5 204L648.5 199Z"
+        android:fillColor="#BEC0C0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#BEC0C0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M799.5 201L800 206.5L799 206.5L799.5 201Z"
+        android:fillColor="#BEC0C0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#BEC0C0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M799.5 208L800 311.5L799 311.5L799.5 208Z"
+        android:fillColor="#BEC0C0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#BEC0C0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M193.5 210L194.5 212L193.5 210Z"
+        android:fillColor="#BEC0C0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#BEC0C0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M661.5 212L667.5 219L661.5 212Z"
+        android:fillColor="#BEC0C0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#BEC0C0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M505.5 213L511 213.5L505.5 214L505.5 213Z"
+        android:fillColor="#BEC0C0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#BEC0C0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M418.5 215L419 217.5L418 217.5L418.5 215Z"
+        android:fillColor="#BEC0C0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#BEC0C0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M511.5 217L512 230.5L511 230.5L511.5 217Z"
+        android:fillColor="#BEC0C0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#BEC0C0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M522.5 217L523 221.5L522 221.5L522.5 217Z"
+        android:fillColor="#BEC0C0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#BEC0C0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M322.5 219L323 231.5L322 231.5L322.5 219Z"
+        android:fillColor="#BEC0C0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#BEC0C0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M432.5 226L433 229.5L432 229.5L432.5 226Z"
+        android:fillColor="#BEC0C0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#BEC0C0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M533.5 226L534 233.5L533 233.5L533.5 226Z"
+        android:fillColor="#BEC0C0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#BEC0C0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M440.5 235L441.5 237L440.5 235Z"
+        android:fillColor="#BEC0C0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#BEC0C0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M378.5 237L386 237.5L378.5 238L378.5 237Z"
+        android:fillColor="#BEC0C0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#BEC0C0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M387.5 237L390 237.5L387.5 238L387.5 237Z"
+        android:fillColor="#BEC0C0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#BEC0C0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M391.5 237L395 237.5L391.5 238L391.5 237Z"
+        android:fillColor="#BEC0C0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#BEC0C0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M400.5 237L404 237.5L400.5 238L400.5 237Z"
+        android:fillColor="#BEC0C0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#BEC0C0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M405.5 237L411 237.5L405.5 238L405.5 237Z"
+        android:fillColor="#BEC0C0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#BEC0C0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M508.5 242L511 242.5L508.5 243L508.5 242Z"
+        android:fillColor="#BEC0C0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#BEC0C0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M520.5 242L528 242.5L520.5 243L520.5 242Z"
+        android:fillColor="#BEC0C0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#BEC0C0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M529.5 242L534 242.5L529.5 243L529.5 242Z"
+        android:fillColor="#BEC0C0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#BEC0C0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M535.5 242L540 242.5L535.5 243L535.5 242Z"
+        android:fillColor="#BEC0C0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#BEC0C0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M442.5 247L446 247.5L442.5 248L442.5 247Z"
+        android:fillColor="#BEC0C0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#BEC0C0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M434.5 251L435 258.5L434 258.5L434.5 251Z"
+        android:fillColor="#BEC0C0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#BEC0C0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M418.5 252L419 254.5L418 254.5L418.5 252Z"
+        android:fillColor="#BEC0C0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#BEC0C0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M425.5 252L426 262.5L425 262.5L425.5 252Z"
+        android:fillColor="#BEC0C0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#BEC0C0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M441.5 262L446 262.5L441.5 263L441.5 262Z"
+        android:fillColor="#BEC0C0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#BEC0C0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M396.5 265L397.5 267L396.5 265Z"
+        android:fillColor="#BEC0C0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#BEC0C0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M400.5 265L399.5 267L400.5 265Z"
+        android:fillColor="#BEC0C0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#BEC0C0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M374.5 269L397 269.5L374.5 270L374.5 269Z"
+        android:fillColor="#BEC0C0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#BEC0C0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M376.5 273L379 273.5L376.5 274L376.5 273Z"
+        android:fillColor="#BEC0C0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#BEC0C0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M389.5 273L395 273.5L389.5 274L389.5 273Z"
+        android:fillColor="#BEC0C0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#BEC0C0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M499.5 283L500.5 285L499.5 283Z"
+        android:fillColor="#BEC0C0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#BEC0C0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M531.5 283L541 283.5L531.5 284L531.5 283Z"
+        android:fillColor="#BEC0C0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#BEC0C0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M281.5 286L282 294.5L281 294.5L281.5 286Z"
+        android:fillColor="#BEC0C0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#BEC0C0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M290.5 287L295 287.5L290.5 288L290.5 287Z"
+        android:fillColor="#BEC0C0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#BEC0C0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M345.5 290L346.5 292L345.5 290Z"
+        android:fillColor="#BEC0C0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#BEC0C0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M371.5 293L372.5 295L371.5 293Z"
+        android:fillColor="#BEC0C0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#BEC0C0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M489.5 295L490 297.5L489 297.5L489.5 295Z"
+        android:fillColor="#BEC0C0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#BEC0C0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M297.5 296L298 307.5L297 307.5L297.5 296Z"
+        android:fillColor="#BEC0C0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#BEC0C0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M303.5 296L304 303.5L303 303.5L303.5 296Z"
+        android:fillColor="#BEC0C0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#BEC0C0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M374.5 296L376.5 299L374.5 296Z"
+        android:fillColor="#BEC0C0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#BEC0C0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M482.5 302L483 303.5L481 304.5L482.5 302Z"
+        android:fillColor="#BEC0C0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#BEC0C0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M375.5 307L374.5 309L375.5 307Z"
+        android:fillColor="#BEC0C0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#BEC0C0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M281.5 309L282 311.5L281 311.5L281.5 309Z"
+        android:fillColor="#BEC0C0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#BEC0C0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M371.5 309L372.5 311L370 310.5L371.5 309Z"
+        android:fillColor="#BEC0C0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#BEC0C0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M799.5 313L800 368.5L799 368.5L799.5 313Z"
+        android:fillColor="#BEC0C0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#BEC0C0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M330.5 317L335 317.5L330.5 318L330.5 317Z"
+        android:fillColor="#BEC0C0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#BEC0C0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M336.5 317L363 317.5L336.5 318L336.5 317Z"
+        android:fillColor="#BEC0C0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#BEC0C0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M181.5 331L182.5 333L181.5 331Z"
+        android:fillColor="#BEC0C0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#BEC0C0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M651.5 338L652.5 340L651.5 338Z"
+        android:fillColor="#BEC0C0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#BEC0C0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M799.5 370L800 426.5L799 426.5L799.5 370Z"
+        android:fillColor="#BEC0C0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#BEC0C0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M742.5 383L743 385.5L740.5 395L740 390.5L742.5 383Z"
+        android:fillColor="#BEC0C0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#BEC0C0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M2.5 435L3 443.5L2 443.5L2.5 435Z"
+        android:fillColor="#BEC0C0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#BEC0C0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M801.5 442L802.5 446L803.5 445L838.5 445L852 462.5L858 474.5L861 484.5L861 489.5L863 491.5L861.5 492Q860.3 489.8 855.5 491L851 496.5L847 507.5L840.5 515L834.5 519L800.5 519L799 518.5L798.5 520L798 516.5L800.5 504L801 507L835.5 507L838 504.5Q839.1 496.5 845.5 494L851 489.5L848 476.5L839 460L803.5 460L803 461.5L802 461.5Q799.3 453.5 801.5 442Z"
+        android:fillColor="#BEC0C0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#BEC0C0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M795.5 443L797 445.5L797 462.5L796 462.5L795.5 458L795 460L47.5 460L43.5 459L38.5 460L32.5 459L28.5 460L26.5 459L24.5 460L22.5 460L19.5 459L17.5 459L6.5 459L5 460.5L4.5 462Q1.9 456.1 3 446.5L4.5 445L795 445L795.5 443Z"
+        android:fillColor="#BEC0C0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#BEC0C0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M798.5 473L799 477.5L798 477.5L798.5 473Z"
+        android:fillColor="#BEC0C0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#BEC0C0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M796.5 484L797 489.5L796 489.5L796.5 484Z"
+        android:fillColor="#BEC0C0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#BEC0C0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M795.5 498L796 504.5L795 504.5L795.5 498Z"
+        android:fillColor="#BEC0C0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#BEC0C0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M797.5 498L798 500.5L797 500.5L797.5 498Z"
+        android:fillColor="#BEC0C0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#BEC0C0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M23.5 505L25.5 507L793.5 507L795 508.5L794 519L120.5 519L118.5 518L116.5 518L109.5 519L105.5 519L102.5 518L100.5 519L99.5 518L37.5 518L38.5 521L32 517L23.5 505Z"
+        android:fillColor="#BEC0C0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#BEC0C0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M36.5 22L35.5 24L36.5 22Z"
+        android:fillColor="#FBFBFB"
+        android:fillAlpha="0.4941176"
+        android:strokeColor="#FBFBFB"
+        android:strokeAlpha="0.4941176"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M28.5 29L27.5 31L28.5 29Z"
+        android:fillColor="#FBFBFB"
+        android:fillAlpha="0.4941176"
+        android:strokeColor="#FBFBFB"
+        android:strokeAlpha="0.4941176"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M21.5 37L20.5 39L21.5 37Z"
+        android:fillColor="#FBFBFB"
+        android:fillAlpha="0.4941176"
+        android:strokeColor="#FBFBFB"
+        android:strokeAlpha="0.4941176"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M18.5 41L17.5 43L18.5 41Z"
+        android:fillColor="#FBFBFB"
+        android:fillAlpha="0.4941176"
+        android:strokeColor="#FBFBFB"
+        android:strokeAlpha="0.4941176"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M997.5 65L998 68.5L997 68.5L997.5 65Z"
+        android:fillColor="#FBFBFB"
+        android:fillAlpha="0.4941176"
+        android:strokeColor="#FBFBFB"
+        android:strokeAlpha="0.4941176"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M998.5 77L999 83.5L998 83.5L998.5 77Z"
+        android:fillColor="#FBFBFB"
+        android:fillAlpha="0.4941176"
+        android:strokeColor="#FBFBFB"
+        android:strokeAlpha="0.4941176"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M999.5 98L1000 137.5L999 137.5L999.5 98Z"
+        android:fillColor="#FBFBFB"
+        android:fillAlpha="0.4941176"
+        android:strokeColor="#FBFBFB"
+        android:strokeAlpha="0.4941176"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M998.5 155L999 161.5L998 161.5L998.5 155Z"
+        android:fillColor="#FBFBFB"
+        android:fillAlpha="0.4941176"
+        android:strokeColor="#FBFBFB"
+        android:strokeAlpha="0.4941176"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M997.5 170L998 175.5L997 175.5L997.5 170Z"
+        android:fillColor="#FBFBFB"
+        android:fillAlpha="0.4941176"
+        android:strokeColor="#FBFBFB"
+        android:strokeAlpha="0.4941176"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M996.5 180L997 184.5L996 184.5L996.5 180Z"
+        android:fillColor="#FBFBFB"
+        android:fillAlpha="0.4941176"
+        android:strokeColor="#FBFBFB"
+        android:strokeAlpha="0.4941176"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M995.5 187L996 190.5L995 190.5L995.5 187Z"
+        android:fillColor="#FBFBFB"
+        android:fillAlpha="0.4941176"
+        android:strokeColor="#FBFBFB"
+        android:strokeAlpha="0.4941176"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M994.5 192L995 194.5L994 194.5L994.5 192Z"
+        android:fillColor="#FBFBFB"
+        android:fillAlpha="0.4941176"
+        android:strokeColor="#FBFBFB"
+        android:strokeAlpha="0.4941176"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M993.5 196L994 198.5L993 198.5L993.5 196Z"
+        android:fillColor="#FBFBFB"
+        android:fillAlpha="0.4941176"
+        android:strokeColor="#FBFBFB"
+        android:strokeAlpha="0.4941176"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M991.5 202L989.5 205L991.5 202Z"
+        android:fillColor="#FBFBFB"
+        android:fillAlpha="0.4941176"
+        android:strokeColor="#FBFBFB"
+        android:strokeAlpha="0.4941176"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M981.5 208L980.5 210L981.5 208Z"
+        android:fillColor="#FBFBFB"
+        android:fillAlpha="0.4941176"
+        android:strokeColor="#FBFBFB"
+        android:strokeAlpha="0.4941176"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M976.5 211L975.5 213L976.5 211Z"
+        android:fillColor="#FBFBFB"
+        android:fillAlpha="0.4941176"
+        android:strokeColor="#FBFBFB"
+        android:strokeAlpha="0.4941176"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M973.5 213L972.5 215L973.5 213Z"
+        android:fillColor="#FBFBFB"
+        android:fillAlpha="0.4941176"
+        android:strokeColor="#FBFBFB"
+        android:strokeAlpha="0.4941176"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M970.5 215L968.5 218L970.5 215Z"
+        android:fillColor="#FBFBFB"
+        android:fillAlpha="0.4941176"
+        android:strokeColor="#FBFBFB"
+        android:strokeAlpha="0.4941176"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M965.5 219L951.5 234L965.5 219Z"
+        android:fillColor="#FBFBFB"
+        android:fillAlpha="0.4941176"
+        android:strokeColor="#FBFBFB"
+        android:strokeAlpha="0.4941176"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M950.5 235L948.5 238L950.5 235Z"
+        android:fillColor="#FBFBFB"
+        android:fillAlpha="0.4941176"
+        android:strokeColor="#FBFBFB"
+        android:strokeAlpha="0.4941176"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M947.5 239L946 241.5L942.5 247L943 245.5L947.5 239Z"
+        android:fillColor="#FBFBFB"
+        android:fillAlpha="0.4941176"
+        android:strokeColor="#FBFBFB"
+        android:strokeAlpha="0.4941176"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M940.5 250L940 251.5L937.5 257L937 255.5L940.5 250Z"
+        android:fillColor="#FBFBFB"
+        android:fillAlpha="0.4941176"
+        android:strokeColor="#FBFBFB"
+        android:strokeAlpha="0.4941176"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M935.5 260L936 261.5L934.5 264L934 262.5L935.5 260Z"
+        android:fillColor="#FBFBFB"
+        android:fillAlpha="0.4941176"
+        android:strokeColor="#FBFBFB"
+        android:strokeAlpha="0.4941176"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M930.5 275L931 277.5L930 277.5L930.5 275Z"
+        android:fillColor="#FBFBFB"
+        android:fillAlpha="0.4941176"
+        android:strokeColor="#FBFBFB"
+        android:strokeAlpha="0.4941176"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M929.5 280L930 282.5L929 282.5L929.5 280Z"
+        android:fillColor="#FBFBFB"
+        android:fillAlpha="0.4941176"
+        android:strokeColor="#FBFBFB"
+        android:strokeAlpha="0.4941176"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M927.5 393L928 402.5L927 402.5L927.5 393Z"
+        android:fillColor="#FBFBFB"
+        android:fillAlpha="0.4941176"
+        android:strokeColor="#FBFBFB"
+        android:strokeAlpha="0.4941176"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M927.5 404L928 441.5L927 441.5L927.5 404Z"
+        android:fillColor="#FBFBFB"
+        android:fillAlpha="0.4941176"
+        android:strokeColor="#FBFBFB"
+        android:strokeAlpha="0.4941176"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M926.5 448L927 453.5L926 453.5L926.5 448Z"
+        android:fillColor="#FBFBFB"
+        android:fillAlpha="0.4941176"
+        android:strokeColor="#FBFBFB"
+        android:strokeAlpha="0.4941176"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M925.5 457L926 460.5L925 460.5L925.5 457Z"
+        android:fillColor="#FBFBFB"
+        android:fillAlpha="0.4941176"
+        android:strokeColor="#FBFBFB"
+        android:strokeAlpha="0.4941176"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M924.5 463L925 465.5L924 465.5L924.5 463Z"
+        android:fillColor="#FBFBFB"
+        android:fillAlpha="0.4941176"
+        android:strokeColor="#FBFBFB"
+        android:strokeAlpha="0.4941176"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M919.5 481L920 482.5L918.5 485L918 483.5L919.5 481Z"
+        android:fillColor="#FBFBFB"
+        android:fillAlpha="0.4941176"
+        android:strokeColor="#FBFBFB"
+        android:strokeAlpha="0.4941176"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M913.5 494L913 495.5L909.5 501L910 499.5L913.5 494Z"
+        android:fillColor="#FBFBFB"
+        android:fillAlpha="0.4941176"
+        android:strokeColor="#FBFBFB"
+        android:strokeAlpha="0.4941176"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M908.5 502L906.5 505L908.5 502Z"
+        android:fillColor="#FBFBFB"
+        android:fillAlpha="0.4941176"
+        android:strokeColor="#FBFBFB"
+        android:strokeAlpha="0.4941176"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M905.5 506L901.5 511L905.5 506Z"
+        android:fillColor="#FBFBFB"
+        android:fillAlpha="0.4941176"
+        android:strokeColor="#FBFBFB"
+        android:strokeAlpha="0.4941176"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M32.5 517L34.5 520L32.5 517Z"
+        android:fillColor="#FBFBFB"
+        android:fillAlpha="0.4941176"
+        android:strokeColor="#FBFBFB"
+        android:strokeAlpha="0.4941176"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M894.5 517L890.5 522L894.5 517Z"
+        android:fillColor="#FBFBFB"
+        android:fillAlpha="0.4941176"
+        android:strokeColor="#FBFBFB"
+        android:strokeAlpha="0.4941176"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M37.5 521L38.5 523L37.5 521Z"
+        android:fillColor="#FBFBFB"
+        android:fillAlpha="0.4941176"
+        android:strokeColor="#FBFBFB"
+        android:strokeAlpha="0.4941176"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M887.5 523L886.5 525L887.5 523Z"
+        android:fillColor="#FBFBFB"
+        android:fillAlpha="0.4941176"
+        android:strokeColor="#FBFBFB"
+        android:strokeAlpha="0.4941176"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M884.5 525L883.5 527L884.5 525Z"
+        android:fillColor="#FBFBFB"
+        android:fillAlpha="0.4941176"
+        android:strokeColor="#FBFBFB"
+        android:strokeAlpha="0.4941176"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M46.5 527L47.5 529L46.5 527Z"
+        android:fillColor="#FBFBFB"
+        android:fillAlpha="0.4941176"
+        android:strokeColor="#FBFBFB"
+        android:strokeAlpha="0.4941176"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M881.5 527L880.5 529L881.5 527Z"
+        android:fillColor="#FBFBFB"
+        android:fillAlpha="0.4941176"
+        android:strokeColor="#FBFBFB"
+        android:strokeAlpha="0.4941176"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M876.5 530L875.5 532L868.5 535L868.5 534L876.5 530Z"
+        android:fillColor="#FBFBFB"
+        android:fillAlpha="0.4941176"
+        android:strokeColor="#FBFBFB"
+        android:strokeAlpha="0.4941176"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M57.5 533L61 534.5L59.5 535L57.5 533Z"
+        android:fillColor="#FBFBFB"
+        android:fillAlpha="0.4941176"
+        android:strokeColor="#FBFBFB"
+        android:strokeAlpha="0.4941176"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M71.5 538L74 538.5L71.5 539L71.5 538Z"
+        android:fillColor="#FBFBFB"
+        android:fillAlpha="0.4941176"
+        android:strokeColor="#FBFBFB"
+        android:strokeAlpha="0.4941176"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M75.5 539L78 539.5L75.5 540L75.5 539Z"
+        android:fillColor="#FBFBFB"
+        android:fillAlpha="0.4941176"
+        android:strokeColor="#FBFBFB"
+        android:strokeAlpha="0.4941176"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M853.5 539L856 539.5L853.5 540L853.5 539Z"
+        android:fillColor="#FBFBFB"
+        android:fillAlpha="0.4941176"
+        android:strokeColor="#FBFBFB"
+        android:strokeAlpha="0.4941176"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M79.5 540L83 540.5L79.5 541L79.5 540Z"
+        android:fillColor="#FBFBFB"
+        android:fillAlpha="0.4941176"
+        android:strokeColor="#FBFBFB"
+        android:strokeAlpha="0.4941176"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M848.5 540L852 540.5L848.5 541L848.5 540Z"
+        android:fillColor="#FBFBFB"
+        android:fillAlpha="0.4941176"
+        android:strokeColor="#FBFBFB"
+        android:strokeAlpha="0.4941176"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M85.5 541L91 541.5L85.5 542L85.5 541Z"
+        android:fillColor="#FBFBFB"
+        android:fillAlpha="0.4941176"
+        android:strokeColor="#FBFBFB"
+        android:strokeAlpha="0.4941176"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M842.5 541L847 541.5L842.5 542L842.5 541Z"
+        android:fillColor="#FBFBFB"
+        android:fillAlpha="0.4941176"
+        android:strokeColor="#FBFBFB"
+        android:strokeAlpha="0.4941176"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M96.5 542L840 542.5L96.5 543L96.5 542Z"
+        android:fillColor="#FBFBFB"
+        android:fillAlpha="0.4941176"
+        android:strokeColor="#FBFBFB"
+        android:strokeAlpha="0.4941176"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M573.5 2L593.5 3L595.5 3L713.5 3L714.5 2L715.5 3L728.5 3L729.5 2L742.5 2L742.5 3L737.5 4L577.5 4L573.5 3L573.5 2Z"
+        android:fillColor="#E8F0F0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#E8F0F0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M77.5 5L78.5 6L569.5 6Q570.8 3.7 575.5 5L576.5 6L737.5 6L742.5 5L743.5 6L791.5 6Q792.8 3.7 794 6.5L796 16.5L796 25.5L797 26.5L798 73.5L799 74.5L799 431.5L798 431.5L798 107.5L797 106.5L797 91.5L795.5 88L794.5 89L5 89L3.5 92L3 82.5Q9.4 45.4 33.5 26Q50.5 10.5 77.5 5Z"
+        android:fillColor="#E8F0F0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#E8F0F0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M796 6L856.5 6L857.5 7L880.5 8L881.5 9L905.5 12L927.5 17L953.5 25L983.5 37L992 42.5L997 60.5L998 83.5L999 84.5L999 154.5L997 155.5L997 120.5L995.5 119L987.5 118L958.5 110L941.5 116L935.5 113L837.5 89L803 89L802.5 91L801 89.5L798 22.5L797 21.5L797 11.5L796 6Z"
+        android:fillColor="#E8F0F0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#E8F0F0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M122.5 123L114 132.5Q106.8 141.3 104 154.5L104 388.5Q108.9 410.1 124.5 421L137.5 428L151.5 431L693.5 431L704.5 429L712.5 426L722.5 419L719.5 423Q710.6 429.6 697.5 432L145.5 432Q124 427.5 113 412.5L106 400.5L102 384.5L102 160.5Q104.5 159 103 153.5L109 138.5L122.5 123Z"
+        android:fillColor="#E8F0F0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#E8F0F0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M414.5 147L430.5 147L431 148.5L432 153.5L428.5 156L415.5 156Q411.5 155.5 412 150.5L414.5 147Z"
+        android:fillColor="#E8F0F0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#E8F0F0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M997.5 160L998 169.5L997 169.5L997.5 160Z"
+        android:fillColor="#E8F0F0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#E8F0F0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M996.5 174L997 179.5L996 179.5L996.5 174Z"
+        android:fillColor="#E8F0F0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#E8F0F0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M995.5 181L996 186.5L993 199.5L988.5 205Q965.5 215 951 233.5Q940.5 246 934 262.5L929 280.5L927 299.5L928 300.5L928 383.5L927 385.5Q929.5 387 928 392.5L927 393.5L927 402.5L927 404.5L927 447.5L926 448.5L926 456.5L923 471.5Q914.7 499.7 895.5 517Q882.8 528.8 865.5 536L841.5 542L91.5 542L70.5 538Q57 534.5 47 527.5L48.5 528L65.5 535L66.5 534L793 534L794.5 525L795.5 537L797.5 534L835.5 534L840.5 533L859.5 526L875 515L882 506.5L887.5 496Q902.3 493.3 910 483.5L914 476.5L912 477.5Q912.9 480.5 908.5 479L906 476.5L901 459.5L895 446.5L879 425.5L879 190L918.5 221L938.5 231L941 233.5L942 236.5L937 247.5L938 247.5L955 215.5L959.5 203L961.5 203L987.5 190L993 189L995.5 181ZM937 248L933 255L925 282L925 406L924 407L924 440L923 441L923 448L921 458L917 468L918 470L923 455L924 444L925 443L925 433L926 432L926 290L927 289L927 282L929 272L937 251L937 248ZM917 470L914 475L915 476L917 473L917 470Z"
+        android:fillColor="#E8F0F0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#E8F0F0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M649.5 195L660.5 204L670.5 195L672 198.5L664 206.5L664 209L666 209Q664.9 211.7 667.5 211Q673 212.6 672 219L668.5 219L659.5 211L651.5 219L648 219L648 216.5L656 208.5L656 206.5L648 198.5L648 196.5L649.5 195Z"
+        android:fillColor="#E8F0F0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#E8F0F0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M183.5 199L188.5 199L202 211.5L203 214.5L199.5 216L185.5 203L171.5 216L169 216L169 212.5L181.5 200L183.5 199ZM178 206L175 208L179 208L178 206ZM193 207L193 208L196 208L193 207Z"
+        android:fillColor="#E8F0F0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#E8F0F0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M500.5 210Q506 208.5 507.5 211L509.5 210L511.5 211L513.5 211L559.5 211L560 215L563.5 215L565 217.5L564 218.5L564 238L560 238L559.5 242L500.5 242Q497.7 240.8 500 239.5L500 213.5L499 211.5L500.5 210ZM503 213L504 215L511 215L511 237L504 237L503 239L505 240L556 240L557 237Q558 234 562 235L562 219L559 218L557 215L556 213L503 213Z"
+        android:fillColor="#E8F0F0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#E8F0F0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M283.5 211L306.5 211L311 212L311 219.5L309.5 221L299.5 221L299 223L309.5 223L311 224.5L307.5 226L306.5 225L285.5 225L283.5 226L282 223L292.5 223L293 221L283.5 221L282 219.5Q280.3 212.8 283.5 211ZM290 214L288 218L305 218L305 215L303 214L300 215L296 214L294 215L290 214Z"
+        android:fillColor="#E8F0F0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#E8F0F0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M328.5 212L337.5 212L338 213.5L342 217.5L342 231.5L336.5 237L328.5 237L323 231.5L323 217.5L328.5 212ZM332 217L328 222L329 225L328 227L330 230Q332 229 331 232Q336 233 337 229L336 227L337 221Q337 216 332 217Z"
+        android:fillColor="#E8F0F0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#E8F0F0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M350 212Q362.2 209.5 365 217.5L364 218.5L364 231.5L358.5 237L350 237L350 235Q347.3 236.1 348 233.5L345 231.5L346 230.5L346 216L348 216L350 212ZM355 217L351 219L351 230Q354 229 353 232L357 232Q356 229 359 230L359 219Q356 220 357 217L355 217Z"
+        android:fillColor="#E8F0F0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#E8F0F0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M382.5 212L390.5 212L396 215.5L396 222.5L388.5 230Q385.9 229.3 387 232L394.5 232L396 233.5L394.5 237L377.5 237L377 232L380.5 232L391 221.5Q391.8 217.8 389.5 217L385.5 217L380.5 222L378.5 222L377 219Q380.3 220.3 379 215.5L382.5 212Z"
+        android:fillColor="#E8F0F0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#E8F0F0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M404 212L412.5 212L415.5 215Q416.8 212.8 418 215.5L418 224L416 224L416 226L414 226Q415.1 228.7 412.5 228L409 231.5L410.5 233Q411.7 230.8 416.5 232Q419 233.2 418 237L399.5 237L399 233.5Q400.2 231 404 232L404 230L406 230L406 228L408 228Q406.9 225.3 409.5 226L411 223Q414.7 224.3 413 218.5Q412.3 216.3 408.5 217L403.5 222L400.5 222L399 220.5L402 217.5L402 215.5Q401.3 212.9 404 214L404 212Z"
+        android:fillColor="#E8F0F0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#E8F0F0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M444.5 215L447 215.5L447 240Q443.2 241.5 444 238.5L436.5 231L433 231L433 224.5L434.5 223L435.5 224L444.5 215Z"
+        android:fillColor="#E8F0F0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#E8F0F0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M514.5 215L522 215L522 237L513 237L513 216.5L514.5 215Z"
+        android:fillColor="#E8F0F0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#E8F0F0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M525.5 215L533 215L533 237L524 237L524 216.5L525.5 215Z"
+        android:fillColor="#E8F0F0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#E8F0F0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M536.5 215Q543.3 213.3 545 216.5L544 221.5L545 222.5L545 231.5L543.5 238L542.5 237L535 237L535 216.5L536.5 215Z"
+        android:fillColor="#E8F0F0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#E8F0F0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M369.5 216Q375.2 214.2 373 220.5L369.5 222Q367.3 221.3 368 217.5L369.5 216Z"
+        android:fillColor="#E8F0F0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#E8F0F0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M456.5 219L458 219.5L458 235L455 234.5L455 220.5L456.5 219Z"
+        android:fillColor="#E8F0F0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#E8F0F0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M451 224L454 225.5L453 227.5L454 229.5L451 231L451 224Z"
+        android:fillColor="#E8F0F0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#E8F0F0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M368 228L373 228L373 231.5L369.5 233Q367 231.8 368 228Z"
+        android:fillColor="#E8F0F0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#E8F0F0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M283.5 229L305.5 229L306.5 230L308.5 230L311 230.5L308.5 237Q303.3 238.8 305 233.5L303.5 232L282 232L283.5 229Z"
+        android:fillColor="#E8F0F0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#E8F0F0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M384.5 248Q390 247 391 250.5Q389.5 254.9 392.5 254Q397 255.4 396 261Q398.7 259.9 398 262.5L400 266L392 264Q393 261 390 262L390 258.5L384.5 254L376.5 264Q371.1 265.9 372 262.5L377 257.5L377 254L379 254L379 252L381 252Q379.9 249.3 382.5 250L384.5 248Z"
+        android:fillColor="#E8F0F0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#E8F0F0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M404.5 248L418 248L418 259Q413 260.3 411.5 257L403 256.5L405.5 254L413 254L411.5 251Q404.8 252.7 403 249.5L404.5 248Z"
+        android:fillColor="#E8F0F0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#E8F0F0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M420 248L425 248L425 250.5L424 251.5L424 269.5L425 271.5Q423.6 274.3 419 273L419 269Q413.4 270.9 415 266L419 264.5L420 248Z"
+        android:fillColor="#E8F0F0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#E8F0F0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M426 248Q430.6 246.8 432 249.5L431 250.5L431 273L426 272.5L426 248Z"
+        android:fillColor="#E8F0F0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#E8F0F0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M440.5 248L446.5 248Q445.5 251 450.5 250Q453.3 251.3 451 252.5L451 260Q445.7 258.8 446.5 262L440.5 262Q439.3 259 435 260L435 250L438.5 250L440.5 248ZM443 252L440 256L444 258Q447 257 446 253L443 252Z"
+        android:fillColor="#E8F0F0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#E8F0F0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M457 248Q461.6 246.8 463 249.5L463 272.5L459.5 273Q458.3 275.3 457 272.5L457 256.5L455.5 255Q452.2 256.1 453 253.5L457 252L457 248Z"
+        android:fillColor="#E8F0F0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#E8F0F0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M402.5 261L414.5 261L416 262.5L411 265.5Q409.8 270.3 412 271.5Q410.6 274.3 406 273L406 265.5L404.5 264L401 262.5L402.5 261Z"
+        android:fillColor="#E8F0F0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#E8F0F0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M372 270L399.5 270L400 273L372.5 273L372 270Z"
+        android:fillColor="#E8F0F0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#E8F0F0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M298.5 279L368.5 279L369 281L370.5 281L374 286L376 286L376 288L378 288L378 290Q380.7 288.9 380 291.5L387 297L387.5 299L394.5 299L396 302.5Q394.5 306.5 387.5 305L372.5 320L372 318.5Q376.3 316.3 371.5 314L368.5 316L376.5 306L374.5 306L365.5 315L365 313.5L365.5 312Q358.7 311.8 356.5 307L347.5 305L339.5 299L329 297L329 293L330.5 293L334 292Q332.8 287.4 335.5 286L344 286L344 292L350 292L350 286L360 286L360 291.5L361.5 292L363.5 292L366 292Q364.9 289.3 367.5 290L377 299.5Q375.8 304.8 378.5 306L379 298.5Q373.1 289.9 364 286Q365 289.8 362.5 291L359.5 284L350.5 284L349 285.5Q350.9 290.9 347.5 290Q346.3 292.3 345 289.5L346 287.5L343.5 284L334.5 284L333 285.5Q334.9 290.9 331.5 290Q330.3 292.3 329 289.5Q331.1 283.6 326.5 285Q325 282.5 319.5 284L317 285Q318.3 289.6 315.5 291Q312.1 291.9 314 286.5L311.5 284Q302.3 285.7 299.5 281L298.5 283L297 280.5L298.5 279Z"
+        android:fillColor="#E8F0F0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#E8F0F0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M460.5 283Q462.3 285.8 468.5 284L470.5 283L473.5 284Q474.8 281.8 476 284.5L476 325.5L474.5 327Q468.3 327.8 468 326.5L468 291L459 291L459 284.5L460.5 283Z"
+        android:fillColor="#E8F0F0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#E8F0F0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M490.5 283L491.5 284L499.5 284L509 291.5Q511 300 506.5 302Q503.9 301.3 505 304Q508.3 302.7 507 307.5L509 309.5L509 318Q505.7 316.7 507 321.5Q505.6 326 500 325L499.5 327L488 327L488 325L484 325Q485.1 322.3 482.5 323L479 316.5L479 309.5Q482.6 307.6 483 302.5L479 300L479 291.5L484.5 286L488 286Q486.9 283.3 489.5 284L490.5 283ZM492 291L492 293L489 295Q487 300 491 299L493 302L498 302L502 298Q503 293 499 293L499 291L492 291ZM489 307Q490 310 487 309L487 315Q490 314 489 317L493 319L497 319Q496 316 501 317L502 312L501 310L499 307L489 307Z"
+        android:fillColor="#E8F0F0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#E8F0F0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M513.5 284L541.5 284Q542.8 284.3 542 290.5Q539 291.8 540 296L538 296L538 300L536.5 300L535 302.5Q537.3 303.8 534.5 305Q531.5 304.1 533 308.5L529 314.5L529 318L527 318Q528.3 323.3 525 322.5L525 325.5L523.5 327L515 327L515 324.5L519 318.5L519 315L522 313.5L522 311.5Q521.3 308.9 524 310L524 306L526 306L526 302L528 302L528 298.5L532 292.5L531.5 291L513.5 291Q512.5 291 513 286.5Q510.7 285.3 513.5 284Z"
+        android:fillColor="#E8F0F0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#E8F0F0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M407.5 294L411 295.5L409.5 298Q404.7 299.7 406 295.5L407.5 294Z"
+        android:fillColor="#E8F0F0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#E8F0F0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M413 295L418 295Q417 298 420 297L420 305.5L416 308L417.5 311Q418.8 308.8 420 311.5Q420.8 314.1 417.5 313Q416.3 316 412 315L412 311L408 311L408 309.5L417 306L415 298Q411.7 299.1 413 295Z"
+        android:fillColor="#E8F0F0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#E8F0F0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M402.5 297Q405.5 296.2 404 300Q401 298.8 402 302.5L407 306L405.5 309L399 303.5Q398.3 297.8 402.5 297Z"
+        android:fillColor="#E8F0F0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#E8F0F0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M424 310L429 313.5L429 320L426 320L426 314.5Q423.3 313.4 424 310Z"
+        android:fillColor="#E8F0F0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#E8F0F0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M656.5 315Q669.9 314.1 674 322.5Q677.5 326.5 676 335.5L672 343L664.5 347L655.5 347L646 339.5Q643 335.5 644 327.5Q645.8 320.3 651.5 317L656.5 315ZM659 319L653 322L648 330L650 338L658 343Q664 344 667 341L672 334Q673 327 670 325Q667 319 659 319Z"
+        android:fillColor="#E8F0F0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#E8F0F0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M413.5 317L416 318.5L414.5 322Q410.3 323.3 412 318.5L413.5 317Z"
+        android:fillColor="#E8F0F0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#E8F0F0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M425.5 321L427 323.5L421.5 329L417.5 329L414 325.5L415.5 324Q419.3 323 418 326L421 326L422.5 323L425.5 321Z"
+        android:fillColor="#E8F0F0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#E8F0F0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M169 323L172.5 323L184.5 335L186.5 335L199.5 323L193.5 330L186.5 336L184.5 336L172.5 324L170 324L170 325.5L182.5 338L184 338.5L182.5 339L169 326.5L169 323Z"
+        android:fillColor="#E8F0F0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#E8F0F0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M201.5 323L203 325.5L190.5 338L187.5 339L187.5 338L202 325.5L201.5 323Z"
+        android:fillColor="#E8F0F0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#E8F0F0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M795.5 517L796 523.5L795 523.5L795.5 517Z"
+        android:fillColor="#E8F0F0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#E8F0F0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M88.5 3L564 3.5L88.5 4L88.5 3Z"
+        android:fillColor="#D4D6D6"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#D4D6D6"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M749.5 3L792 3.5L749.5 4L749.5 3Z"
+        android:fillColor="#D4D6D6"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#D4D6D6"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M795 3L850 3.5L796 4L795.5 6L795 3Z"
+        android:fillColor="#D4D6D6"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#D4D6D6"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M857.5 4L865 4.5L857.5 5L857.5 4Z"
+        android:fillColor="#D4D6D6"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#D4D6D6"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M589.5 5L609 5.5L589.5 6L589.5 5Z"
+        android:fillColor="#D4D6D6"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#D4D6D6"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M623.5 5L633 5.5L623.5 6L623.5 5Z"
+        android:fillColor="#D4D6D6"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#D4D6D6"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M634.5 5L641 5.5L634.5 6L634.5 5Z"
+        android:fillColor="#D4D6D6"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#D4D6D6"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M646.5 5L667 5.5L646.5 6L646.5 5Z"
+        android:fillColor="#D4D6D6"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#D4D6D6"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M672.5 5L681 5.5L672.5 6L672.5 5Z"
+        android:fillColor="#D4D6D6"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#D4D6D6"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M684.5 5L693 5.5L684.5 6L684.5 5Z"
+        android:fillColor="#D4D6D6"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#D4D6D6"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M695.5 5L712 5.5L695.5 6L695.5 5Z"
+        android:fillColor="#D4D6D6"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#D4D6D6"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M713.5 5L717 5.5L713.5 6L713.5 5Z"
+        android:fillColor="#D4D6D6"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#D4D6D6"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M869.5 5L874 5.5L869.5 6L869.5 5Z"
+        android:fillColor="#D4D6D6"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#D4D6D6"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M879.5 6L882 6.5L879.5 7L879.5 6Z"
+        android:fillColor="#D4D6D6"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#D4D6D6"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M886.5 7L889 7.5L886.5 8L886.5 7Z"
+        android:fillColor="#D4D6D6"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#D4D6D6"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M892.5 8L895 8.5L892.5 9L892.5 8Z"
+        android:fillColor="#D4D6D6"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#D4D6D6"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M59.5 9L58.5 11L57 10.5L59.5 9Z"
+        android:fillColor="#D4D6D6"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#D4D6D6"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M796.5 15L797 20.5L796 20.5L796.5 15Z"
+        android:fillColor="#D4D6D6"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#D4D6D6"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M797.5 27L798 34.5L797 34.5L797.5 27Z"
+        android:fillColor="#D4D6D6"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#D4D6D6"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M798.5 44L799 59.5L798 59.5L798.5 44Z"
+        android:fillColor="#D4D6D6"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#D4D6D6"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M799.5 62L800 65.5L799 65.5L799.5 62Z"
+        android:fillColor="#D4D6D6"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#D4D6D6"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M2.5 87L3 109.5L2 109.5L2.5 87Z"
+        android:fillColor="#D4D6D6"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#D4D6D6"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M800.5 87L801 92.5L800 92.5L800.5 87Z"
+        android:fillColor="#D4D6D6"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#D4D6D6"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M145.5 110L149 110.5L145.5 111L145.5 110Z"
+        android:fillColor="#D4D6D6"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#D4D6D6"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M695.5 110L699 110.5L695.5 111L695.5 110Z"
+        android:fillColor="#D4D6D6"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#D4D6D6"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M801.5 110L802.5 113L803 111L838.5 111L882.5 123L909.5 128L926.5 123L928.5 125L946.5 129L994.5 143L995.5 141L996 169.5L995 169.5L994.5 158L993.5 161L971.5 150L924.5 135Q914.5 134 907.5 130L903.5 130Q900.2 132.7 893.5 132L862.5 126L860.5 127L857.5 125L851 124Q849.9 126.7 852.5 126L873 146.5L873 151L919.5 184L938.5 193L958 196L959 201.5L956.5 208L956 206L940.5 205L921.5 197Q895.4 181.1 873.5 161L869 159L871 151L869.5 151L845.5 129L845 425.5L854.5 433L856.5 433L860.5 430L878 453.5L885 468.5L888 483.5L888 485.5L888 493.5L889.5 494L889.5 495L874 496.5L875 498.5L873 502.5Q868.3 512.8 859.5 519L853.5 523L851 523Q852.1 525.7 849.5 525L837.5 530L798.5 530L797.5 531L797 529.5L798.5 528L835.5 528Q849.8 523.3 859 513.5L861 510.5L868 499.5L868 495L881 494.5L880 493.5L880 485.5L878 481.5L879 479.5L871 458.5L854.5 437L852.5 438L837.5 427L802 427L802 171.5L801 170.5L802 168.5L801 167.5L801.5 110Z"
+        android:fillColor="#D4D6D6"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#D4D6D6"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M4 111L136 111.5L134 112.5L136 113.5Q120.4 118.4 112 130.5L109 136.5L109.5 138Q106.9 137.2 108 140.5L102 154.5L100.5 192L82.5 183L77.5 182L67.5 176L61.5 175Q54.8 168.7 43.5 167L38.5 163L30.5 161L22.5 156L14.5 154L6.5 149L4 149L3 145.5L3 113.5L4 111Z"
+        android:fillColor="#D4D6D6"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#D4D6D6"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M709.5 111L796.5 111L797 111.5L797 427.5L795.5 427L716 426.5L722 423L725 418.5L724.5 417L725.5 418L729 414.5L728.5 413L730 413.5Q729.3 411.3 731.5 412L732.5 409L734 409.5L733 407.5L736 406.5L735 404.5L738 403.5L744 386.5L744 157.5Q739.9 133.1 723.5 121L712 115L711.5 113L709.5 114L709.5 113L711 112.5L709.5 111Z"
+        android:fillColor="#D4D6D6"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#D4D6D6"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M119.5 125L118.5 127L119.5 125Z"
+        android:fillColor="#D4D6D6"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#D4D6D6"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M994.5 175L995 178L992 177.5L994 177L994.5 175Z"
+        android:fillColor="#D4D6D6"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#D4D6D6"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M987.5 178L990 178.5L987.5 179L987.5 178Z"
+        android:fillColor="#D4D6D6"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#D4D6D6"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M982.5 179L986 179.5L978.5 181L978.5 180L982.5 179Z"
+        android:fillColor="#D4D6D6"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#D4D6D6"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M973.5 181Q977.3 180.3 978 182.5Q972.7 189.7 961.5 191L960 190.5L959.5 197L959 184.5L960.5 183L966.5 183L973.5 181Z"
+        android:fillColor="#D4D6D6"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#D4D6D6"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M195.5 205L196.5 207L195.5 205Z"
+        android:fillColor="#D4D6D6"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#D4D6D6"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M561.5 223L562 229.5L561 229.5L561.5 223Z"
+        android:fillColor="#D4D6D6"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#D4D6D6"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M286.5 225L289 225.5L286.5 226L286.5 225Z"
+        android:fillColor="#D4D6D6"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#D4D6D6"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M297.5 225L303 225.5L297.5 226L297.5 225Z"
+        android:fillColor="#D4D6D6"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#D4D6D6"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M412.5 228L411.5 230L412.5 228Z"
+        android:fillColor="#D4D6D6"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#D4D6D6"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M537.5 239L540 239.5L537.5 240L537.5 239Z"
+        android:fillColor="#D4D6D6"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#D4D6D6"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M431.5 259L432 261.5L431 261.5L431.5 259Z"
+        android:fillColor="#D4D6D6"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#D4D6D6"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M926.5 282L927 284.5L926 284.5L926.5 282Z"
+        android:fillColor="#D4D6D6"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#D4D6D6"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M514.5 283L518 283.5L514.5 284L514.5 283Z"
+        android:fillColor="#D4D6D6"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#D4D6D6"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M282.5 285L283 311.5L282 311.5L282.5 285Z"
+        android:fillColor="#D4D6D6"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#D4D6D6"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M303.5 286L304 288.5L303 289.5L302.5 316L302 289L297.5 288L296 288.5L299.5 287L302.5 289L303.5 286Z"
+        android:fillColor="#D4D6D6"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#D4D6D6"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M360.5 286L361 288.5L360 288.5L360.5 286Z"
+        android:fillColor="#D4D6D6"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#D4D6D6"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M925.5 289L926 291.5L925 291.5L925.5 289Z"
+        android:fillColor="#D4D6D6"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#D4D6D6"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M523.5 291L526 291.5L523.5 292L523.5 291Z"
+        android:fillColor="#D4D6D6"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#D4D6D6"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M289.5 292L297 292.5L289.5 293L289.5 292Z"
+        android:fillColor="#D4D6D6"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#D4D6D6"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M382.5 293L383.5 295L382.5 293Z"
+        android:fillColor="#D4D6D6"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#D4D6D6"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M375.5 295L376.5 297L375.5 295Z"
+        android:fillColor="#D4D6D6"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#D4D6D6"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M298.5 296L299 307.5L298 307.5L298.5 296Z"
+        android:fillColor="#D4D6D6"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#D4D6D6"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M286.5 299L287 309.5L286 309.5L286.5 299Z"
+        android:fillColor="#D4D6D6"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#D4D6D6"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M329.5 301L342 307.5L338.5 308L333 304.5Q333.7 301.9 331 303L329.5 312L329 307.5L330 302.5L329.5 301Z"
+        android:fillColor="#D4D6D6"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#D4D6D6"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M346.5 309L348.5 309L352.5 313L361 315.5Q360 318 355.5 317L355.5 316L357 315.5L350.5 314L346.5 309Z"
+        android:fillColor="#D4D6D6"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#D4D6D6"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M282.5 313L283 315.5L282 315.5L282.5 313Z"
+        android:fillColor="#D4D6D6"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#D4D6D6"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M290.5 315L294 315.5L290.5 316L290.5 315Z"
+        android:fillColor="#D4D6D6"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#D4D6D6"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M298.5 316L299 318.5L298 318.5L298.5 316Z"
+        android:fillColor="#D4D6D6"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#D4D6D6"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M330.5 316L353 316.5L330.5 317L330.5 316Z"
+        android:fillColor="#D4D6D6"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#D4D6D6"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M286.5 317L287 319.5L286 319.5L286.5 317Z"
+        android:fillColor="#D4D6D6"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#D4D6D6"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M326 319L329 319.5L326 321L326 319Z"
+        android:fillColor="#D4D6D6"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#D4D6D6"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M366.5 319L369 320L368.5 322L367.5 321L359 320.5L366.5 319Z"
+        android:fillColor="#D4D6D6"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#D4D6D6"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M282.5 321L286 321.5L282.5 322L282.5 321Z"
+        android:fillColor="#D4D6D6"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#D4D6D6"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M322.5 324L328 324.5L322.5 325L322.5 324Z"
+        android:fillColor="#D4D6D6"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#D4D6D6"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M332.5 324L336 324.5L332.5 325L332.5 324Z"
+        android:fillColor="#D4D6D6"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#D4D6D6"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M337.5 324L352 324.5L337.5 325L337.5 324Z"
+        android:fillColor="#D4D6D6"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#D4D6D6"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M176.5 333L177.5 335L176.5 333Z"
+        android:fillColor="#D4D6D6"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#D4D6D6"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M101.5 341L102 387.5L101 387.5L101.5 341Z"
+        android:fillColor="#D4D6D6"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#D4D6D6"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M107.5 405L108.5 407L107.5 405Z"
+        android:fillColor="#D4D6D6"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#D4D6D6"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M111.5 411L112.5 413L111.5 411Z"
+        android:fillColor="#D4D6D6"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#D4D6D6"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M114.5 415L118.5 420L114.5 415Z"
+        android:fillColor="#D4D6D6"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#D4D6D6"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M122.5 422L123.5 424L122.5 422Z"
+        android:fillColor="#D4D6D6"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#D4D6D6"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M125.5 424L126.5 426L125.5 424Z"
+        android:fillColor="#D4D6D6"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#D4D6D6"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M696.5 432L699 432.5L696.5 433L696.5 432Z"
+        android:fillColor="#D4D6D6"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#D4D6D6"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M797.5 432L798 439.5L797 439.5L797.5 432Z"
+        android:fillColor="#D4D6D6"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#D4D6D6"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M798.5 455L799 462.5L798 463.5L797.5 491L797 463.5L798.5 455Z"
+        android:fillColor="#D4D6D6"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#D4D6D6"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M796.5 496L797 499.5L796 499.5L796.5 496Z"
+        android:fillColor="#D4D6D6"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#D4D6D6"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M795.5 511L797 514.5L796 514.5L795.5 511Z"
+        android:fillColor="#D4D6D6"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#D4D6D6"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M793.5 527L794 528.5L792.5 531L791.5 530L58 530L57.5 532L53.5 529L52 529.5L52.5 528L792.5 528L793.5 527Z"
+        android:fillColor="#D4D6D6"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#D4D6D6"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M795.5 533L796 535.5L795 535.5L795.5 533Z"
+        android:fillColor="#D4D6D6"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#D4D6D6"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M571.5 1L572 3.5L571 3.5L571.5 1Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M579.5 1L737 1.5L579.5 2L579.5 1Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M148.5 113L152 113.5L148.5 114L148.5 113Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M694.5 113L697 113.5L694.5 114L694.5 113Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M718.5 121L719.5 123L718.5 121Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M722.5 124L730.5 133L722.5 124Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M121.5 125L117.5 130L121.5 125Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M732.5 135L733.5 137L732.5 135Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M413.5 147L412.5 149L413.5 147Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M275.5 193L569.5 193L577 198.5L578 200.5L578 342.5L575.5 346L570.5 348L499.5 348L499.5 347L564 346.5L558.5 344Q557.2 346.3 556 343.5L575 343L575 327.5L573 327Q574.3 330 570.5 329L569 328.5Q569.8 330.8 567.5 330Q566 332.5 564.5 329L557 327Q555.9 324.3 558.5 325L558.5 324L554 325Q555.1 321.7 551 323L550.5 326L549 323L547 323Q548.1 325.7 545.5 325L545.5 323L542 321.5L541.5 320L539 321L537.5 318Q533.1 316.5 534 319.5L534.5 321L533 321L533 325Q529.3 323.5 530 326.5L530.5 328L528 327.5L528 324Q530.7 325.1 530 322.5L529 320.5L529.5 319Q526.5 318.1 528 322.5L527 322.5Q526.3 317.8 529.5 317L530.5 319L532 315.5L531.5 314L529 315.5L534 308.5L534 305L536 305L536 301Q538.7 302.1 538 299.5L540 299.5L539 296.5L542 295.5L541 292.5Q544.5 291 543 284.5L542.5 282L540.5 283L514.5 283L512.5 282L512 284.5Q510.5 290.5 513.5 292L529.5 292L530 295.5Q527.3 296.8 527.5 301L526.5 297L525 300.5L525.5 302L524 301.5L522 306.5L522.5 308L521 307.5Q518.4 308.9 519 313.5L520 313.5L520.5 311L521 313.5Q519 317.2 517 315.5L518 318.5L514 320.5L515 323.5L512 324.5L511.5 326L507 322.5Q506.3 317.8 509.5 317L510.5 319Q513.1 316.6 512 310.5L510.5 308Q509.3 310.3 508 307.5L509 306.5L509 300Q512.3 301.3 511 296.5L510 292L512 291.5L510.5 285L509 289.5L509.5 291L504 285.5L504.5 284L501.5 285L499.5 281L489 281.5L499 282.5L489.5 283L488 282.5L487.5 285L487 283L483 284.5L483.5 286Q482.3 283.8 481 286.5L483 287.5L481.5 288L480.5 287L478 288.5L477.5 283L476.5 285L476 283.5Q478.3 282.3 475.5 281L459.5 281L455.5 285L455 283.5Q457.5 282 454 280.5L451.5 275L449 275L448.5 273L441.5 273Q440 270.5 438.5 274Q436.3 274.8 437 272.5L434 268.5L433.5 259L433 272.5L430.5 275L424.5 274L419.5 275L417.5 275Q413.1 276.5 414 273.5L415 271L417.5 270L417 271.5L417.5 274L419.5 274L425.5 273L430.5 274L432 272.5L432 248.5L430.5 245L429 245.5L429.5 247L425.5 248L420.5 247L418.5 248L417.5 247L404.5 247L403 251L406 251.5L403 252L403.5 254L411 252.5L410.5 251L412 254L404.5 254L403 255.5L403.5 258L411.5 258L412.5 260L402.5 258L401 261.5Q401.8 263.8 399.5 263L396.5 259L399.5 262L401 260.5L399 260L397.5 256L396.5 258L396 256.5Q398.5 255 395 253.5L394 251.5L395 250.5L391.5 247L389.5 248L390 246.5Q390.6 243.8 384.5 245L384.5 246L388 246.5L384.5 247L376 255.5L376 257.5L371.5 262Q368.3 260.3 372 258.5L373.5 256Q375.8 256.8 375 254.5L374 253.5L377 250.5L376 246.5L377 244L374.5 245L373 241L375.5 240L378.5 241L380.5 240L382.5 240L385.5 241L386.5 240L395.5 240L397 238.5L395.5 238L394.5 239L377.5 239L375 237.5Q375.8 240.1 372.5 239L370.5 239L368.5 238L367 238.5Q366.4 235.8 372.5 237Q373.7 239.3 375 236.5L375.5 234L377.5 238L394.5 238L396 236.5Q397.9 231.1 394.5 232L394.5 231L396 230.5L393 229.5L394 227.5L390 230.5Q390.7 233.1 388 232Q386.9 229.3 389.5 230L396.5 223L398 223.5L397.5 214L395.5 214Q391.5 214.5 391 211.5L391.5 210L382.5 211L378 215.5L376.5 219L375.5 217L375 221.5L377.5 222Q384.5 223 385.5 218L390 218L390 221.5L380.5 231L376 230Q376.8 226.2 373.5 225L372 224.5L374 223.5Q368.6 224.4 367 221.5L368.5 222Q376.3 224.7 374 217.5L375 215L367.5 217L366 216.5L367 219.5L366 220.5L366 229.5L366 231.5Q366.8 233.8 364.5 233L359 237.5L365 231.5L365 216.5L366 215.5Q364.2 211.3 362.5 214L361 213.5L363 212.5L360 211.5L358.5 209L357 209L356.5 211L351.5 211L350 210.5L349 214L347 214Q347.8 217.1 345 216.5L345 233L347 233L347 235Q349.7 233.9 349 236.5L349.5 238Q347.3 238.8 348 236.5L346 236.5Q346.7 233.9 344 235L344 232.5L337.5 238L336 237.5L343 231.5L343 217.5L337 211.5L339 210.5Q337.5 207.5 331.5 209L331.5 210L336 210.5L328.5 211L322 216L322 231.5L328 237.5L326 238L326 236L324 236Q325.1 233.3 322.5 234L320 230.5L319 216.5L317 213L325 211Q323.3 206.9 327.5 208L332.5 207L336 208Q337.5 204.3 334.5 205L333.5 204L274.5 204L273.5 203L272 204.5L272 213L269.5 212L268.5 225L268 203.5L267 200.5L271.5 195L275.5 193ZM413 210L405 212Q402 211 403 214L401 214L399 222Q407 224 409 218Q414 216 412 223Q410 227 409 224L408 227L403 232L399 232L399 238L400 238L418 238L420 238Q422 237 421 234Q420 231 419 233L410 232L419 224Q420 226 421 224L421 215L420 223L419 216L416 214Q411 212 414 211L413 210ZM499 210L499 242L501 243L560 243L561 242Q563 243 562 240L564 240L565 238L565 216L561 215L561 212L560 210L499 210ZM340 211L339 213L343 216L340 211ZM394 212L394 213L396 213L394 212ZM416 212L416 213L418 213L416 212ZM445 213L444 215L442 215Q443 218 441 217L441 219L439 219L439 221Q436 220 437 223Q433 222 432 225Q430 231 434 231L433 233L436 233L436 231L443 239L442 240L447 240L450 239Q448 237 449 233L449 231L448 229L449 226L448 224L449 215L448 215L445 213ZM369 214L369 215L373 215L369 214ZM456 217L456 219L453 220L454 223L450 225L450 231L455 231L455 233L452 232L452 233Q454 232 453 235L458 236L460 236L459 234L459 221L460 220L458 219L458 218L456 217ZM409 219L409 220L411 220L409 219ZM385 220L383 223L386 221L385 220ZM461 221L460 224L461 224L461 221ZM378 223L378 224L382 224L378 223ZM400 223L400 224L405 224L400 223ZM397 224L395 226L397 226L397 224ZM417 225L417 227L419 226L417 225ZM415 227L415 229L417 228L415 227ZM461 228L460 234L461 234L461 228ZM414 229L413 231L418 231L414 229ZM400 230L400 231L403 231L400 230ZM398 232L397 238L398 238L398 232ZM456 237L456 238L458 238L456 237ZM400 239L400 240L418 240L400 239ZM445 241L445 242L447 242L445 241ZM405 245L405 246L412 246L405 245ZM447 246Q445 248 441 247L439 249L436 248L436 250Q433 251 434 249L433 249L434 254L433 257L434 259L438 262Q439 259 441 263Q446 264 448 261L449 263L452 262L451 261L453 255L456 256L456 257Q452 256 453 260L454 260Q453 257 456 258L456 271L454 274L456 273L462 274L462 275L457 274L456 276L461 277L464 275L463 274L463 249L463 246L461 247L458 246L458 248L453 251L456 251L456 252Q451 253 452 251L452 249L450 248L448 248L447 246ZM402 248L401 251L402 251L402 248ZM465 248L465 274L466 267L465 266L465 248ZM442 264L442 265L446 265L442 264ZM515 281L515 282L519 282L515 281ZM538 302L537 305L538 305L538 302ZM536 306L535 309L536 309L536 306ZM534 310L533 313L534 313L534 310ZM508 319Q506 324 510 323Q512 318 508 319Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M184.5 204L181.5 208L184.5 204Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M282.5 210L310 210.5L282.5 211L281 212.5Q279.6 219.9 283 222.5L281 223.5Q278.1 219.9 279 212.5L282.5 210Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M311.5 214L312 220.5L311 222.5L312 225.5L311 225.5L310 221.5L311.5 214Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M510.5 214L514 214.5Q512.8 217.3 511.5 215L510.5 214Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M522.5 214L525 214.5Q522.9 217.8 522.5 214Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M532.5 214L536 214.5Q534.7 217.3 533.5 215L532.5 214Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M544.5 214L555.5 214L557 215.5L558.5 219L561 219.5L561 235L555 236L555.5 238L557 237.5L555.5 239L504.5 239L504.5 238L512.5 237L513.5 238L521.5 238L524 236.5L524.5 238L532.5 238L534 236.5L534.5 217L535 238L545 238L545 215.5L544.5 214Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M289.5 215L303.5 215L304 218L289.5 218L288 216.5L289.5 215ZM290 216L290 217L302 217L290 216Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M331.5 218Q335.5 217.5 336 220.5Q338 229 333.5 231L332.5 229L331.5 231Q327 229 329 220.5L331.5 218ZM330 220L330 229L333 228L332 224L332 222Q333 219 330 220Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M354.5 218L358 220.5L358 228.5L356.5 230L354.5 229L353 229.5L354 228.5L354 220.5L352 220.5L354.5 218Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M647.5 218L648.5 220L647.5 218Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M672.5 218L671.5 220L672.5 218Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M352.5 222L353 226.5L352 226.5L352.5 222Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M367 224L371 224.5L367.5 226L367 224Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M281.5 225L282.5 226L310 226.5L282.5 227L281.5 225Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M369.5 226Q374.3 225.3 375 228.5Q376 233 373.5 234Q366.5 235.5 367 232.5L368.5 233Q376.3 235.7 374 228.5Q373.3 226.3 369.5 227L369.5 226Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M283.5 228L310 228.5L283.5 229L283.5 228Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M281.5 229L281 230.5L282 232.5L280 233L281.5 229Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M311.5 229L312 237L309.5 238L311 235.5L311.5 229Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M377.5 231L376.5 233L377.5 231Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M294.5 233L304 233.5L294.5 234L294.5 233Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M303.5 235L304 237L306 237.5L304.5 238L303.5 235Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M351.5 238L356 238.5L351.5 239L351.5 238Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M391.5 249Q393.8 249.8 393 253.5L392 253.5L391.5 249Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M442.5 253L445 254.5L443.5 255L442 254.5Q441.3 256.8 443.5 256L443.5 257L441 255.5L442.5 253Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M384.5 255L389 258.5L388 259.5L392.5 265L387 266L386.5 264L383.5 265L384.5 263Q386.8 263.8 386 261.5L386 259.5L387 257.5L384 256L384 258.5L377.5 265L383 258.5L384.5 255ZM390 263L391 265Q392 262 390 263Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M415.5 260L418 260.5L417 263.5L419 263.5L413 266.5L413 268.5Q414 273 411.5 274L412 272.5L412 265.5L414.5 265L416 261.5L415.5 260Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M394.5 265L399.5 267L401 266.5L397.5 268L394.5 265Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M403.5 265L405 265.5L405 272.5L410 274.5L406.5 275L404 274Q404.8 270.6 402 269.5L404 266.5L403.5 265Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M372.5 269L371.5 271L372.5 269Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M301.5 277L309 277.5L301.5 278L301.5 277Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M312.5 277L317 277.5L312.5 278L312.5 277Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M318.5 277L324 277.5L318.5 278L318.5 277Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M296.5 279L297 284.5L296 284.5L296.5 279Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M288.5 282L289 284.5L288 284.5L288.5 282Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M460.5 282L475 282.5L460.5 283L460.5 282Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M374.5 284L384.5 295L374.5 284Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M307.5 285Q312 284 313 286.5L312.5 290L312 286L307.5 286L307.5 285Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M318.5 285L327.5 285L329 286.5L326 288.5Q325.3 286.3 327.5 287L327.5 286L318.5 286L318.5 285Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M365.5 287L367 289.5L364.5 291L365 289.5L365.5 287Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M458.5 287L459 292L457 291.5L458.5 287Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M317.5 290L316.5 292L317.5 290Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M328.5 290L329.5 292L328.5 290Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M478.5 291L479 299.5L482 303.5L479 308.5L478.5 316L478 308.5L478 306.5L478.5 291Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M460.5 292L467 292.5L460.5 293L460.5 292Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M476.5 292L477 326.5L475 327.5L476 326.5L476.5 292Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M492 292Q499.2 290.5 501 295.5L501 299Q498 298 499 301L492.5 301Q488.8 299.5 490 294Q493 295 492 292ZM492 295L491 298L492 298L492 295ZM500 295L499 298L500 298L500 295ZM493 298L492 300L498 300L493 298Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M407.5 293L410 293.5L407.5 294L407.5 293Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M414.5 293L417 293.5L414.5 294L414.5 293Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M460.5 294L466 294L466 301.5L464.5 304L464 302.5L465 299.5L463 299.5L464 297.5L462 296.5L462.5 295Q459.5 295.5 460.5 294Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M328.5 296L329 301.5L328 301.5L328.5 296Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M386.5 296L387.5 298L386.5 296Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M401.5 296L398.5 300L401.5 296Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M411.5 297L414 298.5L412.5 299L410.5 299L409 298.5L411.5 297Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M467.5 297L468 300.5L467 300.5L467.5 297Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M395.5 298Q398 299 397 303.5Q395.3 307.8 387.5 306L387.5 305Q394.3 306.8 396 303.5L395.5 298Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M507.5 301L508 304.5L506 303.5L507.5 301Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M406.5 305Q411.5 307.5 406.5 310L407 308.5L406.5 305Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M328.5 307L329 316.5L328 316.5L328.5 307Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M490.5 307Q491.8 309.3 496.5 308L497.5 307L501 310.5L500.5 316L499.5 310L499 315L497 315.5Q499.8 317.3 495.5 319L492 318.5L497 316.5L495.5 316L493.5 317L491 316.5L491.5 315L489.5 316L489 314.5L490 311.5Q490.7 308.9 488 310L487.5 313L487 310.5L490.5 307ZM491 309L491 310L495 310L491 309Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M373.5 308L367.5 315L373.5 308Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M290.5 309L296 309.5L290.5 310L290.5 309Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M417.5 309L421 310.5L419.5 310Q416.5 310.5 417.5 309Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M424.5 309L428 310.5L426.5 310Q423.5 310.5 424.5 309Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M381.5 311L372.5 321L381.5 311Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M411.5 312L413 316.5L411.5 319L411 317.5L411 315.5L411.5 312Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M416.5 314L419 314.5L416 315L417 320.5L416 320.5L415 315.5L416.5 314Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M280.5 316L281 320.5L280 320.5L280.5 316Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M363.5 317L364 319L337 318.5L362.5 318L363.5 317Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M478.5 317Q482 318 481 323.5L480 323.5Q480.6 318 478.5 317Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M308.5 318L324 318.5L308.5 319L308.5 318Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M296.5 319L297 323.5L296 323.5L296.5 319Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M424.5 320L426 320.5L420.5 325L424.5 320Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M172.5 322L174.5 325L172.5 322Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M415.5 322L414.5 324L415.5 322Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M525.5 323L526 326.5L524 327.5L525.5 323Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M413.5 325L415 327.5L413 326.5L413.5 325Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M501.5 325L505 325.5L501.5 326L501.5 325Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M202.5 326L197.5 332L202.5 326Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M546.5 327L551 327.5L550 331L546 331Q547.7 336.2 544 335L542 329L544.5 330L546.5 327Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M489.5 328L496 328.5L489.5 329L489.5 328Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M517.5 328L523 328.5L517.5 329L517.5 328Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M191.5 329L187.5 334L191.5 329Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M416.5 329L421 330.5L417.5 331L416.5 329Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M554 332L557 333.5L555.5 336L554 332Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M14.5 494L15.5 496L14.5 494Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M798.5 498L799 502.5L798 502.5L798.5 498Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M146.5 114L699.5 114Q720.2 118.8 731 133.5L737 144.5L736.5 146L738 146.5L737 149L739 149.5L738 153.5L739 153.5L739.5 152L740 153.5L739 154.5L739 387.5L737 395.5L737.5 397L736 396.5L732 405.5L719.5 418Q711.6 424.6 699.5 427L597.5 427L535.5 396L530.5 395L525.5 391Q514.3 388.3 506.5 382L501.5 381L494.5 376L489.5 375L479.5 369L446.5 354L275.5 354Q268.3 352.2 265 346.5L263 341.5L263 268.5L262 266L253.5 264L245.5 259L240.5 258Q233.9 252.1 223.5 250L220.5 247L219 247.5L229 232.5L222 228.5L221.5 227L219.5 228L217.5 226L214 229.5L206.5 238L202.5 240L153.5 217Q152.3 219.3 151 216.5L150 205.5L152 199.5L152 194.5L158 183.5L153 177L147 181.5L138 195.5L136 208.5L134.5 210L129.5 206L117.5 202L107 195.5L107 155.5L109 145.5L113 137.5L112.5 136Q113.7 138.3 115 135.5L114 133.5Q116 135.2 118 131.5L122.5 126L125 124.5L124.5 123L126.5 123L128 122.5L127.5 121L129.5 121L131 120.5L130.5 119L132 119.5Q131.2 116.9 134.5 118L146.5 114ZM416 144L414 145L411 149L412 153L412 155Q411 157 414 156L416 156L429 156L430 157L434 154L433 152L435 152L435 149L430 144L416 144ZM417 157L417 158L428 158L417 157ZM275 190L272 191Q266 193 265 200L265 342L267 345Q270 349 277 351L433 351L435 350L427 348Q421 342 411 340L407 336L398 334L394 330L386 328L375 322L373 322L376 318L384 320L391 325L397 326L406 332L416 335L421 339L429 341L430 344L437 347L451 348L452 349L531 350L452 350L452 351L570 351L574 348L576 349L582 340L582 316L581 315L581 201L579 197Q576 192 570 190L275 190ZM617 190L613 197L610 209Q611 230 621 242Q631 255 652 259Q664 261 672 258L690 249Q701 240 705 223L704 221L695 220Q694 226 690 231Q681 241 666 245L650 244L636 236Q627 228 624 215L624 200L625 194L617 190ZM650 194L647 197L647 199L655 207Q653 214 647 217L649 220L652 220L660 212L669 220Q672 221 673 219L673 216L666 208L665 207L673 199Q673 195 671 194L661 203L653 195L650 194ZM184 198L168 213Q167 216 170 217L172 217L181 210L186 204L200 217Q204 217 204 215L203 212L189 198L184 198ZM616 313L612 321L610 329L611 346Q615 358 622 367Q633 379 653 383Q677 384 690 373L699 363L705 348L706 341L696 340L693 350L678 364L668 368Q661 366 660 369L646 366L638 361L629 352L624 337L625 320L626 317L616 313ZM657 314L652 316Q645 320 643 328L643 336L647 343L656 348L665 348L672 344L677 336L677 327L673 319L664 314L657 314Z"
+        android:fillColor="#5A5A5B"
+        android:strokeColor="#5A5A5B"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M430.5 146L432.5 149L430.5 146Z"
+        android:fillColor="#5A5A5B"
+        android:strokeColor="#5A5A5B"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M740.5 158L741 384.5L740 384.5L740.5 158Z"
+        android:fillColor="#5A5A5B"
+        android:strokeColor="#5A5A5B"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M104.5 160L105 382.5L104 382.5L104.5 160Z"
+        android:fillColor="#5A5A5B"
+        android:strokeColor="#5A5A5B"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M275.5 192L569 192.5L275.5 193L275.5 192Z"
+        android:fillColor="#5A5A5B"
+        android:strokeColor="#5A5A5B"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M272.5 193L274 193.5L267.5 199L272.5 193Z"
+        android:fillColor="#5A5A5B"
+        android:strokeColor="#5A5A5B"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M573.5 194L577.5 199L573.5 194Z"
+        android:fillColor="#5A5A5B"
+        android:strokeColor="#5A5A5B"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M267.5 249L268 263.5L269 267.5L271.5 270L281.5 272L286.5 276L295 279.5L296 287L290 286.5L294 285.5L287.5 280L280.5 279L275.5 275L269.5 274L267.5 272L266 272.5L267.5 249Z"
+        android:fillColor="#5A5A5B"
+        android:strokeColor="#5A5A5B"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M178.5 284L192.5 284L203.5 287Q213.8 291.2 221 298.5Q235.5 311 235 338.5L232 349.5L229.5 352L225.5 350L223.5 350L219 347.5L220 327.5Q216.6 312.4 205.5 305L192.5 299L178.5 299Q163.4 302.4 156 313.5L153.5 317L154 315.5L154 313.5L159 307.5L152.5 300L142.5 311L143 309.5Q147.3 298.8 156.5 293Q165.4 286.4 178.5 284Z"
+        android:fillColor="#5A5A5B"
+        android:strokeColor="#5A5A5B"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M305 286L310 286Q309 289 312 288L312 290.5Q312.8 292.8 316.5 292L320.5 291L326 294.5Q328.8 296.2 328 301.5L325.5 300Q320.2 293.8 309.5 293L305 288.5L305 286Z"
+        android:fillColor="#5A5A5B"
+        android:strokeColor="#5A5A5B"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M280.5 290L281 293.5L280 293.5L280.5 290Z"
+        android:fillColor="#5A5A5B"
+        android:strokeColor="#5A5A5B"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M304.5 290L305 303.5L304 303.5L304.5 290Z"
+        android:fillColor="#5A5A5B"
+        android:strokeColor="#5A5A5B"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M294.5 294L297 294.5L297 304.5L296 304.5L296 295.5L294.5 295L294.5 294Z"
+        android:fillColor="#5A5A5B"
+        android:strokeColor="#5A5A5B"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M280.5 295L281 310.5L280 310.5L280.5 295Z"
+        android:fillColor="#5A5A5B"
+        android:strokeColor="#5A5A5B"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M288.5 295L289 307.5L288 307.5L288.5 295Z"
+        android:fillColor="#5A5A5B"
+        android:strokeColor="#5A5A5B"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M296.5 306L297 308.5L296 308.5L296.5 306Z"
+        android:fillColor="#5A5A5B"
+        android:strokeColor="#5A5A5B"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M289.5 316L289 317.5L288.5 321L288 317.5L289.5 316Z"
+        android:fillColor="#5A5A5B"
+        android:strokeColor="#5A5A5B"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M659.5 320Q666.1 320.4 669 324.5Q671.6 327.4 671 333.5L666.5 340Q664.2 342.7 658.5 342L651 337.5L649 329.5L652.5 323L659.5 320Z"
+        android:fillColor="#5A5A5B"
+        android:strokeColor="#5A5A5B"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M198.5 322L195.5 326L198.5 322Z"
+        android:fillColor="#5A5A5B"
+        android:strokeColor="#5A5A5B"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M282.5 323L286 323.5L282.5 324L282.5 323Z"
+        android:fillColor="#5A5A5B"
+        android:strokeColor="#5A5A5B"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M296.5 324L297.5 326L296.5 324Z"
+        android:fillColor="#5A5A5B"
+        android:strokeColor="#5A5A5B"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M365.5 325L368 325.5L365.5 326L365.5 325Z"
+        android:fillColor="#5A5A5B"
+        android:strokeColor="#5A5A5B"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M168.5 326L176.5 335L168.5 326Z"
+        android:fillColor="#5A5A5B"
+        android:strokeColor="#5A5A5B"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M192.5 336L190.5 339L192.5 336Z"
+        android:fillColor="#5A5A5B"
+        android:strokeColor="#5A5A5B"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M184.5 340L187 340.5L184.5 341L184.5 340Z"
+        android:fillColor="#5A5A5B"
+        android:strokeColor="#5A5A5B"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M116.5 412L121.5 418L116.5 412Z"
+        android:fillColor="#5A5A5B"
+        android:strokeColor="#5A5A5B"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M728.5 412L723.5 418L728.5 412Z"
+        android:fillColor="#5A5A5B"
+        android:strokeColor="#5A5A5B"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M148.5 429L151 429.5L148.5 430L148.5 429Z"
+        android:fillColor="#5A5A5B"
+        android:strokeColor="#5A5A5B"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M694.5 429L697 429.5L694.5 430L694.5 429Z"
+        android:fillColor="#5A5A5B"
+        android:strokeColor="#5A5A5B"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M847.5 1L846.5 3L845 2.5L847.5 1Z"
+        android:fillColor="#B9B9BA"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B9B9BA"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M86.5 2L89 2.5L86.5 3L86.5 2Z"
+        android:fillColor="#B9B9BA"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B9B9BA"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M862.5 2L861.5 4L860 3.5L862.5 2Z"
+        android:fillColor="#B9B9BA"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B9B9BA"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M585.5 4L602 4.5L585.5 5L585.5 4Z"
+        android:fillColor="#B9B9BA"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B9B9BA"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M603.5 4L610 4.5L603.5 5L603.5 4Z"
+        android:fillColor="#B9B9BA"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B9B9BA"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M628.5 4L632 4.5L628.5 5L628.5 4Z"
+        android:fillColor="#B9B9BA"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B9B9BA"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M634.5 4L652 4.5L634.5 5L634.5 4Z"
+        android:fillColor="#B9B9BA"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B9B9BA"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M653.5 4L656 4.5L653.5 5L653.5 4Z"
+        android:fillColor="#B9B9BA"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B9B9BA"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M657.5 4L665 4.5L657.5 5L657.5 4Z"
+        android:fillColor="#B9B9BA"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B9B9BA"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M684.5 4L701 4.5L684.5 5L684.5 4Z"
+        android:fillColor="#B9B9BA"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B9B9BA"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M702.5 4L716 4.5L702.5 5L702.5 4Z"
+        android:fillColor="#B9B9BA"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B9B9BA"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M937.5 17L938.5 19L937.5 17Z"
+        android:fillColor="#B9B9BA"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B9B9BA"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M949.5 21L950.5 23L949.5 21Z"
+        android:fillColor="#B9B9BA"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B9B9BA"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M971.5 30L974 31.5L972.5 31L971.5 30Z"
+        android:fillColor="#B9B9BA"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B9B9BA"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M979.5 33L983 35.5L981.5 35L979.5 33Z"
+        android:fillColor="#B9B9BA"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B9B9BA"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M989.5 38L990.5 40L989.5 38Z"
+        android:fillColor="#B9B9BA"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B9B9BA"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M1.5 101L2 104.5L1 104.5L1.5 101Z"
+        android:fillColor="#B9B9BA"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B9B9BA"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M150.5 111L696.5 111L699 112.5L427.5 113L425.5 112L422.5 113L420.5 113L414.5 112L413.5 113L154.5 113L150.5 112L150.5 111Z"
+        android:fillColor="#B9B9BA"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B9B9BA"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M701 112Q704 111 703 114Q700 115 701 112Z"
+        android:fillColor="#B9B9BA"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B9B9BA"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M800.5 115L801 433.5L799.5 438L799 427.5L800 426.5L800 370.5L800 368.5L800 313.5L799 312.5L800 311.5L800 208.5L800 206.5Q801.3 201.8 799 200.5L800 197.5L800 195.5L799 192.5L800 191.5L800 170.5L799 168.5L800 165.5L800 163.5L800 137.5L799 136.5L800 134.5L800 132.5L800.5 115Z"
+        android:fillColor="#B9B9BA"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B9B9BA"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M725.5 124L729.5 129L725.5 124Z"
+        android:fillColor="#B9B9BA"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B9B9BA"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M732.5 132L733.5 134L732.5 132Z"
+        android:fillColor="#B9B9BA"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B9B9BA"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M742.5 159L743 382.5L741.5 385L741 383.5L742 382.5L742.5 159Z"
+        android:fillColor="#B9B9BA"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B9B9BA"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M653.5 204L654.5 206L653.5 204Z"
+        android:fillColor="#B9B9BA"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B9B9BA"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M173.5 207L172.5 209L173.5 207Z"
+        android:fillColor="#B9B9BA"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B9B9BA"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M195.5 212L196.5 214L195.5 212Z"
+        android:fillColor="#B9B9BA"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B9B9BA"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M418.5 218L419 220.5L418 220.5L418.5 218Z"
+        android:fillColor="#B9B9BA"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B9B9BA"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M447.5 218L448 221.5L447 221.5L447.5 218Z"
+        android:fillColor="#B9B9BA"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B9B9BA"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M300.5 221L301.5 223L300.5 221Z"
+        android:fillColor="#B9B9BA"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B9B9BA"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M522.5 222L523 233.5L522 233.5L522.5 222Z"
+        android:fillColor="#B9B9BA"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B9B9BA"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M511.5 231L512 234.5L511 234.5L511.5 231Z"
+        android:fillColor="#B9B9BA"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B9B9BA"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M503.5 242L508 242.5L503.5 243L503.5 242Z"
+        android:fillColor="#B9B9BA"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B9B9BA"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M513.5 242L517 242.5L513.5 243L513.5 242Z"
+        android:fillColor="#B9B9BA"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B9B9BA"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M386.5 255L387.5 257L386.5 255Z"
+        android:fillColor="#B9B9BA"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B9B9BA"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M456.5 264L457 270.5L456 270.5L456.5 264Z"
+        android:fillColor="#B9B9BA"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B9B9BA"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M509.5 293L510 295.5L509 295.5L509.5 293Z"
+        android:fillColor="#B9B9BA"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B9B9BA"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M420.5 299L421 303.5L420 303.5L420.5 299Z"
+        android:fillColor="#B9B9BA"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B9B9BA"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M303.5 304L304 307.5L303 307.5L303.5 304Z"
+        android:fillColor="#B9B9BA"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B9B9BA"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M410.5 307L414 307.5L410.5 308L410.5 307Z"
+        android:fillColor="#B9B9BA"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B9B9BA"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M471.5 327L474 327.5L471.5 328L471.5 327Z"
+        android:fillColor="#B9B9BA"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B9B9BA"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M490.5 327L495 327.5L490.5 328L490.5 327Z"
+        android:fillColor="#B9B9BA"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B9B9BA"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M517.5 327L521 327.5L517.5 328L517.5 327Z"
+        android:fillColor="#B9B9BA"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B9B9BA"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M2.5 444L3 450.5L2 450.5L2.5 444Z"
+        android:fillColor="#B9B9BA"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B9B9BA"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M3.5 457L4 460.5L3 460.5L3.5 457Z"
+        android:fillColor="#B9B9BA"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B9B9BA"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M795.5 458L797 463.5L797 483.5L796 483.5L795.5 476L795 479L10 479.5L11 481.5L10 481.5Q5.2 473.8 4 462.5L6.5 459L17.5 459L18.5 460L20.5 459L22.5 460L24.5 460L27.5 459L31.5 460L33.5 459L38.5 460L43.5 459L47.5 460L795 460L795.5 458Z"
+        android:fillColor="#B9B9BA"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B9B9BA"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M801.5 458L802.5 462L803 460L838.5 460L839 461.5Q848.8 471.8 851 489.5L839 500.5Q838.8 505.3 835.5 507L801.5 507L801 504.5L800 504.5L799.5 508L799 503.5Q802.5 502 800 500.5L801.5 498L837.5 498L841 495.5L840 485.5L836.5 479L802.5 479L802 482.5L801 482.5L801.5 458Z"
+        android:fillColor="#B9B9BA"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B9B9BA"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M798.5 478L799 481.5L798 481.5L798.5 478Z"
+        android:fillColor="#B9B9BA"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B9B9BA"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M795.5 495L796 497.5L795 497.5L795.5 495Z"
+        android:fillColor="#B9B9BA"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B9B9BA"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M589.5 499L794.5 499L795 499.5L795 507.5L793 508.5L793.5 507L25.5 507L21 503.5L20 501.5L21.5 502L588.5 500L589.5 499Z"
+        android:fillColor="#B9B9BA"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B9B9BA"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M797.5 501L798 503.5L797 503.5L797.5 501Z"
+        android:fillColor="#B9B9BA"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B9B9BA"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M25.5 508L26.5 510L25.5 508Z"
+        android:fillColor="#B9B9BA"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B9B9BA"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M798.5 513L799 515.5L798 515.5L798.5 513Z"
+        android:fillColor="#B9B9BA"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B9B9BA"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M30.5 514L31.5 516L30.5 514Z"
+        android:fillColor="#B9B9BA"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B9B9BA"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M571.5 0L742.5 0L744 1.5L743.5 3L743 1L571.5 1L571.5 0Z"
+        android:fillColor="#CBCBCB"
+        android:fillAlpha="0.5333333"
+        android:strokeColor="#CBCBCB"
+        android:strokeAlpha="0.5333333"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M90.5 1L94 1.5L90.5 2L90.5 1Z"
+        android:fillColor="#CBCBCB"
+        android:fillAlpha="0.5333333"
+        android:strokeColor="#CBCBCB"
+        android:strokeAlpha="0.5333333"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M848.5 1L855 1.5L848.5 2L848.5 1Z"
+        android:fillColor="#CBCBCB"
+        android:fillAlpha="0.5333333"
+        android:strokeColor="#CBCBCB"
+        android:strokeAlpha="0.5333333"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M83.5 2L86 2.5L83.5 3L83.5 2Z"
+        android:fillColor="#CBCBCB"
+        android:fillAlpha="0.5333333"
+        android:strokeColor="#CBCBCB"
+        android:strokeAlpha="0.5333333"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M863.5 2L867 2.5L863.5 3L863.5 2Z"
+        android:fillColor="#CBCBCB"
+        android:fillAlpha="0.5333333"
+        android:strokeColor="#CBCBCB"
+        android:strokeAlpha="0.5333333"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M872.5 3L876 3.5L872.5 4L872.5 3Z"
+        android:fillColor="#CBCBCB"
+        android:fillAlpha="0.5333333"
+        android:strokeColor="#CBCBCB"
+        android:strokeAlpha="0.5333333"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M880.5 4L883 4.5L880.5 5L880.5 4Z"
+        android:fillColor="#CBCBCB"
+        android:fillAlpha="0.5333333"
+        android:strokeColor="#CBCBCB"
+        android:strokeAlpha="0.5333333"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M990.5 38L991.5 40L990.5 38Z"
+        android:fillColor="#CBCBCB"
+        android:fillAlpha="0.5333333"
+        android:strokeColor="#CBCBCB"
+        android:strokeAlpha="0.5333333"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M1.5 82L2 84.5L1 84.5L1.5 82Z"
+        android:fillColor="#CBCBCB"
+        android:fillAlpha="0.5333333"
+        android:strokeColor="#CBCBCB"
+        android:strokeAlpha="0.5333333"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M0.5 98L1 100.5L0 100.5L0.5 98Z"
+        android:fillColor="#CBCBCB"
+        android:fillAlpha="0.5333333"
+        android:strokeColor="#CBCBCB"
+        android:strokeAlpha="0.5333333"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M0.5 102L1 445.5L0 445.5L0.5 102Z"
+        android:fillColor="#CBCBCB"
+        android:fillAlpha="0.5333333"
+        android:strokeColor="#CBCBCB"
+        android:strokeAlpha="0.5333333"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M1.5 459L2 461.5L1 461.5L1.5 459Z"
+        android:fillColor="#CBCBCB"
+        android:fillAlpha="0.5333333"
+        android:strokeColor="#CBCBCB"
+        android:strokeAlpha="0.5333333"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M19.5 503L20.5 505L19.5 503Z"
+        android:fillColor="#CBCBCB"
+        android:fillAlpha="0.5333333"
+        android:strokeColor="#CBCBCB"
+        android:strokeAlpha="0.5333333"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M23.5 508L31.5 517L23.5 508Z"
+        android:fillColor="#CBCBCB"
+        android:fillAlpha="0.5333333"
+        android:strokeColor="#CBCBCB"
+        android:strokeAlpha="0.5333333"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M587.5 2L594 2.5L587.5 3L587.5 2Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M595.5 2L714 2.5L595.5 3L595.5 2Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M715.5 2L729 2.5L715.5 3L715.5 2Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M748.5 3L749.5 4L791.5 4L793 3.5L794 5.5L791.5 6L743.5 6L743 4L748.5 3Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M80.5 4L568.5 4L570 5.5L78.5 6L78.5 5L80.5 4Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M796 4L856.5 4L857.5 5L868.5 5L869.5 6L878.5 6L892.5 9L898.5 9L935.5 18L964.5 28L983 36.5L981.5 37L964.5 29L944.5 22L919.5 15L894.5 10L872.5 8L871.5 7L857.5 7L856.5 6L796 6L796 4Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M576.5 5L586 5.5L576.5 6L576.5 5Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M609.5 5L623 5.5L609.5 6L609.5 5Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M667.5 5L670 5.5L667.5 6L667.5 5Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M681.5 5L684 5.5L681.5 6L681.5 5Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M717.5 5L727 5.5L717.5 6L717.5 5Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M729.5 5L738 5.5L729.5 6L729.5 5Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M796.5 11L797 14.5L795 15.5L796.5 11Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M49.5 14L51 14.5Q34.9 22.4 24 35.5L17.5 44L19 41.5L34.5 24L49.5 14Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M796.5 21Q799 22 798 26.5L796 25.5L796.5 21Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M797.5 35Q799.8 37.8 799 43.5L797 42.5L797.5 35Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M16.5 45L16 46.5L9.5 58L10 56.5L16.5 45Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M994.5 48L995 50.5L994 50.5L994.5 48Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M995.5 52L996 54.5L995 54.5L995.5 52Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M799.5 55L800 61.5L799 62.5L798.5 74L798 60.5L799.5 55Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M8.5 61L7.5 63L8.5 61Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M4.5 70Q6.8 69.3 6 71.5L4.5 70Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M3.5 74L4 76.5L3 76.5L3.5 74Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M800.5 77L801 86.5L800 86.5L800.5 77Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M3.5 79L4 81.5L3 81.5L3.5 79Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M795.5 88L797 91.5L797 106.5L798 107.5L798 431.5L799 432.5L799 454.5L798 454.5L798 432.5L797 431.5L797 111L709 111.5L712 113.5L710.5 113L698.5 110L145.5 110L134.5 113L134.5 112L136 111.5L4 111L3.5 113L3 92.5L5 89L794.5 89L795.5 88Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M803 89L837.5 89L935.5 113L942.5 116L960.5 110L963.5 112L995.5 119L997 120.5L997 155.5L998 159.5L997 160.5L996 180.5L993 189L987.5 190L960.5 204L959 203.5L955 215.5L937 248.5L931 264.5L928 280.5L926 284.5L927 289L925 288.5L925 281.5L933 254.5L942 236.5L938.5 231L918.5 221L879 190L879 425.5L895 446.5L901 459.5L906 476.5L908.5 479Q912.9 480.5 912 477.5L917 469.5L921 457.5L923 447.5L923 440.5L924 439.5L925.5 292L926 431.5L925 432.5L924 449.5L920 465.5L913 479.5L905.5 488L893.5 495L887.5 496L886 497.5L882 506.5L875 515L859.5 526L844.5 532L835.5 534L797.5 534L796.5 535L796 533.5L798.5 530L837.5 530L851 525Q849.8 522 853.5 523L869 509.5L874 501.5Q871.5 500 875 498.5L874 496.5Q883.5 497 890 494.5L888 494L888 485.5L887 484.5L888 481.5L885 468.5L878 453.5L860.5 430L854.5 433L845 425.5L845.5 129L869.5 151L871 151L869 159L873.5 161Q895.4 181.1 921.5 197L940.5 205L956 206L956.5 208L959 201.5L960.5 190L962.5 191Q972.8 189.3 978 182.5L977.5 181L995 178L995 170.5L996 169.5L996 141.5L995 141.5L994.5 143L979.5 138L928.5 125L925.5 123L907.5 128L902.5 126L882.5 123L838.5 111L803 111L802.5 113L801 109.5L801 90.5L803 90.5L803 89Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M131.5 117L133 117.5L129.5 119L129.5 118L131.5 117Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M117.5 127L116.5 129L117.5 127Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M102.5 154L103 159.5L102 159.5L102.5 154Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M101.5 161L102 340.5L101 340.5L101.5 161Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M652.5 196L659.5 204L652.5 196Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M667.5 196L661.5 203L667.5 196Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M186.5 203L188.5 206L186.5 203Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M177.5 206L180 206.5Q179.3 208.8 175.5 208L175.5 207L177.5 206Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M192.5 207L196 207.5L192.5 208L192.5 207Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M197.5 207L199.5 210L197.5 207Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M654.5 209L648.5 216L654.5 209Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M513.5 210L559 210.5L513.5 211L513.5 210Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M176.5 211L174.5 214L176.5 211Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M307.5 211L310 211.5L307.5 212L307.5 211Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M545.5 213L556 213.5L545.5 214L545.5 213Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M300.5 214L303 214.5L300.5 215L300.5 214Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M345.5 217L346 222.5L345 222.5L345.5 217Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M390.5 218L391 221.5L390 221.5L390.5 218Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M564.5 218L565 234.5L564 234.5L564.5 218Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M336.5 220L337 223.5L336 223.5L336.5 220Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M364.5 221L365 226.5L364 226.5L364.5 221Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M410.5 224L409.5 226L410.5 224Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M328.5 226L329 228.5L328 228.5L328.5 226Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M310.5 231L311 234.5L310 234.5L310.5 231Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M544.5 232L545 236.5L544 236.5L544.5 232Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M499.5 237L500 239.5L499 239.5L499.5 237Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M504.5 239L525 239.5L504.5 240L504.5 239Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M527.5 239L537 239.5L527.5 240L527.5 239Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M545.5 239L554 239.5L545.5 240L545.5 239Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M383.5 248L382.5 250L383.5 248Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M419.5 248L420 258.5L419 258.5L419.5 248Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M424.5 251L425 269.5L424 269.5L424.5 251Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M404.5 254L403.5 256L404.5 254Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M451.5 256L452 258.5L451 258.5L451.5 256Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M406.5 257L410 257.5L406.5 258L406.5 257Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M411.5 257L412.5 259L411.5 257Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M431.5 265L432 271.5L431 271.5L431.5 265Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M283.5 281L286 281.5L282.5 283L283.5 281Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M287.5 281L288 286.5L287 286.5L287.5 281Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M297.5 281L298.5 283L299.5 281L305 284.5L302.5 289L298 287L297.5 281Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M461.5 283L469 283.5L461.5 284L461.5 283Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M471.5 283L474 283.5L471.5 284L471.5 283Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M491.5 283L499 283.5L491.5 284L491.5 283Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M306.5 284L312 284.5L306.5 285L306.5 284Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M319.5 284L322 284.5L319.5 285L319.5 284Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M323.5 284L326 284.5L323.5 285L323.5 284Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M336 284L344 284.5L342.5 286L336 286L336 284Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M352.5 284Q359.2 282.3 361 285.5L358.5 286L351 285.5L352.5 284Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M313.5 286L314 289.5L313 289.5L313.5 286Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M334.5 286L334 287.5L333.5 290L333 287.5L334.5 286Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M344.5 286Q347.5 287.5 344.5 289L344.5 286Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M349.5 287L350 289.5L349 289.5L349.5 287Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M289.5 288L296 288.5L289.5 289L289.5 288Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M462.5 291L465 291.5L462.5 292L462.5 291Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M514.5 291L517 291.5L514.5 292L514.5 291Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M927.5 293L928 299.5L927 299.5L927.5 293Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M414.5 294L417 294.5L414.5 295L414.5 294Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M501.5 295L502 297.5L501 297.5L501.5 295Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M329 297L339.5 299L345.5 304L356.5 307Q359.1 311.9 366 312.5L363.5 317L360 316.5L360.5 315L352.5 313L348.5 309L339.5 307L329 300.5L329 297Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M377.5 300L379 305.5L377 304.5L377.5 300Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M491.5 300L492.5 302L491.5 300Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M494.5 301L498 301.5L494.5 302L494.5 301Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M374.5 306L377 306.5L374.5 307L374.5 306Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M289.5 310L297 310.5L289.5 311L289.5 310Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M423.5 311L425 313.5L423 312.5L423.5 311Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M329.5 312L330 316.5L329 316.5L329.5 312Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M371.5 314Q376.3 316.3 372 318.5Q373.1 321.8 370.5 321L366 324.5L369 320L366.5 319L364.5 320L367.5 316L371.5 314Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M304.5 319L326 319.5L304.5 320L304.5 319Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M658.5 319L662 319.5L658.5 320L658.5 319Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M671.5 319L672.5 321L671.5 319Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M424.5 321L423.5 323L424.5 321Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M200.5 322L202 325.5L187 338Q188.1 341.3 184 340Q185.1 337.3 182.5 338L176.5 332Q174.8 334.8 173 330.5L174 329.5L170 325.5Q169.2 322.9 172.5 324L184.5 336L186.5 336L199 324.5L198.5 323L200 323.5L200.5 322Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M297.5 323L298.5 324L322 324.5L298.5 325L297.5 323Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M328.5 324L332 324.5L328.5 325L328.5 324Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M355.5 324L359 324.5L355.5 325L355.5 324Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M361.5 324L364 324.5L361.5 325L361.5 324Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M417.5 329L421 329.5L417.5 330L417.5 329Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M647.5 341L649.5 344L647.5 341Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M102.5 385L103 389.5L102 389.5L102.5 385Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M103.5 391L106 399.5L105 399.5Q102 396.1 103.5 391Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M106.5 401L109 405.5L107 404.5L106.5 401Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M109.5 407L113 411.5L110 409.5L109.5 407Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M731.5 410L730 412.5L726.5 417L729 413.5L731.5 410Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M113.5 413L125 423.5L122.5 422L113.5 413Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M723 418L725 418.5L722 423Q714.9 428.7 703.5 431L703.5 430L713 426.5L712.5 425L714.5 426L714.5 424L716.5 425L720 422.5L719.5 421Q721.2 423.7 723 419.5L723 418Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M126.5 424L130 426.5L128.5 426L126.5 424Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M142.5 431L145 431.5L142.5 432L142.5 431Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M698.5 431L702 431.5L698.5 432L698.5 431Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M148.5 432L696 432.5L148.5 433L148.5 432Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M796.5 500L797 512.5L795.5 517L795 513.5L796 512.5L796.5 500Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M794.5 523L796 526.5L795 526.5L794.5 523Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M793.5 529L794 530.5L793 534L66.5 534L65.5 535L58 531.5L58.5 530L791.5 530L793 530.5L793.5 529Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M152.5 113L694 113.5L152.5 114L152.5 113Z"
+        android:fillColor="#78787D"
+        android:strokeColor="#78787D"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M652.5 195L659.5 203L652.5 195Z"
+        android:fillColor="#78787D"
+        android:strokeColor="#78787D"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M266.5 202L268 203.5L268.5 225L269.5 212L272 213L272 204.5L273.5 203L274.5 204L333.5 204L336 205Q337.7 209.1 333.5 208L328.5 207L325 208Q326.5 211.8 323.5 211L317 213L319 216.5L320 230.5L322.5 234L324 234L324 236Q327.1 235.3 326.5 238L337.5 238L344 232.5L344 235Q346.7 233.9 346 236.5L348 236.5Q347.2 239.1 350.5 238L355.5 239L359.5 238L366 233L366.5 231L367 234Q373.1 235.8 375 232.5Q376 227 372.5 226L367 227L366.5 230L366 220.5L367 220.5L368.5 223Q373.8 224.3 375 221.5Q376 216 372.5 215L368 214.5L372.5 214L375 215L376 221.5L377.5 223L381.5 223L386.5 219L383.5 223L377.5 224Q375.5 220 373.5 224L372 224.5L376 227.5Q374.7 231.7 379.5 230L379.5 231L376 232.5L375 236.5L377.5 239L394.5 239L397 238Q398.5 232.6 395.5 231L390 230.5L397 223.5L397 214.5L393 212.5L395.5 212L398 214.5L398 223.5L397 226L394 227.5L393 229.5L397.5 232Q398.3 229.3 402.5 230L402.5 231Q398.8 230.3 398 232.5Q396.8 237.8 399.5 239L417.5 239L419 237.5L420 234.5L419 232.5L421 233.5Q421.8 239.3 417.5 240L399.5 240L397.5 238L395.5 240L386.5 240L385.5 241L382.5 240L380.5 240L376.5 241L374.5 241Q372.3 240.3 373 242.5L374.5 245L377 244L376 247.5L377 250.5L374 253.5L375 254.5Q375.8 256.8 373.5 256L372 258.5L375 257.5Q370 259 371 265L377.5 265L384 258.5Q382.9 255.2 385.5 256Q388.3 257.3 386 258.5L387 260.5L386 263L383 264.5L385.5 265L387 264.5Q386.1 267.5 390.5 266L389.5 263Q392.1 262.3 391 265L393.5 265L399.5 268L401 265L404 266.5L402 269.5Q404.8 270.6 404 274L409.5 275L413 272.5L413.5 268L414 270L418 271.5L419.5 275L425.5 274L430.5 275L433 272.5L433.5 259L434 268.5L437 274L440.5 272L441.5 273L449 273Q447.8 276 451.5 275L456 282.5L455 284.5L459.5 281L475.5 281L478 283.5L478.5 289L484.5 283L487 283L487 285L483 285L483 287Q480.3 285.9 481 288.5L478 291.5L478 306.5L479 306.5L479.5 305L480 306.5L478 308.5L478 317.5Q481.1 319 480.5 324Q481.8 321.8 483 324.5L483 326L487 326Q485.9 328.7 488.5 328Q490 330.5 495.5 329L501 328L501 326L505 326L505 324.5L508 323Q506.7 317.7 510 318.5L510 308.5Q506.7 307.3 508 301.5L509 301.5L509 306.5L512 310.5L512 316.5Q509.2 318.5 510 323L508 323.5L511.5 326L517 317.5L519 310.5L523 305.5L526.5 297L527 301Q523.7 299.7 525 304.5L520 311.5L516 319.5L516 323Q513.3 321.9 514 324.5L514 326.5Q513.2 329.1 516.5 328Q517.8 330.2 522.5 329L526 326.5L526 323L528 323Q526.8 317.7 530 318.5L530 315.5L533.5 310L534 312.5L531 316.5L532 317.5L530.5 320L532 320.5L530.5 321L529 320.5L530 324Q526.7 322.7 528 327.5L530 326.5Q529.2 323.5 533 325L533 321L534.5 321L534 319.5Q533.1 316.5 537.5 318L539 321L541.5 320L543.5 323L546 323.5L545.5 325Q548.1 325.7 547 323L549 323L550.5 326L551 323L554 323Q552.9 325.7 555.5 325L558.5 324L558.5 325Q555.9 324.3 557 327L564.5 329L566.5 331L569 330L569.5 328L573 329Q572 326 575 327L575 343L556.5 343L557.5 345L559.5 345L564 346.5L499 347.5L570.5 348L576.5 345L574.5 348L569.5 351L451.5 351L451.5 350L531 349.5L451.5 349L450.5 348L436.5 347L430 343.5L428.5 341L420.5 339L413.5 334L405.5 332L396.5 326L390.5 325L385.5 321L376 317.5L387.5 306Q395.3 307.7 397 303.5Q398 299 395.5 298L388.5 298L385 296L385 294.5L368.5 278L324.5 278Q323.2 275.7 318.5 277L316.5 277L309.5 278Q307.8 275.3 301.5 277L296 279L295.5 281L293.5 278L290.5 278L281.5 272L271.5 270L269 267.5L267.5 249L266.5 263L266.5 202ZM283 210L279 213L279 219L283 227L310 227L312 226L311 223L312 221L312 211L310 210L283 210ZM367 224L368 226L371 225L367 224ZM284 228L282 229L280 233L285 234L292 233L294 233L295 234L304 234L303 236L305 238Q309 239 311 237L312 237L312 229L310 228L284 228ZM367 237L367 239L369 238L371 239L373 239Q376 240 375 238L374 238L367 237ZM373 269Q370 270 371 274L378 275L380 275L382 274L384 275L386 274L397 274L398 275L401 274L401 269L373 269ZM415 271L414 274Q413 277 418 275L417 274Q418 270 415 271ZM461 282L458 285Q460 290 457 292L461 293Q467 292 467 294L467 328L476 328L477 327L477 283L475 282L461 282ZM408 293L407 294Q404 293 405 296Q399 295 398 300L398 305Q401 304 400 307L403 309L403 310L407 310L407 312L411 312L411 316L411 318Q409 325 414 323L413 327L416 328L418 331L423 330L428 324L427 322L430 320L430 313L428 312L427 309Q423 309 422 312L425 318L425 320L420 325L416 323L417 321L416 315L420 314Q422 315 421 311L418 309L421 307L421 297Q418 297 419 294L417 293L414 294L408 293ZM461 294Q460 296 463 295L462 297L464 298L463 300L465 299L465 302L466 302L466 294L461 294ZM547 327L545 330L542 329L544 335Q548 336 546 331L550 331L551 328L547 327ZM554 332L556 336L557 334L554 332Z"
+        android:fillColor="#78787D"
+        android:strokeColor="#78787D"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M578.5 202L579 340.5L578 340.5L578.5 202Z"
+        android:fillColor="#78787D"
+        android:strokeColor="#78787D"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M198.5 207L202.5 212L198.5 207Z"
+        android:fillColor="#78787D"
+        android:strokeColor="#78787D"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M655.5 207L654.5 209L655.5 207Z"
+        android:fillColor="#78787D"
+        android:strokeColor="#78787D"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M664.5 207L672.5 216L664.5 207Z"
+        android:fillColor="#78787D"
+        android:strokeColor="#78787D"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M180.5 208L176.5 213L180.5 208Z"
+        android:fillColor="#78787D"
+        android:strokeColor="#78787D"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M331.5 209L337.5 209L343 214.5L344 216.5L339 212.5Q339.8 209.9 336.5 211L331.5 210L331.5 209Z"
+        android:fillColor="#78787D"
+        android:strokeColor="#78787D"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M351.5 209L350.5 211L351.5 209Z"
+        android:fillColor="#78787D"
+        android:strokeColor="#78787D"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M357 209L360 210.5L357 211L357 209Z"
+        android:fillColor="#78787D"
+        android:strokeColor="#78787D"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M389.5 210L392 210.5L389.5 211L389.5 210Z"
+        android:fillColor="#78787D"
+        android:strokeColor="#78787D"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M361.5 211L367 217.5L366 217.5Q366.8 215.3 364.5 216L363 213Q359.8 214 361.5 211Z"
+        android:fillColor="#78787D"
+        android:strokeColor="#78787D"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M415.5 212Q420.5 211.5 421 215.5L421 223.5L415 229.5L418 230.5L412.5 231L413.5 229L415 229L415 227L417 227L417 225Q419.7 226.1 419 223.5Q421.8 221.8 420 215.5Q419.5 212.5 415.5 213L415.5 212Z"
+        android:fillColor="#78787D"
+        android:strokeColor="#78787D"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M445.5 212L444.5 214L445.5 212Z"
+        android:fillColor="#78787D"
+        android:strokeColor="#78787D"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M447.5 213L449 215.5L448 215.5L447.5 213Z"
+        android:fillColor="#78787D"
+        android:strokeColor="#78787D"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M168.5 215L169.5 217L168.5 215Z"
+        android:fillColor="#78787D"
+        android:strokeColor="#78787D"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M289.5 216L302 216.5L289.5 217L289.5 216Z"
+        android:fillColor="#78787D"
+        android:strokeColor="#78787D"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M455.5 217L458 217.5L455.5 218L455.5 217Z"
+        android:fillColor="#78787D"
+        android:strokeColor="#78787D"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M408.5 219L411 219.5L406.5 222L408.5 219Z"
+        android:fillColor="#78787D"
+        android:strokeColor="#78787D"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M453.5 219L454 220.5L452 221.5L453.5 219Z"
+        android:fillColor="#78787D"
+        android:strokeColor="#78787D"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M330 220Q332.7 218.9 332 221.5L332 223.5L333 227.5L333 229.5L332.5 231L332 229L330 228.5L330 220Z"
+        android:fillColor="#78787D"
+        android:strokeColor="#78787D"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M353.5 220L354 228.5L356 230.5L354 231L354 229Q351.3 230.1 352 227.5L353 222.5Q350.8 221.2 353.5 220Z"
+        android:fillColor="#78787D"
+        android:strokeColor="#78787D"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M460.5 221L461 223.5L460 223.5L460.5 221Z"
+        android:fillColor="#78787D"
+        android:strokeColor="#78787D"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M399.5 223L405 223.5L399.5 224L399.5 223Z"
+        android:fillColor="#78787D"
+        android:strokeColor="#78787D"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M409.5 223L408.5 225L409.5 223Z"
+        android:fillColor="#78787D"
+        android:strokeColor="#78787D"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M449.5 223L449 224.5L448.5 226L448 224.5L449.5 223Z"
+        android:fillColor="#78787D"
+        android:strokeColor="#78787D"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M384.5 225L381.5 229L384.5 225Z"
+        android:fillColor="#78787D"
+        android:strokeColor="#78787D"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M460.5 228L461 233.5L459.5 236L459 234.5L460.5 228Z"
+        android:fillColor="#78787D"
+        android:strokeColor="#78787D"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M433.5 232L436 232.5L433.5 233L433.5 232Z"
+        android:fillColor="#78787D"
+        android:strokeColor="#78787D"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M448.5 232L450 238.5L448 239.5L448.5 232Z"
+        android:fillColor="#78787D"
+        android:strokeColor="#78787D"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M451.5 232Q455.3 230.8 454 234.5L453 234.5Q453.8 232.3 451.5 233L451.5 232Z"
+        android:fillColor="#78787D"
+        android:strokeColor="#78787D"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M455.5 237L458 237.5L455.5 238L455.5 237Z"
+        android:fillColor="#78787D"
+        android:strokeColor="#78787D"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M561 239L564 239.5L562 240L561.5 242L561 239Z"
+        android:fillColor="#78787D"
+        android:strokeColor="#78787D"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M444.5 241L447 241.5L444.5 242L444.5 241Z"
+        android:fillColor="#78787D"
+        android:strokeColor="#78787D"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M384.5 245L389.5 245L390 247L391.5 247L395 250.5L395 252.5L399 257.5L399 260L402.5 258L411 259.5L401.5 260L399.5 262Q396 260.7 397 256L393 253.5Q393.8 249.8 391.5 249L388.5 247L384.5 246L381 248.5L384.5 245Z"
+        android:fillColor="#78787D"
+        android:strokeColor="#78787D"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M404.5 245L412 245.5L404.5 246L402 248.5L403.5 252L411 252.5L404.5 253L402 255.5L401.5 257L401 255.5L403 252.5L401 248.5L404.5 245Z"
+        android:fillColor="#78787D"
+        android:strokeColor="#78787D"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M429.5 245L434 248.5L433.5 251L431.5 247L429.5 245Z"
+        android:fillColor="#78787D"
+        android:strokeColor="#78787D"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M461.5 246L465 248.5L465 265.5L466 266.5Q463.5 268 465 273.5L462.5 276L460.5 277L456 276L456.5 274L461.5 275L464 274L464 248.5L462.5 247L461.5 246Z"
+        android:fillColor="#78787D"
+        android:strokeColor="#78787D"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M448.5 247L452 248.5L448 249L448.5 247Z"
+        android:fillColor="#78787D"
+        android:strokeColor="#78787D"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M435.5 248L438 248.5L435.5 249L435.5 248Z"
+        android:fillColor="#78787D"
+        android:strokeColor="#78787D"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M379.5 250L376.5 254L379.5 250Z"
+        android:fillColor="#78787D"
+        android:strokeColor="#78787D"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M453.5 250L456 250.5L453.5 251L453.5 250Z"
+        android:fillColor="#78787D"
+        android:strokeColor="#78787D"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M442.5 254L445 255.5L442 256L442.5 254Z"
+        android:fillColor="#78787D"
+        android:strokeColor="#78787D"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M453 257L456 257.5L454 258L451.5 262L445.5 265L441.5 265L441.5 264L448 263Q446.7 259.7 451.5 261L453 257Z"
+        android:fillColor="#78787D"
+        android:strokeColor="#78787D"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M417.5 261L418 263.5L417 263.5L417.5 261Z"
+        android:fillColor="#78787D"
+        android:strokeColor="#78787D"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M455.5 271L456 272.5L454 273.5L455.5 271Z"
+        android:fillColor="#78787D"
+        android:strokeColor="#78787D"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M489.5 281L499.5 281L507 286.5L504.5 285L498.5 282L489.5 282L488 282.5L489.5 281Z"
+        android:fillColor="#78787D"
+        android:strokeColor="#78787D"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M514.5 281L519 281.5Q513.8 281.3 511.5 284L512.5 282L514.5 281Z"
+        android:fillColor="#78787D"
+        android:strokeColor="#78787D"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M541.5 282L545 284.5L544.5 286L542.5 283L541.5 282Z"
+        android:fillColor="#78787D"
+        android:strokeColor="#78787D"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M280.5 283L281 285.5L280 285.5L280.5 283Z"
+        android:fillColor="#78787D"
+        android:strokeColor="#78787D"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M305.5 285L307 285.5L305 286L304.5 290L304 286.5L305.5 285Z"
+        android:fillColor="#78787D"
+        android:strokeColor="#78787D"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M510.5 285L512 291.5L510 292L508 288.5L510 288.5L510.5 285Z"
+        android:fillColor="#78787D"
+        android:strokeColor="#78787D"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M310 286Q313 285 312 288Q309 289 310 286Z"
+        android:fillColor="#78787D"
+        android:strokeColor="#78787D"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M318 286L328 286.5L326 287L326.5 289L328 288.5L329 292.5L327.5 297L324.5 293L318 291L318 286Z"
+        android:fillColor="#78787D"
+        android:strokeColor="#78787D"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M312.5 290L313.5 292L312.5 290Z"
+        android:fillColor="#78787D"
+        android:strokeColor="#78787D"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M491.5 295L493.5 299L498 299.5L492 300L491.5 295Z"
+        android:fillColor="#78787D"
+        android:strokeColor="#78787D"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M499.5 295L500 297.5L499 297.5L499.5 295Z"
+        android:fillColor="#78787D"
+        android:strokeColor="#78787D"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M511.5 295L511 296.5L510.5 300L510 296.5L511.5 295Z"
+        android:fillColor="#78787D"
+        android:strokeColor="#78787D"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M539.5 297L540 299.5L539 299.5L539.5 297Z"
+        android:fillColor="#78787D"
+        android:strokeColor="#78787D"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M411.5 298L414 299.5L414 301.5Q413.3 304.1 416 303L416 305Q412.9 304.3 413.5 307L408.5 307L405 305L405 303Q402.3 304.1 403 301.5L405.5 299Q410.2 300.3 411.5 298Z"
+        android:fillColor="#78787D"
+        android:strokeColor="#78787D"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M328.5 302L329 306.5L328 306.5L328.5 302Z"
+        android:fillColor="#78787D"
+        android:strokeColor="#78787D"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M537.5 302L538 304.5L537 304.5L537.5 302Z"
+        android:fillColor="#78787D"
+        android:strokeColor="#78787D"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M535.5 306L536 308.5L535 308.5L535.5 306Z"
+        android:fillColor="#78787D"
+        android:strokeColor="#78787D"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M490.5 309L495 309.5L490 310L489 312.5L489.5 314L488 314L488 310L490.5 309Z"
+        android:fillColor="#78787D"
+        android:strokeColor="#78787D"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M499.5 310L500 316L492 318Q493.1 315.3 490.5 316L490.5 315L494.5 317L499 315L499.5 310Z"
+        android:fillColor="#78787D"
+        android:strokeColor="#78787D"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M280.5 311L281 315.5L280 315.5L280.5 311Z"
+        android:fillColor="#78787D"
+        android:strokeColor="#78787D"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M366.5 315L364.5 318L366.5 315Z"
+        android:fillColor="#78787D"
+        android:strokeColor="#78787D"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M290.5 316L296 316.5L290.5 317L290.5 316Z"
+        android:fillColor="#78787D"
+        android:strokeColor="#78787D"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M305.5 318L308 318.5L305.5 319L305.5 318Z"
+        android:fillColor="#78787D"
+        android:strokeColor="#78787D"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M324.5 318L328 318.5L324.5 319L324.5 318Z"
+        android:fillColor="#78787D"
+        android:strokeColor="#78787D"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M371.5 321L370.5 323L371.5 321Z"
+        android:fillColor="#78787D"
+        android:strokeColor="#78787D"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M301.5 325L365 325.5L301.5 326L301.5 325Z"
+        android:fillColor="#78787D"
+        android:strokeColor="#78787D"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M194.5 326L192.5 329L194.5 326Z"
+        android:fillColor="#78787D"
+        android:strokeColor="#78787D"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M196.5 332L193.5 336L196.5 332Z"
+        android:fillColor="#78787D"
+        android:strokeColor="#78787D"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M647.5 342L648.5 344L647.5 342Z"
+        android:fillColor="#78787D"
+        android:strokeColor="#78787D"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M672.5 342L671.5 344L672.5 342Z"
+        android:fillColor="#78787D"
+        android:strokeColor="#78787D"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M131.5 119L130.5 121L118 130.5L109 145.5L107 155.5L107 195.5L117.5 202L129.5 206L134.5 210L136 208.5Q135.8 197.8 140 191.5L151.5 177Q153.8 176.3 153 178.5L158 184.5L152 194.5L150 211.5L152.5 218L154.5 218L166.5 224L171.5 225L179.5 230L189.5 233L202.5 240Q210 237 214 230.5L217.5 226L220.5 228L222 227.5L223.5 230L229 232.5L219 247.5Q221.2 245.7 223.5 250L230.5 252L253.5 264L262 266L263 268.5L263 341.5Q264.8 348.7 270.5 352L275.5 354L446.5 354L479.5 369L489.5 375L494.5 376L501.5 381L506.5 382Q514.3 388.3 525.5 391L530.5 395L535.5 396L597.5 427L699.5 427L713.5 422Q724.5 415.5 732 405.5L737 395.5L739 387.5L739 154.5L738 150.5L739 150.5L740 154.5L740 388.5Q735.4 409.4 720.5 420L707.5 427L693.5 430L151.5 430L140.5 428L130.5 424L114 409.5Q107.2 401.3 105 388.5L105 155.5Q109.2 134.7 123.5 124L131.5 119ZM179 284Q165 286 157 293Q148 299 143 309L144 310L153 300L159 308L154 314L155 316L156 314Q163 302 179 299L193 299L206 305Q217 312 220 328L219 348L224 350L226 350L230 352L232 350L235 339Q235 311 221 299Q214 291 204 287L193 284L179 284ZM171 321Q167 322 168 327L185 341L191 339L204 326L203 322L201 321L187 334L185 334L171 321Z"
+        android:fillColor="#292929"
+        android:strokeColor="#292929"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M415.5 144L429.5 144L435 148.5Q434.9 154.9 430.5 157L429 156.5L433 153.5L434 151.5L430.5 146L414.5 146L412 148.5L411.5 150L411 148.5L413.5 145L415.5 144Z"
+        android:fillColor="#292929"
+        android:strokeColor="#292929"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M411.5 153L414.5 157L412 156L411.5 153Z"
+        android:fillColor="#292929"
+        android:strokeColor="#292929"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M416.5 157L428 157.5L416.5 158L416.5 157Z"
+        android:fillColor="#292929"
+        android:strokeColor="#292929"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M274.5 190L569.5 190Q576 191.5 579 196.5L581 200.5L581 314.5L582 315.5L582 339.5L575.5 349L574 348.5L579 342.5L579 200.5L573.5 194L568.5 192L275.5 192Q269.4 193.4 267 198.5L266 200.5L266 272.5Q267.8 270.9 269.5 274L273.5 274L283 279.5L281 280L280 282.5L280 316.5L279 317.5L280 323L285.5 324L288 323L289 317L296 317L296 319.5L296 321.5Q295.3 325.3 297.5 326L367.5 326L373.5 321L385.5 328L393.5 330L397.5 334L406.5 336L410.5 340Q420.6 341.9 426.5 348L435 349.5L432.5 351L276.5 351Q270 349.5 267 344.5L265 341.5L265 199.5Q266.4 193.4 271.5 191L274.5 190Z"
+        android:fillColor="#292929"
+        android:strokeColor="#292929"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M616.5 190L625 194L624 199.5L624 214.5Q626.6 228.4 635.5 236L649.5 244L665.5 245Q681.2 241.2 690 230.5Q694.4 226.4 695 220L703.5 221L705 222.5Q701 239.5 689.5 249L671.5 258Q663.6 260.6 651.5 259Q631.5 255 621 241.5Q610.5 230 610 208.5L613 196.5L616.5 190Z"
+        android:fillColor="#292929"
+        android:strokeColor="#292929"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M181.5 208L180.5 210L181.5 208Z"
+        android:fillColor="#292929"
+        android:strokeColor="#292929"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M289 282L294 285.5L289.5 287L289 282Z"
+        android:fillColor="#292929"
+        android:strokeColor="#292929"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M305.5 289L309.5 293L318.5 295L328 302.5L328 318L304 318L305.5 289Z"
+        android:fillColor="#292929"
+        android:strokeColor="#292929"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M289 294L292.5 295L294.5 295L296 295.5L296 309L288 308.5L289 307.5L289 294Z"
+        android:fillColor="#292929"
+        android:strokeColor="#292929"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M616 313L626 317L625 319.5L624 336.5L629 351.5L637.5 361L645.5 366L659.5 369Q661.3 366.3 667.5 368L677.5 364L693 349.5L696 340L706 341L705 347.5L699 362.5L689.5 373Q677.2 384.2 652.5 383Q632.9 379.1 622 366.5Q614.6 357.9 611 345.5L610 328.5L612 320.5L616 313Z"
+        android:fillColor="#292929"
+        android:strokeColor="#292929"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M85.5 3L88 3.5L85.5 4L85.5 3Z"
+        android:fillColor="#C8CDCE"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C8CDCE"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M573.5 3L572.5 5L573.5 3Z"
+        android:fillColor="#C8CDCE"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C8CDCE"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M850.5 3L856 3.5L850.5 4L850.5 3Z"
+        android:fillColor="#C8CDCE"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C8CDCE"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M865.5 4L868 4.5L865.5 5L865.5 4Z"
+        android:fillColor="#C8CDCE"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C8CDCE"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M72.5 5L75 5.5L72.5 6L72.5 5Z"
+        android:fillColor="#C8CDCE"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C8CDCE"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M874.5 5L877 5.5L874.5 6L874.5 5Z"
+        android:fillColor="#C8CDCE"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C8CDCE"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M795.5 6L796 11.5L795 11.5L795.5 6Z"
+        android:fillColor="#C8CDCE"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C8CDCE"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M799.5 66L800 71.5L799 71.5L799.5 66Z"
+        android:fillColor="#C8CDCE"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C8CDCE"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M2.5 78L3 80.5L2 80.5L2.5 78Z"
+        android:fillColor="#C8CDCE"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C8CDCE"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M2.5 84L3 86.5L1 85.5L2.5 84Z"
+        android:fillColor="#C8CDCE"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C8CDCE"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M800.5 93L801 99.5L800 99.5L800.5 93Z"
+        android:fillColor="#C8CDCE"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C8CDCE"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M2.5 110L3 116.5L2 116.5L2.5 110Z"
+        android:fillColor="#C8CDCE"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C8CDCE"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M149.5 110L695 110.5L149.5 111L149.5 110Z"
+        android:fillColor="#C8CDCE"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C8CDCE"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M133.5 114L136 115.5L134.5 115L133.5 114Z"
+        android:fillColor="#C8CDCE"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C8CDCE"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M138.5 114L137.5 116L138.5 114Z"
+        android:fillColor="#C8CDCE"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C8CDCE"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M127.5 117L127.5 120L125.5 119L120 123.5L120.5 125L119.5 124L115 128.5L115 130.5L109.5 137L109 135.5Q113.9 125.9 122.5 120L127.5 117Z"
+        android:fillColor="#C8CDCE"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C8CDCE"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M723.5 121L732.5 131L723.5 121Z"
+        android:fillColor="#C8CDCE"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C8CDCE"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M851 124L861.5 127L863.5 126L869.5 128L898.5 132Q901.4 129.4 907.5 130L971.5 150L993.5 161L994.5 158L995 174.5L994 177L972.5 182L960.5 183L959 184.5L958.5 198L958 196L938.5 193L919.5 184L873 151L873 146.5L852.5 126Q849.9 126.7 851 124ZM870 134L872 137L892 152L919 170L937 179L949 183L957 184L958 186L958 183L966 182L962 181Q963 175 960 172Q951 161 937 156L886 138L870 134Z"
+        android:fillColor="#C8CDCE"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C8CDCE"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M733.5 132L734.5 134L733.5 132Z"
+        android:fillColor="#C8CDCE"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C8CDCE"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M735.5 135L736.5 137L735.5 135Z"
+        android:fillColor="#C8CDCE"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C8CDCE"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M3.5 146L4 149L6.5 149L14.5 154L22.5 156L30.5 161L38.5 163L43.5 167Q54.8 168.7 61.5 175L67.5 176L90.5 188L98.5 190L101 192.5L101 387.5L107 405.5L118.5 420Q126 427.5 138 430.5L136 431.5L138 432.5L4 433L3.5 435L3.5 146Z"
+        android:fillColor="#C8CDCE"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C8CDCE"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M742.5 151L743 153.5L742 153.5L742.5 151Z"
+        android:fillColor="#C8CDCE"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C8CDCE"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M743.5 157L744 386.5L743 386.5L743.5 157Z"
+        android:fillColor="#C8CDCE"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C8CDCE"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M801.5 171L802 427L837.5 427L852.5 438L854.5 437L871 458.5Q876.7 467.8 879 480.5L879 482.5L880 493.5L881 494.5L868 495L868 499.5L861 512Q858.3 510.9 859 513.5Q849.8 523.3 835.5 528L798.5 528L797.5 529L797 527.5L799.5 523L800.5 524L834.5 524Q847.1 519.6 854 509.5Q859.3 502.8 860.5 492L870.5 494L870 492.5L869 480.5L860 459.5Q850.9 445.1 838.5 434L803.5 434L802.5 435L801 430.5L801.5 171Z"
+        android:fillColor="#C8CDCE"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C8CDCE"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M671.5 199L665.5 206L671.5 199Z"
+        android:fillColor="#C8CDCE"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C8CDCE"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M193.5 203L194.5 205L193.5 203Z"
+        android:fillColor="#C8CDCE"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C8CDCE"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M351.5 211L356 211.5L351.5 212L351.5 211Z"
+        android:fillColor="#C8CDCE"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C8CDCE"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M658.5 212L654.5 217L658.5 212Z"
+        android:fillColor="#C8CDCE"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C8CDCE"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M326.5 213L324.5 216L326.5 213Z"
+        android:fillColor="#C8CDCE"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C8CDCE"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M513.5 213L523 213.5L513.5 214L513.5 213Z"
+        android:fillColor="#C8CDCE"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C8CDCE"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M524.5 213L534 213.5L524.5 214L524.5 213Z"
+        android:fillColor="#C8CDCE"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C8CDCE"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M535.5 213L544 213.5L535.5 214L535.5 213Z"
+        android:fillColor="#C8CDCE"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C8CDCE"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M499.5 215L500 232.5L499 232.5L499.5 215Z"
+        android:fillColor="#C8CDCE"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C8CDCE"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M409.5 217L412 217.5L409.5 218L409.5 217Z"
+        android:fillColor="#C8CDCE"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C8CDCE"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M533.5 217L534 223.5L533 223.5L533.5 217Z"
+        android:fillColor="#C8CDCE"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C8CDCE"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M458.5 220L459 223.5L458 223.5L458.5 220Z"
+        android:fillColor="#C8CDCE"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C8CDCE"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M561.5 220L562 222.5L561 222.5L561.5 220Z"
+        android:fillColor="#C8CDCE"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C8CDCE"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M284.5 222L290 222.5L284.5 223L284.5 222Z"
+        android:fillColor="#C8CDCE"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C8CDCE"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M451.5 223L451 224.5L450.5 230L450 224.5L451.5 223Z"
+        android:fillColor="#C8CDCE"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C8CDCE"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M289.5 225L297 225.5L289.5 226L289.5 225Z"
+        android:fillColor="#C8CDCE"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C8CDCE"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M364.5 228L365 230.5L364 230.5L364.5 228Z"
+        android:fillColor="#C8CDCE"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C8CDCE"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M561.5 230L562 233.5L561 233.5L561.5 230Z"
+        android:fillColor="#C8CDCE"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C8CDCE"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M458.5 231L459 233.5L458 233.5L458.5 231Z"
+        android:fillColor="#C8CDCE"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C8CDCE"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M284.5 232L287 232.5L284.5 233L284.5 232Z"
+        android:fillColor="#C8CDCE"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C8CDCE"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M291.5 232L294 232.5L291.5 233L291.5 232Z"
+        android:fillColor="#C8CDCE"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C8CDCE"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M295.5 232L303 232.5L295.5 233L295.5 232Z"
+        android:fillColor="#C8CDCE"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C8CDCE"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M360.5 235L359.5 237L360.5 235Z"
+        android:fillColor="#C8CDCE"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C8CDCE"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M442.5 237L443.5 239L442.5 237Z"
+        android:fillColor="#C8CDCE"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C8CDCE"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M504.5 237L509 237.5L504.5 238L504.5 237Z"
+        android:fillColor="#C8CDCE"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C8CDCE"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M514.5 237L520 237.5L514.5 238L514.5 237Z"
+        android:fillColor="#C8CDCE"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C8CDCE"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M545.5 242L548 242.5L545.5 243L545.5 242Z"
+        android:fillColor="#C8CDCE"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C8CDCE"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M549.5 242L558 242.5L549.5 243L549.5 242Z"
+        android:fillColor="#C8CDCE"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C8CDCE"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M406.5 247L417 247.5L406.5 248L406.5 247Z"
+        android:fillColor="#C8CDCE"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C8CDCE"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M431.5 252L432 258.5L431 258.5L431.5 252Z"
+        android:fillColor="#C8CDCE"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C8CDCE"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M453.5 252L452 254.5L451.5 256L451 254.5L453.5 252Z"
+        android:fillColor="#C8CDCE"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C8CDCE"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M381.5 259L380.5 261L381.5 259Z"
+        android:fillColor="#C8CDCE"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C8CDCE"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M411.5 266L412 269.5L411 269.5L411.5 266Z"
+        android:fillColor="#C8CDCE"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C8CDCE"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M380.5 273L386 273.5L380.5 274L380.5 273Z"
+        android:fillColor="#C8CDCE"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C8CDCE"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M396.5 273L399 273.5L396.5 274L396.5 273Z"
+        android:fillColor="#C8CDCE"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C8CDCE"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M299.5 278L303 278.5L299.5 279L299.5 278Z"
+        android:fillColor="#C8CDCE"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C8CDCE"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M305.5 278L350 278.5L305.5 279L305.5 278Z"
+        android:fillColor="#C8CDCE"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C8CDCE"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M358.5 278L361 278.5L358.5 279L358.5 278Z"
+        android:fillColor="#C8CDCE"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C8CDCE"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M282.5 281L287 283.5L288 289L297 288.5L297 286.5L297.5 285L298 286.5L297.5 288L302 289L302 318.5L303.5 319L304.5 320L325.5 320L327.5 321L329.5 319L363.5 319L363.5 320L359 320.5L368 321L368.5 323L370 322.5Q368.2 326.7 366.5 324L298.5 324L298 322.5L297 318.5L299 318.5L298.5 316L296.5 316L290.5 315L286 317L286.5 320L287.5 318L288 321L282 321.5L285 322.5L282.5 323Q279.3 321.3 281 314.5L282 314.5L282.5 316L283 313L281 312.5L283 312L283 285.5L281 285L281 283.5L283 283.5L282.5 281ZM290 292L288 294L288 302L287 299L286 310L289 311L297 311Q296 308 299 309L299 294Q296 295 297 292L290 292Z"
+        android:fillColor="#C8CDCE"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C8CDCE"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M521.5 283L527 283.5L521.5 284L521.5 283Z"
+        android:fillColor="#C8CDCE"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C8CDCE"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M542.5 286L543 290.5L541 291.5L542.5 286Z"
+        android:fillColor="#C8CDCE"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C8CDCE"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M303.5 289L304 295.5L303 295.5L303.5 289Z"
+        android:fillColor="#C8CDCE"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C8CDCE"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M360.5 289L361.5 291L360.5 289Z"
+        android:fillColor="#C8CDCE"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C8CDCE"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M512.5 290L513.5 292L512.5 290Z"
+        android:fillColor="#C8CDCE"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C8CDCE"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M518.5 291L523 291.5L518.5 292L518.5 291Z"
+        android:fillColor="#C8CDCE"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C8CDCE"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M526.5 291Q532.6 289.8 532 292.5L530.5 292Q525.5 293 526.5 291Z"
+        android:fillColor="#C8CDCE"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C8CDCE"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M413.5 294L412.5 296L413.5 294Z"
+        android:fillColor="#C8CDCE"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C8CDCE"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M384.5 295L385.5 297L384.5 295Z"
+        android:fillColor="#C8CDCE"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C8CDCE"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M377.5 297L379 300.5L378.5 303L377 299.5L377.5 297Z"
+        android:fillColor="#C8CDCE"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C8CDCE"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M414.5 299L415 301.5L414 301.5L414.5 299Z"
+        android:fillColor="#C8CDCE"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C8CDCE"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M480.5 300L481.5 302L480.5 300Z"
+        android:fillColor="#C8CDCE"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C8CDCE"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M329.5 302L330.5 307L331 303Q333.7 301.9 333 304.5L335.5 307L345.5 309L350.5 314L357 315.5L353.5 317L352.5 316L330 316L329.5 302Z"
+        android:fillColor="#C8CDCE"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C8CDCE"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M403.5 303L404.5 305L403.5 303Z"
+        android:fillColor="#C8CDCE"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C8CDCE"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M373.5 307L372.5 309L373.5 307Z"
+        android:fillColor="#C8CDCE"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C8CDCE"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M178.5 335L179.5 337L178.5 335Z"
+        android:fillColor="#C8CDCE"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C8CDCE"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M742.5 389L743 391.5L742 391.5L742.5 389Z"
+        android:fillColor="#C8CDCE"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C8CDCE"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M740.5 396L741 397.5L731.5 412L732.5 408L735 406.5L734.5 405L736 405Q734.5 401.3 737.5 402L737.5 400Q739.8 400.8 739 398.5L740.5 396Z"
+        android:fillColor="#C8CDCE"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C8CDCE"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M727.5 414L725.5 417L727.5 414Z"
+        android:fillColor="#C8CDCE"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C8CDCE"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M715.5 427L795.5 427L797 428.5L796.5 435L795.5 432L795 434L704 433.5L706 432.5L704 431.5L715.5 427Z"
+        android:fillColor="#C8CDCE"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C8CDCE"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M154.5 430L691 430.5L154.5 431L154.5 430Z"
+        android:fillColor="#C8CDCE"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C8CDCE"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M143.5 432L146 432.5L143.5 433L143.5 432Z"
+        android:fillColor="#C8CDCE"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C8CDCE"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M699.5 432L703 432.5L699.5 433L699.5 432Z"
+        android:fillColor="#C8CDCE"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C8CDCE"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M149.5 433L696 433.5L149.5 434L149.5 433Z"
+        android:fillColor="#C8CDCE"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C8CDCE"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M797.5 440L798 462.5L799 466.5L798 466.5L797 462.5L797.5 440Z"
+        android:fillColor="#C8CDCE"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C8CDCE"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M797.5 491L798 496Q795.3 497.1 796 494.5L797.5 491Z"
+        android:fillColor="#C8CDCE"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C8CDCE"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M794.5 519L795 521.5L794 521.5L794.5 519Z"
+        android:fillColor="#C8CDCE"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C8CDCE"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M45.5 523L92.5 523L96.5 524L100.5 523L103.5 524L107.5 523L108.5 524L794 524L792.5 528L52.5 528L51.5 529L47 527L46.5 525L45 525.5L45.5 523Z"
+        android:fillColor="#C8CDCE"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C8CDCE"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M795.5 529L797 533Q793.2 534.2 795.5 529Z"
+        android:fillColor="#C8CDCE"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C8CDCE"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M99.5 1L147 1.5L99.5 2L99.5 1Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M148.5 1L562.5 1L565 2.5L563.5 3L562.5 2L148.5 2L148.5 1Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M575.5 1L579 1.5L575.5 2L575.5 1Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M737.5 1L741 1.5L737.5 2L737.5 1Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M750.5 1L792 1.5L750.5 2L750.5 1Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M794.5 1L846.5 1L847.5 2L861.5 2L862.5 3L871.5 3L886 5.5L880.5 6L871.5 4L847.5 3L846.5 2L795.5 2L793.5 3L794.5 1Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M887.5 6L892 6.5L887.5 7L887.5 6Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M893.5 7L903 8.5L898.5 9L893.5 8L893.5 7Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M904.5 9L907 9.5L904.5 10L904.5 9Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M908.5 10L912 10.5L908.5 11L908.5 10Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M913.5 11L916 11.5L913.5 12L913.5 11Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M917.5 12L920 12.5L917.5 13L917.5 12Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M921.5 13L924 13.5L921.5 14L921.5 13Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M928.5 15L931 15.5L928.5 16L928.5 15Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M1.5 105L2 450.5L3 451.5L4 465.5L9.5 480L10.5 479L795 479L795.5 476L796 494.5L795 499L21 502L30 513.5L21 505.5L18 501.5L18.5 500L16 498.5L16.5 497L14 495.5L14.5 494L13 493.5L13.5 492L12 491.5L12.5 490L11 489.5L11.5 488L10 487.5L10.5 486L9 485.5L9.5 484L8 483.5L9 481L7 480.5L7.5 479L6 478.5L7 476L5 475.5L6 473Q3.3 474.1 4 471.5L5 469L3 468.5L4 466Q0.7 467.3 2 462.5L2 460.5L1 457.5L1.5 105Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M699.5 112Q702.1 111.3 701 114L697 113.5L699.5 112Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M703 113Q721.9 117.3 732 131.5Q739.2 140.3 742 153.5L742 382.5L741 382.5L741 155.5Q737 134.5 722.5 124L708.5 116L703 115L703 113Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M116.5 130L115.5 132L116.5 130Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M180.5 200L174.5 207L180.5 200Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M310.5 211L312 213.5L311 213.5L310.5 211Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M350.5 211L349.5 213L350.5 211Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M359.5 211L360.5 213L359.5 211Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M405.5 211L413 211.5L405.5 212L405.5 211Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M197.5 214L198.5 216L197.5 214Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M504.5 214L510 214.5L504.5 215L504.5 214Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M514.5 214Q522.3 212.3 524 216.5L524 235.5L522.5 237L523 235.5L523 216.5L521.5 215L514.5 215L514.5 214Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M525.5 214L532 214.5L525.5 215L525.5 214Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M536.5 214L544 214.5L536.5 215L536.5 214Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M378.5 215L379 217.5L376 219.5L378.5 215Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M396.5 215L397 222.5L396 222.5L396.5 215Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M443.5 215L441.5 218L443.5 215Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M511.5 215L513 216.5L513 230.5L512 230.5L512 216.5L511.5 215Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M533.5 215L534.5 217L533.5 215Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M281.5 216L282 219.5L281 219.5L281.5 216Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M354.5 217L359 220.5L358.5 222L355.5 218L352 220.5L351.5 226L351 220.5L354.5 217Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M407.5 218L404.5 222L407.5 218Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M558.5 218L561 218.5L558.5 219L558.5 218Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M342.5 219L343 231.5L337 236.5L342 231.5L342.5 219Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M454.5 220L455 224.5L453 223.5L454.5 220Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M283.5 221L292 221.5L283.5 222L283.5 221Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M301.5 221L309.5 221L310 223L306.5 222L304.5 223L302.5 223L301.5 221Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M447.5 222L448 238.5L447 238.5L447.5 222Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M454.5 226L455 230.5L454 230.5L454.5 226Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M351.5 227L354.5 231L358 228.5L358.5 227L359 228.5L354.5 232L351 228.5L351.5 227Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M368.5 227L368 228.5L367.5 232L367 228.5L368.5 227Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M390.5 228L389.5 230L390.5 228Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M281.5 230L283 232.5L281 231.5L281.5 230Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M378.5 231L381 231.5L378.5 232L378.5 231Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M390.5 231L394 231.5L390.5 232L390.5 231Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M418.5 233L419 236.5L417 237.5L418.5 233Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M454.5 233L456 235.5L454 234.5L454.5 233Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M512.5 233L514 237.5L512.5 237L511 236.5L512.5 233Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M349.5 236L350.5 238L349.5 236Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M376.5 236L377.5 238L376.5 236Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M306.5 237L309 237.5L306.5 238L306.5 237Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M328.5 237L336 237.5L328.5 238L328.5 237Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M352.5 237L359 237.5L352.5 238L352.5 237Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M560.5 239L561 241.5L560 241.5L560.5 239Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M424.5 247L427 247.5Q424.9 250.8 424.5 247Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M446.5 247L451 249.5L448.5 250L446.5 247Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M443.5 252L446 255.5L443 257.5L445 254.5L443.5 252Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M456.5 256L457 263.5L456 263.5L456.5 256Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M389.5 258L390 260.5L389 260.5L389.5 258Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M417.5 259Q420.5 258.1 419 262.5L418 262.5L417.5 259Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M451.5 259L450.5 261L448 260.5L451.5 259Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M402.5 260L415 260.5L402.5 261L402.5 260Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M371.5 262L373 264.5L371 263.5L371.5 262Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M398.5 269L401 270.5L399.5 270L398.5 269Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M416.5 269L419 270.5L418.5 273L418 270L416.5 269Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M371.5 272L372.5 274L371.5 272Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M400.5 272L399.5 274L400.5 272Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M425.5 272L426.5 274L425.5 272Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M368.5 278L369.5 280L368.5 278Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M283.5 280L287 280.5L283.5 281L283.5 280Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M476.5 285L477 291.5L476 291.5L476.5 285Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M484.5 285L483.5 287L484.5 285Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M501.5 285L504 285.5L501.5 286L501.5 285Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M328.5 287L329 289.5L328 289.5L328.5 287Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M366.5 287L377.5 299L368.5 290L367 290L366.5 287Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M365.5 290L364.5 292L363 291.5L365.5 290Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M330.5 291L333 291.5L329.5 293L330.5 291Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M467.5 292L468 296.5L467 296.5L467.5 292Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M289.5 293L292 293.5L289.5 294L289.5 293Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M281.5 295L282 306.5L281 306.5L281.5 295Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M418.5 295L420.5 298L418.5 295Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M388.5 298L395 298.5L388.5 299L388.5 298Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M404.5 299L403.5 301L404.5 299Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M509.5 299L508.5 301L509.5 299Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M398.5 300L399 303.5L398 303.5L398.5 300Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M526.5 301L526 302.5L525.5 305L525 302.5L526.5 301Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M416.5 303L417 304.5L414 306.5L416.5 303Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M467.5 305L468 317.5L467 317.5L467.5 305Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M418.5 307L417.5 309L418.5 307Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M491.5 307L497 307.5L491.5 308L491.5 307Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M509.5 309L510 316.5L509 316.5L509.5 309Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M303.5 312L304 317.5L303 317.5L303.5 312Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M367.5 313L370 313.5L364 318.5L364 316.5L367.5 313Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M487.5 313L488.5 315L487.5 313Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M658.5 314L662 314.5L658.5 315L658.5 314Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M412.5 315L415 316.5L413.5 317L412.5 315Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M429.5 315L430 317.5L429 317.5L429.5 315Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M490.5 316L491.5 318L490.5 316Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M329.5 317L337 318.5L330.5 319L329.5 317Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M429.5 319L428.5 321L429.5 319Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M467.5 320L468 323.5L467 323.5L467.5 320Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M287.5 321L286.5 323L287.5 321Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M169.5 322L168.5 324L169.5 322Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M515.5 323L514.5 325L515.5 323Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M426.5 324L425.5 326L426.5 324Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M175.5 325L179.5 330L175.5 325Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M467.5 326L468.5 328L467.5 326Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M487.5 326L488.5 328L487.5 326Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M500.5 326L499.5 328L500.5 326Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M643.5 328L644 333.5L643 333.5L643.5 328Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M668.5 338L667.5 340L668.5 338Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M800.5 434L801.5 483L802 479L836.5 479L838 480.5Q841.3 486.2 841 495.5L837.5 498L801.5 498L800 499.5L796.5 529L796 521.5L797 520.5L797 504.5Q800 503.5 799 498.5L798 497.5L798 482.5L799 481.5L799 440.5L800 439.5L800 437.5L800.5 434Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M79.5 0L80 2.5L79 2.5L79.5 0Z"
+        android:fillColor="#CECECE"
+        android:fillAlpha="0.1294118"
+        android:strokeColor="#CECECE"
+        android:strokeAlpha="0.1294118"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M85.5 0L86.5 2Q83.7 2.7 85.5 0Z"
+        android:fillColor="#CECECE"
+        android:fillAlpha="0.1294118"
+        android:strokeColor="#CECECE"
+        android:strokeAlpha="0.1294118"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M89.5 0L90 2L88 1.5L89.5 0Z"
+        android:fillColor="#CECECE"
+        android:fillAlpha="0.1294118"
+        android:strokeColor="#CECECE"
+        android:strokeAlpha="0.1294118"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M564.5 0L563.5 2L564.5 0Z"
+        android:fillColor="#CECECE"
+        android:fillAlpha="0.1294118"
+        android:strokeColor="#CECECE"
+        android:strokeAlpha="0.1294118"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M569 0Q572 -1 571 2Q568 3 569 0Z"
+        android:fillColor="#CECECE"
+        android:fillAlpha="0.1294118"
+        android:strokeColor="#CECECE"
+        android:strokeAlpha="0.1294118"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M743.5 0Q747.3 -1.3 746 2.5L745 2.5Q745.8 0.3 743.5 1L743.5 0Z"
+        android:fillColor="#CECECE"
+        android:fillAlpha="0.1294118"
+        android:strokeColor="#CECECE"
+        android:strokeAlpha="0.1294118"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M792.5 0L838 0.5L792.5 1L792.5 0Z"
+        android:fillColor="#CECECE"
+        android:fillAlpha="0.1294118"
+        android:strokeColor="#CECECE"
+        android:strokeAlpha="0.1294118"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M844.5 0L848 0.5L844.5 1L844.5 0Z"
+        android:fillColor="#CECECE"
+        android:fillAlpha="0.1294118"
+        android:strokeColor="#CECECE"
+        android:strokeAlpha="0.1294118"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M854.5 0L858 1.5L855.5 2L854.5 0Z"
+        android:fillColor="#CECECE"
+        android:fillAlpha="0.1294118"
+        android:strokeColor="#CECECE"
+        android:strokeAlpha="0.1294118"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M861 0L863 0.5L861 1.5L861 0Z"
+        android:fillColor="#CECECE"
+        android:fillAlpha="0.1294118"
+        android:strokeColor="#CECECE"
+        android:strokeAlpha="0.1294118"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M866 0Q868.7 -1.1 868 1.5L868.5 3L866 1.5L866 0Z"
+        android:fillColor="#CECECE"
+        android:fillAlpha="0.1294118"
+        android:strokeColor="#CECECE"
+        android:strokeAlpha="0.1294118"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M871.5 0L872 2.5L871 2.5L871.5 0Z"
+        android:fillColor="#CECECE"
+        android:fillAlpha="0.1294118"
+        android:strokeColor="#CECECE"
+        android:strokeAlpha="0.1294118"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M875 0Q878.3 -1.3 877 3.5L875 2.5L875 0Z"
+        android:fillColor="#CECECE"
+        android:fillAlpha="0.1294118"
+        android:strokeColor="#CECECE"
+        android:strokeAlpha="0.1294118"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M879.5 0L880 3.5L879 3.5L879.5 0Z"
+        android:fillColor="#CECECE"
+        android:fillAlpha="0.1294118"
+        android:strokeColor="#CECECE"
+        android:strokeAlpha="0.1294118"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M883.5 0L884 4.5L883 4.5L883.5 0Z"
+        android:fillColor="#CECECE"
+        android:fillAlpha="0.1294118"
+        android:strokeColor="#CECECE"
+        android:strokeAlpha="0.1294118"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M886.5 0L887 4.5L886 4.5L886.5 0Z"
+        android:fillColor="#CECECE"
+        android:fillAlpha="0.1294118"
+        android:strokeColor="#CECECE"
+        android:strokeAlpha="0.1294118"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M889.5 0L890 5.5L889 5.5L889.5 0Z"
+        android:fillColor="#CECECE"
+        android:fillAlpha="0.1294118"
+        android:strokeColor="#CECECE"
+        android:strokeAlpha="0.1294118"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M892.5 0L893 5.5L892 5.5L892.5 0Z"
+        android:fillColor="#CECECE"
+        android:fillAlpha="0.1294118"
+        android:strokeColor="#CECECE"
+        android:strokeAlpha="0.1294118"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M895.5 0L896 6.5L895 6.5L895.5 0Z"
+        android:fillColor="#CECECE"
+        android:fillAlpha="0.1294118"
+        android:strokeColor="#CECECE"
+        android:strokeAlpha="0.1294118"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M898.5 0L899 5.5L898 5.5L898.5 0Z"
+        android:fillColor="#CECECE"
+        android:fillAlpha="0.1294118"
+        android:strokeColor="#CECECE"
+        android:strokeAlpha="0.1294118"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M900.5 0L901 7.5L900 7.5L900.5 0Z"
+        android:fillColor="#CECECE"
+        android:fillAlpha="0.1294118"
+        android:strokeColor="#CECECE"
+        android:strokeAlpha="0.1294118"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M903.5 0L904 6.5L903 6.5L903.5 0Z"
+        android:fillColor="#CECECE"
+        android:fillAlpha="0.1294118"
+        android:strokeColor="#CECECE"
+        android:strokeAlpha="0.1294118"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M907.5 0L908 8.5L907 8.5L907.5 0Z"
+        android:fillColor="#CECECE"
+        android:fillAlpha="0.1294118"
+        android:strokeColor="#CECECE"
+        android:strokeAlpha="0.1294118"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M912.5 0L913 8.5L912 8.5L912.5 0Z"
+        android:fillColor="#CECECE"
+        android:fillAlpha="0.1294118"
+        android:strokeColor="#CECECE"
+        android:strokeAlpha="0.1294118"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M0.5 91L1 97.5L0 97.5L0.5 91Z"
+        android:fillColor="#CECECE"
+        android:fillAlpha="0.1294118"
+        android:strokeColor="#CECECE"
+        android:strokeAlpha="0.1294118"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M928 289L1000 289.5L929 290L928.5 292L928 289Z"
+        android:fillColor="#CECECE"
+        android:fillAlpha="0.1294118"
+        android:strokeColor="#CECECE"
+        android:strokeAlpha="0.1294118"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M928 295L999.5 295L1000 300L928.5 300L928 295Z"
+        android:fillColor="#CECECE"
+        android:fillAlpha="0.1294118"
+        android:strokeColor="#CECECE"
+        android:strokeAlpha="0.1294118"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M928.5 309L929.5 310L1000 310L999.5 312L929.5 312L929 314L999.5 314L1000 314.5L1000 323L929.5 323L929 325L999.5 325L1000 325.5L1000 333L929 333.5L1000 334L999.5 338L929.5 338L929.5 339L999.5 339L1000 341L929.5 341L929 343L999.5 343L1000 347L929.5 347L929 349L999.5 349L1000 354L929 354.5L1000 355.5L929 356L929.5 360L999.5 360L999.5 361L929.5 361L929 361.5L929 376.5L928 376.5L928.5 309Z"
+        android:fillColor="#CECECE"
+        android:fillAlpha="0.1294118"
+        android:strokeColor="#CECECE"
+        android:strokeAlpha="0.1294118"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M928.5 378L929 383.5L928 383.5L928.5 378Z"
+        android:fillColor="#CECECE"
+        android:fillAlpha="0.1294118"
+        android:strokeColor="#CECECE"
+        android:strokeAlpha="0.1294118"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M0.5 446L1 452.5L0 452.5L0.5 446Z"
+        android:fillColor="#CECECE"
+        android:fillAlpha="0.1294118"
+        android:strokeColor="#CECECE"
+        android:strokeAlpha="0.1294118"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M800.5 2L826 2.5L800.5 3L800.5 2Z"
+        android:fillColor="#C6C7C7"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C6C7C7"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M76.5 4L79 4.5L76.5 5L76.5 4Z"
+        android:fillColor="#C6C7C7"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C6C7C7"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M738.5 4L742 4.5L738.5 5L738.5 4Z"
+        android:fillColor="#C6C7C7"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C6C7C7"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M799.5 72L800 85.5L799 85.5L799.5 72Z"
+        android:fillColor="#C6C7C7"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C6C7C7"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M2.5 81L3 83.5L2 83.5L2.5 81Z"
+        android:fillColor="#C6C7C7"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C6C7C7"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M1.5 86L2 89.5L1 89.5L1.5 86Z"
+        android:fillColor="#C6C7C7"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C6C7C7"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M800.5 100L801 106.5L800 106.5L800.5 100Z"
+        android:fillColor="#C6C7C7"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C6C7C7"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M145.5 111L151 112.5L146.5 113L145.5 111Z"
+        android:fillColor="#C6C7C7"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C6C7C7"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M2.5 117L3.5 435L4 433L138 432.5L136 431.5L138.5 431L149.5 434L695.5 434L705.5 432L705.5 433L704 433.5L795 434L795.5 432Q798.4 436.2 797 444.5L796 444.5L795.5 443L795 445L4.5 445L3.5 446L3 435.5L2 434.5L2.5 117Z"
+        android:fillColor="#C6C7C7"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C6C7C7"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M128.5 117L127.5 119L128.5 117Z"
+        android:fillColor="#C6C7C7"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C6C7C7"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M125.5 119L126 121L115.5 129L121.5 122L125.5 119Z"
+        android:fillColor="#C6C7C7"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C6C7C7"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M721.5 120L722.5 122L721.5 120Z"
+        android:fillColor="#C6C7C7"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C6C7C7"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M869.5 134L885.5 138L936.5 156Q950.6 161.4 960 171.5Q963 174.8 962 181L966 181.5L958 183L957.5 186L957 184L948.5 183L936.5 179L918.5 170L891.5 152L871.5 137L869.5 134Z"
+        android:fillColor="#C6C7C7"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C6C7C7"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M416.5 146L428 146.5L416.5 147L416.5 146Z"
+        android:fillColor="#C6C7C7"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C6C7C7"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M191.5 201L192.5 203L191.5 201Z"
+        android:fillColor="#C6C7C7"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C6C7C7"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M191.5 208L192.5 210L191.5 208Z"
+        android:fillColor="#C6C7C7"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C6C7C7"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M653.5 217L652.5 219L653.5 217Z"
+        android:fillColor="#C6C7C7"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C6C7C7"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M458.5 224L459 230.5L458 230.5L458.5 224Z"
+        android:fillColor="#C6C7C7"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C6C7C7"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M287.5 232L291 232.5L287.5 233L287.5 232Z"
+        android:fillColor="#C6C7C7"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C6C7C7"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M411.5 237L416 237.5L411.5 238L411.5 237Z"
+        android:fillColor="#C6C7C7"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C6C7C7"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M427.5 247L430 247.5L427.5 248L427.5 247Z"
+        android:fillColor="#C6C7C7"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C6C7C7"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M425.5 266L426 268.5L425 268.5L425.5 266Z"
+        android:fillColor="#C6C7C7"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C6C7C7"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M386.5 273L389 273.5L386.5 274L386.5 273Z"
+        android:fillColor="#C6C7C7"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C6C7C7"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M350.5 278L358 278.5L350.5 279L350.5 278Z"
+        android:fillColor="#C6C7C7"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C6C7C7"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M361.5 278L365 278.5L361.5 279L361.5 278Z"
+        android:fillColor="#C6C7C7"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C6C7C7"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M183.5 333L184.5 335L183.5 333Z"
+        android:fillColor="#C6C7C7"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C6C7C7"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M742.5 386L743 388.5L742 388.5L742.5 386Z"
+        android:fillColor="#C6C7C7"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C6C7C7"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M739.5 394Q742.3 395.3 740 396.5L739 400L737 399.5L739.5 394Z"
+        android:fillColor="#C6C7C7"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C6C7C7"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M801.5 431L802.5 435L803.5 434L838.5 434Q850.9 445.1 860 459.5L869 480.5L870 492.5L871 493.5L867.5 494L860.5 492Q857.7 510.7 844.5 519L834.5 524L800.5 524L798 523.5L799.5 518L800.5 519L834.5 519L845 510.5Q849.9 505.4 851 496.5L855.5 491L862.5 492L861 489.5L860 480.5L852 462.5L838.5 445L803.5 445L802.5 446Q799.5 440.2 801.5 431Z"
+        android:fillColor="#C6C7C7"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C6C7C7"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M798.5 467L799 472.5L798 472.5L798.5 467Z"
+        android:fillColor="#C6C7C7"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C6C7C7"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M796.5 490L797 493.5L796 493.5L796.5 490Z"
+        android:fillColor="#C6C7C7"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C6C7C7"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M795.5 505L796 508.5L795 508.5L795.5 505Z"
+        android:fillColor="#C6C7C7"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C6C7C7"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M794.5 515L795 518.5L794 524L108.5 524L104.5 523L101.5 524L97.5 523L93.5 524L92.5 523L45.5 523L46.5 526L39 521.5L38.5 520L37 520.5L37.5 518L99.5 518L101.5 519L103.5 518L105.5 519L109.5 519L116.5 518L118.5 518L120.5 519L794 519L794.5 515Z"
+        android:fillColor="#C6C7C7"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C6C7C7"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+</vector>
\ No newline at end of file
diff --git a/core/src/main/res/drawable/ic_danarhistory.xml b/core/src/main/res/drawable/ic_pump_history.xml
similarity index 100%
rename from core/src/main/res/drawable/ic_danarhistory.xml
rename to core/src/main/res/drawable/ic_pump_history.xml
diff --git a/core/src/main/res/values-af-rZA/strings.xml b/core/src/main/res/values-af-rZA/strings.xml
index 39707264dd..18e6316bf4 100644
--- a/core/src/main/res/values-af-rZA/strings.xml
+++ b/core/src/main/res/values-af-rZA/strings.xml
@@ -5,6 +5,27 @@
     <string name="pump_basebasalrate">%1$.2f U/h</string>
     <string name="yes">Ja</string>
     <string name="no">Nee</string>
+    <string name="loopdisabled">LOOP UIT AKSIE GESTEL DEUR BEPERKINGS</string>
+    <string name="novalidbasalrate">Geen geldige basale tempo gelees van pomp</string>
+    <string name="limitingmaxiob">Beperk maks IAB tot %1$.1f U agv %2$s</string>
+    <string name="unsafeusage">onveilige gebruik</string>
+    <string name="pump_unreachable">Pomp onbereikbaar</string>
+    <string name="extended_bolus">Uitgebreide bolus</string>
+    <string name="pump_time_updated">Pomp tyd opgedateer</string>
+    <string name="exit">Uitgang</string>
+    <string name="disableloop">Skakel loop af</string>
+    <string name="enableloop">Skakel loop aan</string>
+    <string name="resumeloop">Hervat lus</string>
+    <string name="suspendloop">Staak lus</string>
+    <string name="notification">Kennisgewing</string>
+    <string name="noprofile">Nog geen profiel gelaai vanaf NS</string>
+    <string name="exists">bestaan</string>
+    <string name="notexists">bestaan nie</string>
+    <string name="glucose">Glukose</string>
+    <string name="name_short">Naam:</string>
+    <string name="time">Tyd</string>
+    <string name="ns_wifi_ssids">WiFi SSID</string>
+    <string name="addnew">Voeg nuwe by</string>
     <!--    Constraints-->
     <!--    Dialogs-->
     <!--    BlePreCheck-->
@@ -12,21 +33,24 @@
     <!--    Protection-->
     <!--    Profile-->
     <!--    ProfileFunction-->
+    <string name="startprofile">Begin profiele%1$d%% vir %2$d min</string>
     <!--    PumpType-->
     <!--    APSResult-->
     <!--    ProfileSwitch-->
     <!--    Temptarget-->
     <!--    TDD-->
     <!--    Translator-->
+    <string name="boluswizard">Bolus slimjan</string>
+    <string name="eatingsoon">Eet binnekort</string>
+    <string name="hypo">Hipo</string>
+    <string name="wear">Wear</string>
+    <string name="automation">Outomatisasie</string>
+    <string name="custom">Gepasmaak</string>
     <!--    Command-->
     <!--    PumpEnactResult-->
     <!--    CarbsReq-->
     <!--    TDDStatsActivity-->
     <!--    Ntp-->
-    <!-- PumoCommon - Pump Abstract -->
-    <string name="pump_operation_not_yet_supported_by_pump">Operasie nog nie ondersteun deur pomp.</string>
-    <!-- PumoCommon - Pump Status -->
-    <!-- PumpCommon - History Group -->
     <!-- Maintenance -->
     <!-- VersionChecker -->
     <string name="signature_verifier">Handtekening verifieerder</string>
@@ -35,4 +59,5 @@
     <!-- Permissions -->
     <!-- WeekdayPicker -->
     <!-- User Entry -->
+    <!-- HardLimits -->
 </resources>
diff --git a/core/src/main/res/values-af-rZA/validator.xml b/core/src/main/res/values-af-rZA/validator.xml
index 3ea04e700d..8fec1d86e6 100644
--- a/core/src/main/res/values-af-rZA/validator.xml
+++ b/core/src/main/res/values-af-rZA/validator.xml
@@ -1,2 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
+<resources>
+    <string name="error_only_numeric_digits_allowed">Slegs numeriese syfers word toegelaat.</string>
+    <string name="error_only_numeric_digits_range_allowed">Slegs numeriese syfers binne die reeks %1$s - %2$s word toegelaat.</string>
+    <string name="error_field_must_not_be_empty">Hierdie veld moet nie leeg wees nie</string>
+    <string name="error_phone_not_valid">Telefoonnommer ongeldig</string>
+</resources>
diff --git a/core/src/main/res/values-bg-rBG/strings.xml b/core/src/main/res/values-bg-rBG/strings.xml
index 0ec78fdc75..659c20aba1 100644
--- a/core/src/main/res/values-bg-rBG/strings.xml
+++ b/core/src/main/res/values-bg-rBG/strings.xml
@@ -62,6 +62,7 @@
     <string name="eventtype">Тип събитие</string>
     <string name="mgdl">мг/дл</string>
     <string name="mmol">ммол/л</string>
+    <string name="shortgram">гр.</string>
     <string name="advancedsettings_title">Допълнителни настройки</string>
     <string name="bluetooth">Bluetooth</string>
     <string name="btwatchdog_title">BT ограничения</string>
@@ -79,7 +80,6 @@
     <string name="extended_bolus">Удължен болус</string>
     <string name="pump_time_updated">Актуализирано време на помпата</string>
     <string name="exit">Изход</string>
-    <string name="serial_number">Сериен номер</string>
     <string name="removerecord">Премахни</string>
     <string name="loopisdisabled">APS е изключен</string>
     <string name="alarm">Аларма</string>
@@ -151,6 +151,7 @@
     <string name="profile_carbs_per_unit">гр/Е</string>
     <!--    ProfileFunction-->
     <string name="noprofileselected">Няма избран профил</string>
+    <string name="startprofile">Стартирай профил %1$d%% за %2$d мин</string>
     <!--    PumpType-->
     <string name="def_extended_note">* Само конкретни стойности! Диапазони не се поддържат за базал/болус при виртуална помпа.</string>
     <!--    APSResult-->
@@ -190,10 +191,19 @@
     <string name="careportal_pumpbatterychange">Смяна на батерия</string>
     <string name="careportal_temporarytarget">Временна цел</string>
     <string name="careportal_temporarytargetcancel">Откажи временна цел</string>
+    <string name="boluswizard">Болус калкулатор</string>
     <string name="glucosetype_finger">Пръст</string>
     <string name="glucosetype_sensor">Сензор</string>
     <string name="manual">Друго</string>
     <string name="unknown">неизвестно</string>
+    <string name="eatingsoon">Преди хранене</string>
+    <string name="hypo">Хипоглекимия</string>
+    <string name="activity">Физ.активност</string>
+    <string name="wear">Часовник</string>
+    <string name="automation">Автоматизация</string>
+    <string name="custom">По избор</string>
+    <string name="pump">Помпа</string>
+    <string name="loop">Кръг - Loop</string>
     <!--    Command-->
     <string name="connectiontimedout">Времето за връзка изтече</string>
     <!--    PumpEnactResult-->
@@ -225,30 +235,6 @@
     <!--    Ntp-->
     <string name="timedetection">Засичане на времето</string>
     <string name="format_hour_minute">%1$dч:%2$dм</string>
-    <!-- PumoCommon - Pump Abstract -->
-    <string name="pump_operation_not_supported_by_pump_driver">Помпата не поддържа тази операция.</string>
-    <string name="pump_operation_not_yet_supported_by_pump">Операцията не се поддържа от помпата (ВСЕ ОЩЕ).</string>
-    <string name="common_resultok">ОК</string>
-    <!-- PumoCommon - Pump Status -->
-    <string name="pump_status_never_contacted">Никога не сме се свързвали</string>
-    <string name="pump_status_waking_up">Събуждане</string>
-    <string name="pump_status_error_comm">Грешка в комуникацията</string>
-    <string name="pump_status_timeout_comm">Изтече времето за връзка</string>
-    <string name="pump_status_pump_unreachable">Помпата е недостъпна</string>
-    <string name="pump_status_invalid_config">Грешна конфигурация</string>
-    <string name="pump_status_active">Активна</string>
-    <string name="pump_status_sleeping">Спинка си</string>
-    <!-- PumpCommon - History Group -->
-    <string name="history_group_basal">Базали</string>
-    <string name="history_group_configuration">Конфигурации</string>
-    <string name="history_group_notification">Известия</string>
-    <string name="history_group_statistic">Статистика</string>
-    <string name="history_group_unknown">Неизвестни</string>
-    <string name="history_group_all">Всички</string>
-    <string name="history_group_bolus">Болуси</string>
-    <string name="history_group_prime">Пълнене</string>
-    <string name="history_group_alarm">Аларми</string>
-    <string name="history_group_glucose">Кръвна захар</string>
     <string name="mute5min">Изключи за 5 минути</string>
     <!-- Maintenance -->
     <string name="metadata_label_format">Формат на файла</string>
@@ -300,6 +286,14 @@
     <string name="saturday_short">С</string>
     <string name="sunday_short">Н</string>
     <!-- User Entry -->
+    <string name="uel_cancel_bolus">СПРИ БОЛУС</string>
+    <string name="ue_source">Източник</string>
+    <string name="ue_action">Действие</string>
+    <!-- HardLimits -->
+    <plurals name="hours">
+        <item quantity="one">%1$d час</item>
+        <item quantity="other">%1$d часа</item>
+    </plurals>
     <plurals name="minutes">
         <item quantity="one">%1$d минутa</item>
         <item quantity="other">%1$d минути</item>
diff --git a/core/src/main/res/values-ca-rES/strings.xml b/core/src/main/res/values-ca-rES/strings.xml
index e58cd5aa55..1a5baa3b01 100644
--- a/core/src/main/res/values-ca-rES/strings.xml
+++ b/core/src/main/res/values-ca-rES/strings.xml
@@ -9,20 +9,19 @@
     <!--    Protection-->
     <!--    Profile-->
     <!--    ProfileFunction-->
+    <string name="startprofile">Iniciar perfil %1$d%% durant %2$d min</string>
     <!--    PumpType-->
     <!--    APSResult-->
     <!--    ProfileSwitch-->
     <!--    Temptarget-->
     <!--    TDD-->
     <!--    Translator-->
+    <string name="loop">Llaç</string>
     <!--    Command-->
     <!--    PumpEnactResult-->
     <!--    CarbsReq-->
     <!--    TDDStatsActivity-->
     <!--    Ntp-->
-    <!-- PumoCommon - Pump Abstract -->
-    <!-- PumoCommon - Pump Status -->
-    <!-- PumpCommon - History Group -->
     <!-- Maintenance -->
     <string name="metadata_label_created_at">Creat:</string>
     <string name="metadata_label_aaps_version">Versió d\'AAPS</string>
@@ -57,4 +56,5 @@
     <!-- Permissions -->
     <!-- WeekdayPicker -->
     <!-- User Entry -->
+    <!-- HardLimits -->
 </resources>
diff --git a/core/src/main/res/values-cs-rCZ/strings.xml b/core/src/main/res/values-cs-rCZ/strings.xml
index 2e98b76ba9..33289e55b3 100644
--- a/core/src/main/res/values-cs-rCZ/strings.xml
+++ b/core/src/main/res/values-cs-rCZ/strings.xml
@@ -81,7 +81,6 @@
     <string name="extended_bolus">Prodloužený bolus</string>
     <string name="pump_time_updated">Čas v pumpě aktualizován</string>
     <string name="exit">Konec</string>
-    <string name="serial_number">Sériové číslo</string>
     <string name="removerecord">Odstranit záznam</string>
     <string name="loopisdisabled">Smyčka je zakázána</string>
     <string name="alarm">Alarm</string>
@@ -197,6 +196,7 @@
     <string name="careportal_openapsoffline">OpenAPS vypnuto</string>
     <string name="careportal_pumpbatterychange">Výměna baterie pumpy</string>
     <string name="careportal_temporarytarget">Dočasný cíl</string>
+    <string name="careportal_temporarytargetvalue">Hodnota dočasného cíle</string>
     <string name="careportal_temporarytargetcancel">Dočasný cíl konec</string>
     <string name="boluswizard">Bolusová kalkulačka</string>
     <string name="glucosetype_finger">Glukoměr</string>
@@ -244,30 +244,6 @@
     <!--    Ntp-->
     <string name="timedetection">Detekce času</string>
     <string name="format_hour_minute">%1$dh %2$dm</string>
-    <!-- PumoCommon - Pump Abstract -->
-    <string name="pump_operation_not_supported_by_pump_driver">Operace není podporována pumpou a/nebo ovladačem.</string>
-    <string name="pump_operation_not_yet_supported_by_pump">Operace prozatím pumpou nepodporována.</string>
-    <string name="common_resultok">OK</string>
-    <!-- PumoCommon - Pump Status -->
-    <string name="pump_status_never_contacted">Nikdy nekontaktováno</string>
-    <string name="pump_status_waking_up">Probouzení</string>
-    <string name="pump_status_error_comm">Chyba komunikace</string>
-    <string name="pump_status_timeout_comm">Vypršel časový limit komunikace</string>
-    <string name="pump_status_pump_unreachable">Pumpa nedostupná</string>
-    <string name="pump_status_invalid_config">Neplatná konfigurace</string>
-    <string name="pump_status_active">Aktivní</string>
-    <string name="pump_status_sleeping">Spánek</string>
-    <!-- PumpCommon - History Group -->
-    <string name="history_group_basal">Bazály</string>
-    <string name="history_group_configuration">Konfigurace</string>
-    <string name="history_group_notification">Oznámení</string>
-    <string name="history_group_statistic">Statistika</string>
-    <string name="history_group_unknown">Neznámé</string>
-    <string name="history_group_all">Vše</string>
-    <string name="history_group_bolus">Bolusy</string>
-    <string name="history_group_prime">Doplňování</string>
-    <string name="history_group_alarm">Alarmy</string>
-    <string name="history_group_glucose">Glykémie</string>
     <string name="mute5min">Ztlumit na 5 minut</string>
     <!-- Maintenance -->
     <string name="metadata_label_format">Formát souboru</string>
@@ -406,6 +382,24 @@
     <string name="ue_timestamp">Datum</string>
     <string name="ue_none">Žádné jednotky</string>
     <string name="ue_export_to_csv">Exportovat uživatelské záznamy do Excelu (csv)</string>
+    <string name="uel_loop_change">SMYČKA ZMĚNĚNA</string>
+    <string name="uel_loop_removed">SMYČKA ODEBRÁNA</string>
+    <string name="uel_other">JINÉ</string>
+    <!-- HardLimits -->
+    <string name="profile_low_target">Dolní cíl profilu</string>
+    <string name="profile_high_target">Horní cíl profilu</string>
+    <string name="temp_target_low_target">Dolní hodnota dočasného cíle</string>
+    <string name="temp_target_high_target">Horní hodnota dočasného cíle</string>
+    <string name="temp_target_value">Hodnota dočasného cíle</string>
+    <string name="profile_dia">Hodnota DIA profilu</string>
+    <string name="profile_sensitivity_value">Hodnota citlivosti profilu</string>
+    <string name="profile_max_daily_basal_value">Maximální hodnota profilu bazálu</string>
+    <string name="current_basal_value">Aktuální hodnota bazálu</string>
+    <string name="profile_carbs_ratio_value">Inzulino-sacharidový poměr profilu</string>
+    <string name="valuelimitedto">%1$.2f omezeno na %2$.2f</string>
+    <string name="valueoutofrange">»%1$s« je mimo pevně nastavené limity</string>
+    <string name="value_out_of_hard_limits">»%1$s« %2$.2f je mimo pevně nastavené limity</string>
+    <string name="basal_value">Hodnota bazálu</string>
     <plurals name="days">
         <item quantity="one">%1$d den</item>
         <item quantity="few">%1$d dnů</item>
diff --git a/core/src/main/res/values-da-rDK/strings.xml b/core/src/main/res/values-da-rDK/strings.xml
index 7ef1869a86..94b2e3b8e7 100644
--- a/core/src/main/res/values-da-rDK/strings.xml
+++ b/core/src/main/res/values-da-rDK/strings.xml
@@ -2,6 +2,16 @@
 <resources>
     <!--    Keys-->
     <!--    General-->
+    <string name="loopdisabled">LOOP DEAKTIVERET AF BEGRÆNSNINGER</string>
+    <string name="bolusdelivered">Bolus %1$.2fE leveret uden fejl</string>
+    <string name="virtualpump_resultok">OK</string>
+    <string name="removerecord">Fjern registrering</string>
+    <string name="disableloop">Deaktivér loop</string>
+    <string name="enableloop">Aktiver loop</string>
+    <string name="noprofile">Ingen profil er indlæst fra NS endnu</string>
+    <string name="glucose">Glukose</string>
+    <string name="cob">COB</string>
+    <string name="event_time_label">Tidspunkt for hændelsen</string>
     <!--    Constraints-->
     <!--    Dialogs-->
     <!--    BlePreCheck-->
@@ -15,14 +25,15 @@
     <!--    Temptarget-->
     <!--    TDD-->
     <!--    Translator-->
+    <string name="eatingsoon">Spiser snart</string>
+    <string name="hypo">Hypo</string>
+    <string name="activity">Aktivitet</string>
+    <string name="wear">Ur</string>
     <!--    Command-->
     <!--    PumpEnactResult-->
     <!--    CarbsReq-->
     <!--    TDDStatsActivity-->
     <!--    Ntp-->
-    <!-- PumoCommon - Pump Abstract -->
-    <!-- PumoCommon - Pump Status -->
-    <!-- PumpCommon - History Group -->
     <!-- Maintenance -->
     <string name="metadata_label_created_at">Oprettet den</string>
     <string name="metadata_label_aaps_version">AAPS Version</string>
@@ -61,4 +72,5 @@
     <!-- Permissions -->
     <!-- WeekdayPicker -->
     <!-- User Entry -->
+    <!-- HardLimits -->
 </resources>
diff --git a/core/src/main/res/values-de-rDE/strings.xml b/core/src/main/res/values-de-rDE/strings.xml
index 2607582d12..70ba734fdd 100644
--- a/core/src/main/res/values-de-rDE/strings.xml
+++ b/core/src/main/res/values-de-rDE/strings.xml
@@ -62,6 +62,8 @@
     <string name="eventtype">Ereignistyp</string>
     <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">Erweiterte Einstellungen</string>
     <string name="bluetooth">Bluetooth</string>
     <string name="btwatchdog_title">BT Watchdog</string>
@@ -79,7 +81,6 @@
     <string name="extended_bolus">Verzögerter Bolus</string>
     <string name="pump_time_updated">Pumpenzeit aktualisiert</string>
     <string name="exit">Verlassen</string>
-    <string name="serial_number">Seriennummer</string>
     <string name="removerecord">Eintrag löschen</string>
     <string name="loopisdisabled">Loop ist deaktiviert.</string>
     <string name="alarm">Alarm</string>
@@ -195,7 +196,9 @@
     <string name="careportal_openapsoffline">OpenAPS offline</string>
     <string name="careportal_pumpbatterychange">Pumpenbatterie-Wechsel</string>
     <string name="careportal_temporarytarget">Temporäres Ziel</string>
+    <string name="careportal_temporarytargetvalue">Temporärer Zielwert</string>
     <string name="careportal_temporarytargetcancel">Temporäres Ziel abbrechen</string>
+    <string name="boluswizard">Bolus-Rechner</string>
     <string name="glucosetype_finger">Finger</string>
     <string name="glucosetype_sensor">Sensor</string>
     <string name="manual">Manuell</string>
@@ -241,30 +244,6 @@
     <!--    Ntp-->
     <string name="timedetection">Zeiterkennung</string>
     <string name="format_hour_minute">%1$dh %2$dm</string>
-    <!-- PumoCommon - Pump Abstract -->
-    <string name="pump_operation_not_supported_by_pump_driver">Aktion von Pumpe und/oder Treiber nicht unterstützt.</string>
-    <string name="pump_operation_not_yet_supported_by_pump">Operation NOCH NICHT von Pumpe unterstützt.</string>
-    <string name="common_resultok">OK</string>
-    <!-- PumoCommon - Pump Status -->
-    <string name="pump_status_never_contacted">Nie verbunden</string>
-    <string name="pump_status_waking_up">Aufwecken</string>
-    <string name="pump_status_error_comm">Fehler bei der Kommunikation</string>
-    <string name="pump_status_timeout_comm">Zeitüberschreitung bei Kommunikation</string>
-    <string name="pump_status_pump_unreachable">Pumpe nicht erreichbar</string>
-    <string name="pump_status_invalid_config">Ungültige Einstellung</string>
-    <string name="pump_status_active">Aktiv</string>
-    <string name="pump_status_sleeping">Schlafen</string>
-    <!-- PumpCommon - History Group -->
-    <string name="history_group_basal">Basal</string>
-    <string name="history_group_configuration">Konfigurationen</string>
-    <string name="history_group_notification">Benachrichtigungen</string>
-    <string name="history_group_statistic">Statistiken</string>
-    <string name="history_group_unknown">Unbekannte</string>
-    <string name="history_group_all">Alle</string>
-    <string name="history_group_bolus">Boli</string>
-    <string name="history_group_prime">Füllen</string>
-    <string name="history_group_alarm">Alarme</string>
-    <string name="history_group_glucose">Glukose</string>
     <string name="mute5min">Stumm schalten für 5 Minuten</string>
     <!-- Maintenance -->
     <string name="metadata_label_format">Dateiformat</string>
@@ -316,28 +295,111 @@
     <string name="saturday_short">Sa</string>
     <string name="sunday_short">So</string>
     <!-- User Entry -->
+    <string name="uel_bolus">BOLUS</string>
+    <string name="uel_bolus_advisor">BOLUS RATGEBER</string>
+    <string name="uel_extended_bolus">VERLÄNGERTER BOLUS</string>
+    <string name="uel_superbolus_tbr">SUPERBOLUS TBR</string>
+    <string name="uel_carbs">KOHLENHYDRATE</string>
+    <string name="uel_extended_carbs">VERLÄNGERTE KOHLENHYDRATE</string>
+    <string name="uel_temp_basal">TEMP BASAL</string>
     <string name="uel_tt">TEMP. ZIEL</string>
+    <string name="uel_new_profile">NEUES PROFIL</string>
+    <string name="uel_clone_profile">PROFIL KOPIEREN</string>
+    <string name="uel_store_profile">PROFIL SPEICHERN</string>
+    <string name="uel_profile_switch">PROFILWECHSEL</string>
+    <string name="uel_profile_switch_cloned">PROFILWECHSEL KOPIERT</string>
+    <string name="uel_closed_loop_mode">CLOSED LOOP MODE</string>
+    <string name="uel_lgs_loop_mode">LGS LOOP MODE</string>
+    <string name="uel_open_loop_mode">OPEN LOOP MODE</string>
+    <string name="uel_loop_disabled">LOOP DEAKTIVIERT</string>
+    <string name="uel_loop_enabled">LOOP AKTIVIERT</string>
+    <string name="uel_reconnect">ERNEUT VERBINDEN</string>
+    <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>
     <string name="uel_cancel_bolus">BOLUS ABBRECHEN</string>
+    <string name="uel_cancel_extended_bolus">VERLÄNGERTEN BOLUS ABBRECHEN</string>
     <string name="uel_cancel_tt">TEMP. ZIEL ABBRECHEN</string>
+    <string name="uel_careportal">CAREPORTAL</string>
     <string name="uel_site_change">KANÜLENWECHSEL</string>
     <string name="uel_reservoir_change">RESERVOIRWECHSEL</string>
+    <string name="uel_calibration">KALIBRIERUNG</string>
+    <string name="uel_prime_bolus">BOLUS ZUM BEFÜLLEN</string>
+    <string name="uel_treatment">BEHANDLUNG</string>
+    <string name="uel_careportal_ns_refresh">CAREPORTAL NIGHTSCOUT AKTUALISIEREN</string>
+    <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>
+    <string name="temp_target_low_target">Temp. Ziel unterer Wert</string>
+    <string name="temp_target_high_target">Temp. Ziel oberer Wert</string>
+    <string name="temp_target_value">Temp. Ziel Wert</string>
+    <string name="profile_dia">Profil Insulinwirkdauer</string>
+    <string name="profile_sensitivity_value">Profil Sensitivitätswert</string>
+    <string name="profile_max_daily_basal_value">Profil max. Basalwert</string>
+    <string name="current_basal_value">Aktueller Basalwert</string>
+    <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-el-rGR/strings.xml b/core/src/main/res/values-el-rGR/strings.xml
index e180c5c571..7d302b70f2 100644
--- a/core/src/main/res/values-el-rGR/strings.xml
+++ b/core/src/main/res/values-el-rGR/strings.xml
@@ -5,6 +5,26 @@
     <string name="pump_basebasalrate">%1$.2f U/h</string>
     <string name="yes">Ναι</string>
     <string name="no">Όχι</string>
+    <string name="loopdisabled">ΤΟ ΚΥΚΛΩΜΑ ΑΠΕΝΕΡΓΟΠΟΙΗΘΗΚΕ ΑΠΟ ΠΕΡΙΟΡΙΣΜΟΥΣ</string>
+    <string name="novalidbasalrate">Διαβάζεται από την αντλία μη έγκυρος βασικός ρυθμός</string>
+    <string name="limitingmaxiob">Περιορίζεται η μέγιστη IOB σε %1$.1f U λόγω %2$s</string>
+    <string name="unsafeusage">μη ασφαλής χρήση</string>
+    <string name="pump_unreachable">Η αντλία δεν είναι διαθέσιμη</string>
+    <string name="extended_bolus">Εκτεταμένο bolus</string>
+    <string name="pump_time_updated">Η ώρα στην αντλία άλλαξε</string>
+    <string name="disableloop">Απενεργοποιήστε κύκλωμα</string>
+    <string name="enableloop">Ενεργοποιήστε κύκλωμα</string>
+    <string name="resumeloop">Επαναφορά κυκλώματος</string>
+    <string name="suspendloop">Αναστολή κυκλώματος</string>
+    <string name="notification">Ειδοποίηση</string>
+    <string name="noprofile">Δεν φορτώθηκε προφίλ από το NS ακόμα</string>
+    <string name="exists">υπάρχει</string>
+    <string name="notexists">δεν υπάρχει</string>
+    <string name="glucose">Γλυκόζη</string>
+    <string name="name_short">Όνομα:</string>
+    <string name="time">Χρόνος</string>
+    <string name="ns_wifi_ssids">WiFi SSID</string>
+    <string name="addnew">Προσθήκη νέου</string>
     <!--    Constraints-->
     <!--    Dialogs-->
     <!--    BlePreCheck-->
@@ -12,21 +32,25 @@
     <!--    Protection-->
     <!--    Profile-->
     <!--    ProfileFunction-->
+    <string name="startprofile">Έναρξη προφίλ %1$d%% για %2$d λεπτά</string>
     <!--    PumpType-->
     <!--    APSResult-->
     <!--    ProfileSwitch-->
     <!--    Temptarget-->
     <!--    TDD-->
     <!--    Translator-->
+    <string name="boluswizard">Οδηγός Bolus</string>
+    <string name="eatingsoon">Γεύμα Σύντομα</string>
+    <string name="hypo">Υπογλυκαιμία</string>
+    <string name="activity">Άσκηση</string>
+    <string name="wear">Wear</string>
+    <string name="automation">Αυτοματισμός</string>
+    <string name="custom">Προσαρμογή</string>
     <!--    Command-->
     <!--    PumpEnactResult-->
     <!--    CarbsReq-->
     <!--    TDDStatsActivity-->
     <!--    Ntp-->
-    <!-- PumoCommon - Pump Abstract -->
-    <string name="pump_operation_not_yet_supported_by_pump">Η λειτουργία δεν υποστηρίζεται ΑΚΟΜΑ από την αντλία.</string>
-    <!-- PumoCommon - Pump Status -->
-    <!-- PumpCommon - History Group -->
     <!-- Maintenance -->
     <!-- VersionChecker -->
     <string name="signature_verifier">Έλεγχος υπογραφής</string>
@@ -35,4 +59,5 @@
     <!-- Permissions -->
     <!-- WeekdayPicker -->
     <!-- User Entry -->
+    <!-- HardLimits -->
 </resources>
diff --git a/core/src/main/res/values-el-rGR/validator.xml b/core/src/main/res/values-el-rGR/validator.xml
index 3ea04e700d..2dad0d3f66 100644
--- a/core/src/main/res/values-el-rGR/validator.xml
+++ b/core/src/main/res/values-el-rGR/validator.xml
@@ -1,2 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
+<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_field_must_not_be_empty">Το πεδίο αυτό δεν πρέπει να είναι κενό</string>
+    <string name="error_phone_not_valid">Μη έγκυρος αριθμός τηλεφώνου</string>
+</resources>
diff --git a/core/src/main/res/values-es-rES/strings.xml b/core/src/main/res/values-es-rES/strings.xml
index 4f454e94c0..abacc66600 100644
--- a/core/src/main/res/values-es-rES/strings.xml
+++ b/core/src/main/res/values-es-rES/strings.xml
@@ -68,6 +68,24 @@
     <string name="pairing">Emparejando</string>
     <string name="yes">Si</string>
     <string name="no">No</string>
+    <string name="bolusdelivered">Bolo %1$.2fU enviado correctamente</string>
+    <string name="novalidbasalrate">Tasa Basal no valida en la bomba</string>
+    <string name="limitingmaxiob">Limitando max IOB a %1$.1f U debido a %2$s</string>
+    <string name="unsafeusage">uso no seguro</string>
+    <string name="pump_unreachable">Bomba no alcanzable</string>
+    <string name="disableloop">Desactivar lazo</string>
+    <string name="enableloop">Activar lazo</string>
+    <string name="resumeloop">Reactivar el lazo</string>
+    <string name="suspendloop">Suspender lazo</string>
+    <string name="notification">Notificación</string>
+    <string name="noprofile">Pendiente carga perfil NS</string>
+    <string name="notexists">no existe</string>
+    <string name="iob">IOB</string>
+    <string name="name_short">Nombre:</string>
+    <string name="time">Tiempo</string>
+    <string name="ns_wifi_ssids">WiFi SSID</string>
+    <string name="event_time_label">Hora del evento</string>
+    <string name="addnew">Añadir nuevo</string>
     <!--    Constraints-->
     <string name="limitingbasalratio">Limitando max basal rate a %1$.2f U/h debido a %2$s</string>
     <string name="pumplimit">límite de la bomba</string>
@@ -116,6 +134,7 @@
     <string name="profile_carbs_per_unit">g/U</string>
     <!--    ProfileFunction-->
     <string name="noprofileselected">Ningun perfil seleccionado</string>
+    <string name="startprofile">Iniciar perfil %1$d%% durante %2$d min</string>
     <!--    PumpType-->
     <string name="def_extended_note">* Sólo se soportan valores discretos, no rangos, como entrada de datos para basal/bolo en la bomba virtual.</string>
     <!--    APSResult-->
@@ -190,30 +209,6 @@
     <!--    Ntp-->
     <string name="timedetection">Detección de tiempo</string>
     <string name="format_hour_minute">%1$dhoras %2$dmin</string>
-    <!-- PumoCommon - Pump Abstract -->
-    <string name="pump_operation_not_supported_by_pump_driver">Operación no soportada por bomba y/o controlador.</string>
-    <string name="pump_operation_not_yet_supported_by_pump">Operación no soportada todavía por la bomba.</string>
-    <string name="common_resultok">Ok</string>
-    <!-- PumoCommon - Pump Status -->
-    <string name="pump_status_never_contacted">Nunca conectados</string>
-    <string name="pump_status_waking_up">En fase de inicio</string>
-    <string name="pump_status_error_comm">Error con la comunicación</string>
-    <string name="pump_status_timeout_comm">Tiempo de espera en la comunicación</string>
-    <string name="pump_status_pump_unreachable">Bomba no alcanzable</string>
-    <string name="pump_status_invalid_config">Configuración no válida</string>
-    <string name="pump_status_active">Activo</string>
-    <string name="pump_status_sleeping">Suspendida</string>
-    <!-- PumpCommon - History Group -->
-    <string name="history_group_basal">Basales</string>
-    <string name="history_group_configuration">Ajustes</string>
-    <string name="history_group_notification">Notificaciones</string>
-    <string name="history_group_statistic">Estadísticas</string>
-    <string name="history_group_unknown">Desconocido/a</string>
-    <string name="history_group_all">Todos</string>
-    <string name="history_group_bolus">Bolos</string>
-    <string name="history_group_prime">Cebado</string>
-    <string name="history_group_alarm">Alarmas</string>
-    <string name="history_group_glucose">Glucosa</string>
     <string name="mute5min">Silenciar por 5 minutos</string>
     <!-- Maintenance -->
     <string name="metadata_label_format">Formato del archivo</string>
@@ -258,6 +253,7 @@
     <string name="alert_dialog_storage_permission_text">Por favor reinicia el teléfono o AndroidAPS desde ajustes de sistema, sino AndroidAPS no guardará registros (importante para trazar y verificar que el algoritmo funcione correctamente)!</string>
     <!-- WeekdayPicker -->
     <!-- User Entry -->
+    <!-- HardLimits -->
     <plurals name="days">
         <item quantity="one">%1$d día</item>
         <item quantity="other">%1$d días</item>
diff --git a/core/src/main/res/values-es-rES/validator.xml b/core/src/main/res/values-es-rES/validator.xml
index 3ea04e700d..dd7ef290d9 100644
--- a/core/src/main/res/values-es-rES/validator.xml
+++ b/core/src/main/res/values-es-rES/validator.xml
@@ -1,2 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
+<resources>
+    <string name="error_only_numeric_digits_allowed">Sólo se permiten caracteres numéricos.</string>
+    <string name="error_only_numeric_digits_range_allowed">Sólo se permiten dígitos en el rango %1$s - %2$s.</string>
+    <string name="error_this_field_cannot_contain_special_character">Este campo no puede contener caracteres especiales</string>
+    <string name="error_only_standard_letters_are_allowed">Sólo se permiten letras estándar</string>
+    <string name="error_field_must_not_be_empty">Este campo no puede estar vacío</string>
+    <string name="error_email_address_not_valid">Correo electrónico no válido</string>
+    <string name="error_creditcard_number_not_valid">Número de tarjeta de crédito no es válido</string>
+    <string name="error_phone_not_valid">Número de teléfono no válido</string>
+    <string name="error_domain_not_valid">Nombre de dominio no válido</string>
+    <string name="error_ip_not_valid">Dirección IP no válida</string>
+    <string name="error_url_not_valid">Web Url no es válida</string>
+    <string name="error_notvalid_personname">Nombre o apellido no válido.</string>
+    <string name="error_notvalid_personfullname">No es válido el nombre completo.</string>
+    <string name="error_date_not_valid">Formato no válido</string>
+    <string name="error_mustbe4digitnumber">Debe ser un número de 4 dígitos</string>
+    <string name="error_mustbe6digitnumber">Debe ser un número de 6 dígitos</string>
+    <string name="error_not_a_minimum_length">No supera la longitud mínima</string>
+    <string name="error_pin_not_valid">El Pin debe tener de 3 a 6 dígitos, no el mismo ni en serie</string>
+</resources>
diff --git a/core/src/main/res/values-fr-rFR/strings.xml b/core/src/main/res/values-fr-rFR/strings.xml
index 2534f6f3fd..756cafcab6 100644
--- a/core/src/main/res/values-fr-rFR/strings.xml
+++ b/core/src/main/res/values-fr-rFR/strings.xml
@@ -11,7 +11,7 @@
     <string name="tempbasaldeliveryerror">Erreur injection basal temporaire</string>
     <string name="goingtodeliver">%1$.2f U vont être injectées</string>
     <string name="waitingforpump">Attente connection pompe</string>
-    <string name="connectingfor">Connexion à %1$d en cours</string>
+    <string name="connectingfor">Connexion en cours : %1$d sec.</string>
     <string name="bolusdelivering">%1$.2f U ont été injectées</string>
     <string name="handshaking">Connexion</string>
     <string name="connecting">Connection en cours</string>
@@ -81,7 +81,6 @@
     <string name="extended_bolus">Bolus étendu</string>
     <string name="pump_time_updated">Mise à jour de l\'heure de la pompe</string>
     <string name="exit">Quitter</string>
-    <string name="serial_number">Numéro de série</string>
     <string name="removerecord">Supprimer l\'enregistrement</string>
     <string name="loopisdisabled">La Boucle est désactivée</string>
     <string name="alarm">Alarme</string>
@@ -105,6 +104,7 @@
     <string name="notes_label">Notes</string>
     <string name="remove_button">Supprimer</string>
     <string name="addnew">Ajouter</string>
+    <string name="wrong_pump_data">Les données proviennent de différentes pompes. Changer le pilote de la pompe pour réinitialiser l\'état de la pompe.</string>
     <!--    Constraints-->
     <string name="limitingbasalratio">Limiter le débit de basal max à %1$.2f U/h à cause de %2$s</string>
     <string name="pumplimit">Limite de la pompe</string>
@@ -154,6 +154,7 @@
     <string name="profile_carbs_per_unit">g/U</string>
     <!--    ProfileFunction-->
     <string name="noprofileselected">Aucun profil séléctionné</string>
+    <string name="startprofile">Démarrer le profil %1$d%% pour %2$d min</string>
     <!--    PumpType-->
     <string name="def_extended_note">* Uniquement les valeurs unitaires sont acceptées. Les plages pour les basal/bolus ne sont pas supportées par les pompes virtuelles.</string>
     <!--    APSResult-->
@@ -194,7 +195,8 @@
     <string name="careportal_carbscorrection">Ressucrage</string>
     <string name="careportal_openapsoffline">OpenAPS hors ligne</string>
     <string name="careportal_pumpbatterychange">Changement pile pompe</string>
-    <string name="careportal_temporarytarget">Cible temp.</string>
+    <string name="careportal_temporarytarget">Cible Temp</string>
+    <string name="careportal_temporarytargetvalue">Valeur de Cible Temporaire</string>
     <string name="careportal_temporarytargetcancel">Annuler Cible Temporaire</string>
     <string name="boluswizard">Assistant Bolus</string>
     <string name="glucosetype_finger">Doigt</string>
@@ -207,6 +209,10 @@
     <string name="wear">Montre</string>
     <string name="automation">Automatisation</string>
     <string name="custom">Manuel</string>
+    <string name="pump">Pompe</string>
+    <string name="loop">Boucle</string>
+    <string name="ns">NS</string>
+    <string name="record">Enregistrement</string>
     <!--    Command-->
     <string name="connectiontimedout">Connexion expirée</string>
     <!--    PumpEnactResult-->
@@ -238,30 +244,6 @@
     <!--    Ntp-->
     <string name="timedetection">Détection de temps</string>
     <string name="format_hour_minute">%1$dh%2$dm</string>
-    <!-- PumoCommon - Pump Abstract -->
-    <string name="pump_operation_not_supported_by_pump_driver">Opération non prise en charge par la pompe et/ou le pilote.</string>
-    <string name="pump_operation_not_yet_supported_by_pump">Opération non ENCORE supportée par la pompe.</string>
-    <string name="common_resultok">OK</string>
-    <!-- PumoCommon - Pump Status -->
-    <string name="pump_status_never_contacted">Jamais contacté</string>
-    <string name="pump_status_waking_up">Réveil en cours</string>
-    <string name="pump_status_error_comm">Erreur de communication</string>
-    <string name="pump_status_timeout_comm">Expiration du délai d\'attente en communication</string>
-    <string name="pump_status_pump_unreachable">Pompe hors de portée</string>
-    <string name="pump_status_invalid_config">Configuration non valable</string>
-    <string name="pump_status_active">Activé</string>
-    <string name="pump_status_sleeping">En veille</string>
-    <!-- PumpCommon - History Group -->
-    <string name="history_group_basal">Basals</string>
-    <string name="history_group_configuration">Configurations</string>
-    <string name="history_group_notification">Notifications</string>
-    <string name="history_group_statistic">Statistiques</string>
-    <string name="history_group_unknown">Inconnus</string>
-    <string name="history_group_all">Tous</string>
-    <string name="history_group_bolus">Bolus</string>
-    <string name="history_group_prime">Amorcer</string>
-    <string name="history_group_alarm">Alarmes</string>
-    <string name="history_group_glucose">Glucose</string>
     <string name="mute5min">Muet pendant 5 minutes</string>
     <!-- Maintenance -->
     <string name="metadata_label_format">Format de fichier</string>
@@ -320,6 +302,7 @@
     <string name="uel_carbs">GLUCIDES</string>
     <string name="uel_extended_carbs">GLUCIDES ÉTENDUS</string>
     <string name="uel_temp_basal">BASAL TEMP</string>
+    <string name="uel_tt">CIBLE TEMP</string>
     <string name="uel_new_profile">NOUVEAU PROFIL</string>
     <string name="uel_clone_profile">PROFIL DUPLIQUÉ</string>
     <string name="uel_store_profile">PROFIL SAUVEGARDÉ</string>
@@ -338,23 +321,33 @@
     <string name="uel_clear_pairing_keys">CLÉS D\'APPAIRAGE EFFACÉES</string>
     <string name="uel_accepts_temp_basal">TEMP BASAL ACCEPTÉE</string>
     <string name="uel_cancel_temp_basal">TEMP BASAL ANNULÉE</string>
+    <string name="uel_cancel_bolus">ANNULER BOLUS</string>
     <string name="uel_cancel_extended_bolus">BOLUS ÉTENDU ANNULÉ</string>
+    <string name="uel_cancel_tt">ANNULER CIBLE TEMP</string>
     <string name="uel_careportal">CAREPORTAL</string>
+    <string name="uel_site_change">CHANGEMENT DE SITE</string>
+    <string name="uel_reservoir_change">CHANGEMENT DU RÉSERVOIR</string>
     <string name="uel_calibration">ÉTALONNAGE</string>
     <string name="uel_prime_bolus">BOLUS D\'AMORÇAGE</string>
     <string name="uel_treatment">TRAITEMENT</string>
     <string name="uel_careportal_ns_refresh">CAREPORTAL ACTU NS</string>
     <string name="uel_profile_switch_ns_refresh">CHANGEMENT DE PROFIL ACTU NS</string>
     <string name="uel_treatments_ns_refresh">TREATMENTS ACTU NS</string>
+    <string name="uel_tt_ns_refresh">RÉGÉNÉRATION NS CIBLES TEMP</string>
     <string name="uel_automation_removed">AUTOMATISATION SUPPRIMÉE</string>
     <string name="uel_bg_removed">GLY SUPPRIMÉE</string>
     <string name="uel_careportal_removed">CAREPORTAL SUPPRIMÉ</string>
+    <string name="uel_bolus_removed">BOLUS SUPPRIMÉ</string>
+    <string name="uel_carbs_removed">GLUCIDES SUPPRIMÉS</string>
+    <string name="uel_temp_basal_removed">BASAL TEMP SUPPRIMÉ</string>
     <string name="uel_extended_bolus_removed">BOLUS ÉTENDU SUPPRIMÉ</string>
+    <string name="uel_food">ALIMENTS</string>
     <string name="uel_food_removed">ALIMENT SUPPRIMÉ</string>
     <string name="uel_profile_removed">PROFIL SUPPRIMÉ</string>
     <string name="uel_profile_switch_removed">CHANGEMENT DE PROFIL SUPPRIMÉ</string>
     <string name="uel_restart_events_removed">REDÉMARRAGES SUPPRIMÉS</string>
     <string name="uel_treatment_removed">TRAITEMENT SUPPRIMÉ</string>
+    <string name="uel_tt_removed">CIBLE TEMP SUPPRIMÉE</string>
     <string name="uel_ns_paused">PAUSE NS</string>
     <string name="uel_ns_resume">REPRISE NS</string>
     <string name="uel_ns_queue_cleared">QUEUE NS SUPPRIMÉE</string>
@@ -375,9 +368,38 @@
     <string name="uel_import_databases">BASE DE DONNÉES IMPORTÉE</string>
     <string name="uel_otp_export">OTP EXPORTÉ</string>
     <string name="uel_otp_reset">OTP RÉINITIALISÉ</string>
+    <string name="uel_stop_sms">ARRÊTER SMS</string>
     <string name="uel_export_csv">ENTRÉES UTILISATEUR EXPORTÉES</string>
+    <string name="uel_start_aaps">DÉMARRER AAPS</string>
+    <string name="uel_exit_aaps">QUITTER AAPS</string>
+    <string name="uel_plugin_enabled">PLUGIN ACTIVÉ</string>
+    <string name="uel_plugin_disabled">PLUGIN DÉSACTIVÉ</string>
     <string name="uel_unknown">INCONNU</string>
+    <string name="ue_string">Chaîne</string>
+    <string name="ue_source">Source</string>
+    <string name="ue_utc_offset">Décalage UTC</string>
+    <string name="ue_action">Action</string>
+    <string name="ue_timestamp">Horodatage</string>
+    <string name="ue_none">Aucune unité</string>
     <string name="ue_export_to_csv">Exporter les entrées utilisateur vers Excel (csv)</string>
+    <string name="uel_loop_change">BOUCLE CHANGÉE</string>
+    <string name="uel_loop_removed">BOUCLE SUPPRIMÉE</string>
+    <string name="uel_other">AUTRE</string>
+    <!-- HardLimits -->
+    <string name="profile_low_target">Cible basse du profil</string>
+    <string name="profile_high_target">Cible haute du profil</string>
+    <string name="temp_target_low_target">Valeur basse de Cible Temp.</string>
+    <string name="temp_target_high_target">Valeur haute de Cible Temp.</string>
+    <string name="temp_target_value">Valeur de Cible Temporaire</string>
+    <string name="profile_dia">Valeur DAI du profil</string>
+    <string name="profile_sensitivity_value">Valeur de sensibilité du profil</string>
+    <string name="profile_max_daily_basal_value">Basale maximale du profil</string>
+    <string name="current_basal_value">Basale actuelle</string>
+    <string name="profile_carbs_ratio_value">Rapport glucides/insuline de profil</string>
+    <string name="valuelimitedto">%1$.2f limité à %2$.2f</string>
+    <string name="valueoutofrange">\"%1$s\" est en dehors des limites</string>
+    <string name="value_out_of_hard_limits">\"%1$s\" %2$.2f est en dehors des limites</string>
+    <string name="basal_value">Valeur de Basal</string>
     <plurals name="days">
         <item quantity="one">%1$d jour</item>
         <item quantity="other">%1$d jours</item>
diff --git a/core/src/main/res/values-ga-rIE/strings.xml b/core/src/main/res/values-ga-rIE/strings.xml
index 3ff1d499cd..ee54ad0c0e 100644
--- a/core/src/main/res/values-ga-rIE/strings.xml
+++ b/core/src/main/res/values-ga-rIE/strings.xml
@@ -46,6 +46,16 @@
     <string name="bluetooth">Bluetooth</string>
     <string name="yes">Tá</string>
     <string name="no">Níl</string>
+    <string name="loopdisabled">LÚB DÍCHUMASAITHE LE SRIANTA</string>
+    <string name="disableloop">Díchumasaigh lúb</string>
+    <string name="enableloop">Cumasaigh lúb</string>
+    <string name="resumeloop">Lúb Atosú</string>
+    <string name="suspendloop">Fionraí lúb</string>
+    <string name="glucose">Glúcóis</string>
+    <string name="name_short">Ainm:</string>
+    <string name="time">Am</string>
+    <string name="ns_wifi_ssids">WiFi SSID</string>
+    <string name="addnew">Cuir nua</string>
     <!--    Constraints-->
     <!--    Dialogs-->
     <string name="confirmation">Deimhniú</string>
@@ -96,6 +106,7 @@
     <string name="careportal_insulincartridgechange">Athrú Cartús Inslin</string>
     <string name="glucosetype_finger">Méar</string>
     <string name="glucosetype_sensor">Braiteoir</string>
+    <string name="activity">Gníomhaíocht</string>
     <!--    Command-->
     <!--    PumpEnactResult-->
     <string name="comment">Tuairim</string>
@@ -115,19 +126,10 @@
     <string name="tbb2">TBB * 2</string>
     <!--    Ntp-->
     <string name="format_hour_minute">%1$du %2$dn</string>
-    <!-- PumoCommon - Pump Abstract -->
-    <string name="common_resultok">Ceart go leor</string>
-    <!-- PumoCommon - Pump Status -->
-    <string name="pump_status_active">Gníomhach</string>
-    <!-- PumpCommon - History Group -->
-    <string name="history_group_basal">Bunaidhi</string>
-    <string name="history_group_all">Ar fad</string>
-    <string name="history_group_bolus">Bólasi</string>
-    <string name="history_group_alarm">Aláraim</string>
-    <string name="history_group_glucose">Glúcóis</string>
     <!-- Maintenance -->
     <!-- VersionChecker -->
     <!-- Permissions -->
     <!-- WeekdayPicker -->
     <!-- User Entry -->
+    <!-- HardLimits -->
 </resources>
diff --git a/core/src/main/res/values-hr-rHR/strings.xml b/core/src/main/res/values-hr-rHR/strings.xml
index a1a4975ce9..0a9e749b51 100644
--- a/core/src/main/res/values-hr-rHR/strings.xml
+++ b/core/src/main/res/values-hr-rHR/strings.xml
@@ -20,12 +20,10 @@
     <!--    CarbsReq-->
     <!--    TDDStatsActivity-->
     <!--    Ntp-->
-    <!-- PumoCommon - Pump Abstract -->
-    <!-- PumoCommon - Pump Status -->
-    <!-- PumpCommon - History Group -->
     <!-- Maintenance -->
     <!-- VersionChecker -->
     <!-- Permissions -->
     <!-- WeekdayPicker -->
     <!-- User Entry -->
+    <!-- HardLimits -->
 </resources>
diff --git a/core/src/main/res/values-it-rIT/strings.xml b/core/src/main/res/values-it-rIT/strings.xml
index 5bea9521a6..8ee67e1382 100644
--- a/core/src/main/res/values-it-rIT/strings.xml
+++ b/core/src/main/res/values-it-rIT/strings.xml
@@ -81,7 +81,6 @@
     <string name="extended_bolus">Bolo esteso</string>
     <string name="pump_time_updated">Ora del micro aggiornata</string>
     <string name="exit">Esci</string>
-    <string name="serial_number">Numero seriale</string>
     <string name="removerecord">Rimuovi record</string>
     <string name="loopisdisabled">Il loop è disabilitato</string>
     <string name="alarm">Allarme</string>
@@ -105,6 +104,7 @@
     <string name="notes_label">Note</string>
     <string name="remove_button">Rimuovi</string>
     <string name="addnew">Aggiungi nuovo</string>
+    <string name="wrong_pump_data">I dati arrivano da un micro differente. Cambia il driver del micro per resettarne lo stato.</string>
     <!--    Constraints-->
     <string name="limitingbasalratio">Limitazione max velocità basale a %1$.2f U/h a causa di: %2$s</string>
     <string name="pumplimit">limite micro</string>
@@ -154,6 +154,7 @@
     <string name="profile_carbs_per_unit">g/U</string>
     <!--    ProfileFunction-->
     <string name="noprofileselected">Nessun profilo selezionato</string>
+    <string name="startprofile">Avvia profilo %1$d%% per %2$d min</string>
     <!--    PumpType-->
     <string name="def_extended_note">* Sono supportati solo valori discreti, non intervalli di valori, come incrementi per basale/bolo nel micro virtuale.</string>
     <!--    APSResult-->
@@ -207,6 +208,10 @@
     <string name="wear">Smartwatch</string>
     <string name="automation">Automazione</string>
     <string name="custom">Personalizzato</string>
+    <string name="pump">Micro</string>
+    <string name="loop">Loop</string>
+    <string name="ns">NS</string>
+    <string name="record">Record</string>
     <!--    Command-->
     <string name="connectiontimedout">Time out connessione</string>
     <!--    PumpEnactResult-->
@@ -238,30 +243,6 @@
     <!--    Ntp-->
     <string name="timedetection">Rilevamento tempo</string>
     <string name="format_hour_minute">%1$dh %2$dm</string>
-    <!-- PumoCommon - Pump Abstract -->
-    <string name="pump_operation_not_supported_by_pump_driver">Operazione non supportata dal micro e/o dal driver.</string>
-    <string name="pump_operation_not_yet_supported_by_pump">Operazione NON ANCORA supportata dal micro.</string>
-    <string name="common_resultok">OK</string>
-    <!-- PumoCommon - Pump Status -->
-    <string name="pump_status_never_contacted">Mai connesso</string>
-    <string name="pump_status_waking_up">Risveglio</string>
-    <string name="pump_status_error_comm">Errore nella comunicazione</string>
-    <string name="pump_status_timeout_comm">Timeout della comunicazione</string>
-    <string name="pump_status_pump_unreachable">Micro irraggiungibile</string>
-    <string name="pump_status_invalid_config">Configurazione non valida</string>
-    <string name="pump_status_active">Attivo</string>
-    <string name="pump_status_sleeping">In sospensione</string>
-    <!-- PumpCommon - History Group -->
-    <string name="history_group_basal">Basali</string>
-    <string name="history_group_configuration">Configurazioni</string>
-    <string name="history_group_notification">Notifiche</string>
-    <string name="history_group_statistic">Statistiche</string>
-    <string name="history_group_unknown">Sconosciuti</string>
-    <string name="history_group_all">Tutto</string>
-    <string name="history_group_bolus">Boli</string>
-    <string name="history_group_prime">Caricamento</string>
-    <string name="history_group_alarm">Allarmi</string>
-    <string name="history_group_glucose">Glicemia</string>
     <string name="mute5min">Muto per 5 minuti</string>
     <!-- Maintenance -->
     <string name="metadata_label_format">Formato file</string>
@@ -320,7 +301,7 @@
     <string name="uel_carbs">CHO</string>
     <string name="uel_extended_carbs">CHO ESTESI</string>
     <string name="uel_temp_basal">BASALE TEMPORANEA</string>
-    <string name="uel_tt">TT</string>
+    <string name="uel_tt">TARGET TEMPORANEO</string>
     <string name="uel_new_profile">NUOVO PROFILO</string>
     <string name="uel_clone_profile">CLONA PROFILO</string>
     <string name="uel_store_profile">MEMORIZZA PROFILO</string>
@@ -339,26 +320,33 @@
     <string name="uel_clear_pairing_keys">CANCELLA CHIAVI DI ASSOCIAZIONE</string>
     <string name="uel_accepts_temp_basal">ACCETTA BASALE TEMPORANEA</string>
     <string name="uel_cancel_temp_basal">CANCELLA BASALE TEMPORANEA</string>
+    <string name="uel_cancel_bolus">CANCELLA BOLO</string>
     <string name="uel_cancel_extended_bolus">CANCELLA BOLO ESTESO</string>
-    <string name="uel_cancel_tt">CANCELLA TT</string>
+    <string name="uel_cancel_tt">CANCELLA TARGET TEMPORANEO</string>
     <string name="uel_careportal">PORTALE</string>
+    <string name="uel_site_change">CAMBIO POSIZIONE CANNULA</string>
+    <string name="uel_reservoir_change">CAMBIO SERBATOIO</string>
     <string name="uel_calibration">CALIBRAZIONE</string>
     <string name="uel_prime_bolus">BOLO DI CARICAMENTO</string>
     <string name="uel_treatment">TRATTAMENTO</string>
-    <string name="uel_careportal_ns_refresh">PORTALE NS AGGIORNAMENTO</string>
-    <string name="uel_profile_switch_ns_refresh">CAMBIO PROFILO NS AGGIORNAMENTO</string>
-    <string name="uel_treatments_ns_refresh">TRATTAMENTI NS AGGIORNAMENTO</string>
-    <string name="uel_tt_ns_refresh">TT NS AGGIORNAMENTO</string>
+    <string name="uel_careportal_ns_refresh">PORTALE NS: AGGIORNAMENTO</string>
+    <string name="uel_profile_switch_ns_refresh">CAMBIO PROFILO NS: AGGIORNAMENTO</string>
+    <string name="uel_treatments_ns_refresh">TRATTAMENTI NS: AGGIORNAMENTO</string>
+    <string name="uel_tt_ns_refresh">TARGET TEMPORANEO NS: AGGIORNAMENTO</string>
     <string name="uel_automation_removed">AUTOMAZIONE RIMOSSA</string>
     <string name="uel_bg_removed">BG RIMOSSO</string>
     <string name="uel_careportal_removed">PORTALE RIMOSSO</string>
+    <string name="uel_bolus_removed">BOLO RIMOSSO</string>
+    <string name="uel_carbs_removed">CHO RIMOSSI</string>
+    <string name="uel_temp_basal_removed">BASALE TEMPORANEA RIMOSSA</string>
     <string name="uel_extended_bolus_removed">BOLO ESTESO RIMOSSO</string>
+    <string name="uel_food">CIBO</string>
     <string name="uel_food_removed">CIBO RIMOSSO</string>
     <string name="uel_profile_removed">PROFILO RIMOSSO</string>
     <string name="uel_profile_switch_removed">CAMBIO PROFILO RIMOSSO</string>
     <string name="uel_restart_events_removed">EVENTI DI RIAVVIO RIMOSSI</string>
     <string name="uel_treatment_removed">TRATTAMENTO RIMOSSO</string>
-    <string name="uel_tt_removed">TT RIMOSSO</string>
+    <string name="uel_tt_removed">TARGET TEMPORANEO RIMOSSO</string>
     <string name="uel_ns_paused">NS IN PAUSA</string>
     <string name="uel_ns_resume">NS RIPRESA</string>
     <string name="uel_ns_queue_cleared">CODA NS CANCELLATA</string>
@@ -379,10 +367,38 @@
     <string name="uel_import_databases">IMPORTA DATABASE</string>
     <string name="uel_otp_export">ESPORTAZIONE OTP</string>
     <string name="uel_otp_reset">RESET OTP</string>
+    <string name="uel_stop_sms">STOP SMS</string>
     <string name="uel_export_csv">ESPORTA VOCI UTENTE</string>
+    <string name="uel_start_aaps">AVVIA AAPS</string>
+    <string name="uel_exit_aaps">USCITA AAPS</string>
+    <string name="uel_plugin_enabled">PLUGIN ABILITATO</string>
+    <string name="uel_plugin_disabled">PLUGIN DISABILITATO</string>
     <string name="uel_unknown">SCONOSCIUTO</string>
+    <string name="ue_string">Stringa</string>
+    <string name="ue_source">Fonte</string>
+    <string name="ue_utc_offset">Offset UTC</string>
+    <string name="ue_action">Azione</string>
+    <string name="ue_timestamp">Data e ora</string>
+    <string name="ue_none">Nessuna unità</string>
     <string name="ue_export_to_csv">Esporta voci utente in Excel (csv)</string>
-    <string name="ue_csv_header">"Timestamp;Date;UTC Offset;Action;Note;Value;Unit"</string>
+    <string name="uel_loop_change">LOOP CAMBIATO</string>
+    <string name="uel_loop_removed">LOOP RIMOSSO</string>
+    <string name="uel_other">ALTRO</string>
+    <!-- HardLimits -->
+    <string name="profile_low_target">Target basso (profilo)</string>
+    <string name="profile_high_target">Target alto (profilo)</string>
+    <string name="temp_target_low_target">Valore inferiore target temporaneo</string>
+    <string name="temp_target_high_target">Valore superiore target temporaneo</string>
+    <string name="temp_target_value">Valore target temporaneo</string>
+    <string name="profile_dia">Valore DIA (profilo)</string>
+    <string name="profile_sensitivity_value">Valore sensibilità (profilo)</string>
+    <string name="profile_max_daily_basal_value">Valore max basale (profilo)</string>
+    <string name="current_basal_value">Valore basale corrente</string>
+    <string name="profile_carbs_ratio_value">Valore rapporto CHO (profilo)</string>
+    <string name="valuelimitedto">%1$.2f limitato a %2$.2f</string>
+    <string name="valueoutofrange">»%1$s« è fuori dai limiti consentiti</string>
+    <string name="value_out_of_hard_limits">»%1$s« %2$.2f è fuori dai limiti consentiti</string>
+    <string name="basal_value">Valore basale</string>
     <plurals name="days">
         <item quantity="one">%1$d giorno</item>
         <item quantity="other">%1$d giorni</item>
diff --git a/core/src/main/res/values-iw-rIL/strings.xml b/core/src/main/res/values-iw-rIL/strings.xml
index 66f913c07c..c62d2a2dfe 100644
--- a/core/src/main/res/values-iw-rIL/strings.xml
+++ b/core/src/main/res/values-iw-rIL/strings.xml
@@ -81,7 +81,6 @@
     <string name="extended_bolus">בולוס ממושך</string>
     <string name="pump_time_updated">שעון המשאבה עודכן</string>
     <string name="exit">יציאה</string>
-    <string name="serial_number">מספר סידורי</string>
     <string name="removerecord">מחיקת רשומה</string>
     <string name="loopisdisabled">הלולאה מושבתת</string>
     <string name="alarm">התראה</string>
@@ -105,6 +104,7 @@
     <string name="notes_label">הערות</string>
     <string name="remove_button">הסרה</string>
     <string name="addnew">הוסף חדש</string>
+    <string name="wrong_pump_data">הנתונים מגיעים ממשאבה אחרת. בחרו מחדש את סוג המשאבה כדי לאפס את מצב המשאבה.</string>
     <!--    Constraints-->
     <string name="limitingbasalratio">מגביל את הקצב הבזאלי המרבי ל-%1$.2f יח\' לשעה בגלל %2$s</string>
     <string name="pumplimit">מגבלת משאבה</string>
@@ -154,6 +154,7 @@
     <string name="profile_carbs_per_unit">גר\'\\יח\'</string>
     <!--    ProfileFunction-->
     <string name="noprofileselected">לא נבחר פרופיל</string>
+    <string name="startprofile">הפעלת פרופיל %1$d%% במשך %2$d דק\'</string>
     <!--    PumpType-->
     <string name="def_extended_note">* רק ערכים בדידים, טווחים אינם נתמכים עבור ערכי בזאלי ובולוס במשאבה וירטואלית.</string>
     <!--    APSResult-->
@@ -195,6 +196,7 @@
     <string name="careportal_openapsoffline">OpenAPS במצב לא מקוון</string>
     <string name="careportal_pumpbatterychange">החלפת סוללת משאבה</string>
     <string name="careportal_temporarytarget">ערך מטרה זמני</string>
+    <string name="careportal_temporarytargetvalue">ערך המטרה הזמני</string>
     <string name="careportal_temporarytargetcancel">ביטול ערך מטרה זמני</string>
     <string name="boluswizard">אשף בולוס</string>
     <string name="glucosetype_finger">אצבע</string>
@@ -207,6 +209,10 @@
     <string name="wear">Wear</string>
     <string name="automation">אוטומציה</string>
     <string name="custom">מותאם אישית</string>
+    <string name="pump">משאבה</string>
+    <string name="loop">לולאה</string>
+    <string name="ns">נייטסקאוט</string>
+    <string name="record">הקלטה</string>
     <!--    Command-->
     <string name="connectiontimedout">החיבור חרג ממגבלת הזמן</string>
     <!--    PumpEnactResult-->
@@ -238,30 +244,6 @@
     <!--    Ntp-->
     <string name="timedetection">זיהוי שעה</string>
     <string name="format_hour_minute">%1$d ש\' %2$d דק\'</string>
-    <!-- PumoCommon - Pump Abstract -->
-    <string name="pump_operation_not_supported_by_pump_driver">הפעולה לא נתמכת ע\"י המשאבה ו\\או מנהל התקן.</string>
-    <string name="pump_operation_not_yet_supported_by_pump">הפעולה עוד לא נתמכת על ידי המשאבה.</string>
-    <string name="common_resultok">אישור</string>
-    <!-- PumoCommon - Pump Status -->
-    <string name="pump_status_never_contacted">מעולם לא נוצר קשר</string>
-    <string name="pump_status_waking_up">מתעורר</string>
-    <string name="pump_status_error_comm">שגיאת תקשורת</string>
-    <string name="pump_status_timeout_comm">חריגה ממגבלת הזמן לתקשורת</string>
-    <string name="pump_status_pump_unreachable">המשאבה לא זמינה</string>
-    <string name="pump_status_invalid_config">קונפיגורציה לא חוקית</string>
-    <string name="pump_status_active">פעיל</string>
-    <string name="pump_status_sleeping">ישן</string>
-    <!-- PumpCommon - History Group -->
-    <string name="history_group_basal">בזאלים</string>
-    <string name="history_group_configuration">קונפיגורציות</string>
-    <string name="history_group_notification">התראות</string>
-    <string name="history_group_statistic">סטטיסטיקה</string>
-    <string name="history_group_unknown">לא ידועים</string>
-    <string name="history_group_all">כל</string>
-    <string name="history_group_bolus">בולוסים</string>
-    <string name="history_group_prime">תיחול</string>
-    <string name="history_group_alarm">התראות</string>
-    <string name="history_group_glucose">גלוקוז</string>
     <string name="mute5min">השתקה ל-5 דקות</string>
     <!-- Maintenance -->
     <string name="metadata_label_format">פורמט הקובץ</string>
@@ -320,6 +302,7 @@
     <string name="uel_carbs">פחמימות</string>
     <string name="uel_extended_carbs">פחמימות מורכבות</string>
     <string name="uel_temp_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>
@@ -338,23 +321,33 @@
     <string name="uel_clear_pairing_keys">מחיקת מפתחות זיווג</string>
     <string name="uel_accepts_temp_basal">מקבל מינוני בזאלי זמניים</string>
     <string name="uel_cancel_temp_basal">ביטול בזאלי זמני</string>
+    <string name="uel_cancel_bolus">ביטול בולוס</string>
     <string name="uel_cancel_extended_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">בולוס תיחול</string>
     <string name="uel_treatment">טיפול</string>
     <string name="uel_careportal_ns_refresh">רענון פורטל הטיפולים בנייטסקאוט</string>
     <string name="uel_profile_switch_ns_refresh">רענון החלפת פרופיל בנייטסקאוט</string>
     <string name="uel_treatments_ns_refresh">רענון הטיפולים בנייטסקאוט</string>
+    <string name="uel_tt_ns_refresh">רענון מטרה זמנית מנייטסקאוט</string>
     <string name="uel_automation_removed">האוטומציה הוסרה</string>
     <string name="uel_bg_removed">ערך סוכר נמחק</string>
     <string name="uel_careportal_removed">פורטל הטיפולים הוסר</string>
+    <string name="uel_bolus_removed">בולוס נמחק</string>
+    <string name="uel_carbs_removed">פחמימות סולקו</string>
+    <string name="uel_temp_basal_removed">מינון בזאלי זמני סולק</string>
     <string name="uel_extended_bolus_removed">בולוס ממושך הוסר</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">נייטסקאוט הושהה</string>
     <string name="uel_ns_resume">נייטסקאוט חודש</string>
     <string name="uel_ns_queue_cleared">תור נייטסקאוט נוקה</string>
@@ -375,9 +368,38 @@
     <string name="uel_import_databases">ייבוא מסדי נתונים</string>
     <string name="uel_otp_export">ייצוא סיסמה חד פעמית (OTP)</string>
     <string name="uel_otp_reset">איפוס סיסמה חד פעמית (OTP)</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">יציאה</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">ללא יחידה</string>
     <string name="ue_export_to_csv">יצוא ערכי משתמש לאקסל (csv)</string>
+    <string name="uel_loop_change">הלולאה שונתה</string>
+    <string name="uel_loop_removed">הלולאה הוסרה</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">מינון בזאלי מרבי של הפרופיל</string>
+    <string name="current_basal_value">מינון בזאלי נוכחי</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">ערך בזאלי</string>
     <plurals name="days">
         <item quantity="one">%1$d יום</item>
         <item quantity="two">%1$d ימים</item>
diff --git a/core/src/main/res/values-ko-rKR/strings.xml b/core/src/main/res/values-ko-rKR/strings.xml
index 931e30637c..b86cec36ae 100644
--- a/core/src/main/res/values-ko-rKR/strings.xml
+++ b/core/src/main/res/values-ko-rKR/strings.xml
@@ -2,43 +2,410 @@
 <resources>
     <!--    Keys-->
     <!--    General-->
+    <string name="refresh">새로고침</string>
+    <string name="error">에러</string>
+    <string name="not_set_short">설정되지 않음</string>
+    <string name="failedupdatebasalprofile">Basal 프로파일 갱신 실패</string>
+    <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>
+    <string name="disconnected">연결 끊김</string>
+    <string name="disconnecting">연결끊기중</string>
+    <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>
+    <string name="format_mins">%1$d 분</string>
+    <string name="pumpbusy">펌프가 바쁩니다</string>
+    <string name="connectionerror">펌프 연결 에러</string>
+    <string name="youareonallowedlimit">허용된 제한값에 도달하였습니다</string>
+    <string name="objectives">목표</string>
+    <string name="close">닫기</string>
+    <string name="please_wait">잠시 기다려 주세요...</string>
+    <string name="mute">음소거</string>
+    <string name="reload">새로고침</string>
+    <string name="stoppressed">정지 누름</string>
+    <string name="stop">정지</string>
+    <string name="carbs">탄수화물</string>
+    <string name="invalidprofile">프로파일이 유효하지 않습니다!!!</string>
+    <string name="noprofileset">프로파일이 설정되지 않았습니다.</string>
+    <string name="date">날짜</string>
+    <string name="units_label">단위</string>
+    <string name="dia_label">인슐린활동시간(DIA):</string>
+    <string name="ic_label">인슐린 대 탄수화물 비율(IC):</string>
+    <string name="isf_label">인슐린 민감도(ISF):</string>
+    <string name="basal_label">Basal</string>
+    <string name="target_label">목표:</string>
+    <string name="initializing">초기화중 ...</string>
+    <string name="serialnumber">시리얼번호</string>
+    <string name="battery_label">배터리</string>
+    <string name="lastconnection_label">마지막 접속</string>
+    <string name="lastbolus_label">최근 Bolus:</string>
+    <string name="dailyunits">일 인슐린 총량</string>
+    <string name="basebasalrate_label">기본 Basal양</string>
+    <string name="tempbasal_label">임시Basal</string>
+    <string name="virtualpump_extendedbolus_label">확장Bolus</string>
+    <string name="reservoir_label">인슐린 잔량</string>
+    <string name="pumphistory">펌프 이력</string>
+    <string name="viewprofile">프로파일 보기</string>
+    <string name="eventtype">이벤트 종류</string>
+    <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>
+    <string name="btwatchdog_summary">펌프에 연결이 되지 않을때 폰의 블루투스를 1초간 껐다 켭니다. 블루투스 스택이 정지되는 일부폰에 이 기능이 도움이 됩니다.</string>
+    <string name="pairing">동기화</string>
     <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>
+    <string name="unsafeusage">위험한 사용</string>
+    <string name="pump_unreachable">펌프에 연결할 수 없습니다.</string>
+    <string name="extended_bolus">확장 Bolus</string>
+    <string name="pump_time_updated">펌프 시간 업데이트</string>
+    <string name="exit">종료</string>
+    <string name="removerecord">기록 삭제</string>
+    <string name="loopisdisabled">Loop가 중지중입니다.</string>
+    <string name="alarm">알람</string>
+    <string name="disableloop">Loop 중지하기</string>
+    <string name="enableloop">Loop 실행하기</string>
+    <string name="resumeloop">Loop 재실행</string>
+    <string name="suspendloop">Loop 일시중지</string>
+    <string name="duration_min_label">기간 [min]</string>
+    <string name="notification">공지</string>
+    <string name="noprofile">아직 NS에서 프로파일을 로드하지 못했습니다.</string>
+    <string name="exists">존재합니다.</string>
+    <string name="notexists">존재하지 않습니다.</string>
+    <string name="glucose">혈당</string>
+    <string name="iob">IOB</string>
+    <string name="cob">COB</string>
+    <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>
+    <string name="limitingpercentrate">%2$s로 인해 최대 비율이 %1$d%%로 제한됩니다.</string>
+    <string name="itmustbepositivevalue">양의 값이어야 합니다.</string>
+    <string name="limitingbolus">%2$s로 인해 Bolus가 %1$.1f U로 제한됩니다.</string>
+    <string name="pumpNotInitializedProfileNotSet">펌프가 초기화와 프로파일 설정이 되지 않았습니다!</string>
     <!--    Dialogs-->
+    <string name="confirmation">확인</string>
+    <string name="message">메시지</string>
+    <string name="ok">네</string>
+    <string name="cancel">취소</string>
+    <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>
+    <string name="unit_second">초</string>
+    <string name="unit_minute">분</string>
+    <string name="unit_hour">시</string>
+    <string name="unit_day">일</string>
+    <string name="unit_week">주</string>
+    <string name="unit_seconds">초</string>
+    <string name="unit_minutes">분</string>
+    <string name="unit_hours">시</string>
+    <string name="unit_days">일</string>
+    <string name="unit_weeks">주</string>
+    <string name="shortminute">분</string>
+    <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>
+    <string name="maximumbasalvaluereplaced">지원되는 최대값으로 Basal값이 대체되었습니다:%1$s</string>
+    <string name="profile_per_unit">/U</string>
+    <string name="profile_ins_units_per_hour">U/h</string>
+    <string name="profile_carbs_per_unit">g/U</string>
     <!--    ProfileFunction-->
+    <string name="noprofileselected">프로파일이 선택되지 않았습니다</string>
+    <string name="startprofile">프로파일 %1$d%%을 %2$d 분 동안 시작</string>
     <!--    PumpType-->
+    <string name="def_extended_note">* 가상 펌프에서는 Basal/Bolus에 대해 범위로 지정이 될 수 없고, 이산값(discrete values)만 지원 됩니다.</string>
     <!--    APSResult-->
+    <string name="canceltemp">임시Basal 취소하기</string>
+    <string name="let_temp_basal_run">임시Basal 허용</string>
+    <string name="rate">주입량</string>
+    <string name="duration">기간</string>
+    <string name="reason">근거</string>
+    <string name="nochangerequested">변경사항 없음</string>
     <!--    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>
+    <string name="careportal_exercise">운동</string>
+    <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>
+    <string name="careportal_mealbolus">Meal Bolus</string>
+    <string name="careportal_correctionbolus">교정Bolus</string>
+    <string name="careportal_combobolus">콤보Bolus</string>
+    <string name="careportal_tempbasalstart">임시Basal 시작</string>
+    <string name="careportal_tempbasalend">임시Basal 종료</string>
+    <string name="careportal_carbscorrection">탄수화물 교정</string>
+    <string name="careportal_openapsoffline">OpenAPS 오프라인</string>
+    <string name="careportal_pumpbatterychange">펌프 배터리 교체</string>
+    <string name="careportal_temporarytarget">임시 목표</string>
+    <string name="careportal_temporarytargetcancel">임시 목표 취소</string>
+    <string name="boluswizard">Bolus 마법사</string>
+    <string name="glucosetype_finger">채혈</string>
+    <string name="glucosetype_sensor">센서</string>
+    <string name="manual">수동</string>
+    <string name="unknown">알수없음</string>
+    <string name="eatingsoon">식사직전</string>
+    <string name="hypo">저혈당</string>
+    <string name="activity">활동</string>
+    <string name="wear">워치</string>
+    <string name="automation">자동화</string>
+    <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-->
+    <string name="enacted">실행</string>
+    <string name="comment">의견</string>
+    <string name="success">성공</string>
+    <string name="percent">퍼센트</string>
+    <string name="absolute">절대값</string>
+    <string name="configbuilder_insulin">인슐린</string>
+    <string name="insulin_unit_shortname">U</string>
+    <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>
+    <string name="bolus">Bolus</string>
+    <string name="tdd">일총량</string>
+    <string name="ratio">비율</string>
+    <string name="amount_days">#일</string>
+    <string name="weight">가중</string>
+    <string name="warning_Message">교체/채움을 위해 Bolus를 사용한 경우 부정확할 수 있습니다!!</string>
+    <string name="olddata_Message">오래된 데이터입니다. \"새로고침\"을 누르세요.</string>
+    <string name="tbb">총 기본 Basal</string>
+    <string name="tbb2">총기초량 * 2</string>
     <!--    Ntp-->
-    <!-- PumoCommon - Pump Abstract -->
-    <string name="pump_operation_not_yet_supported_by_pump">펌프에서 지원되지 않는 작동.</string>
-    <!-- PumoCommon - Pump Status -->
-    <!-- PumpCommon - History Group -->
+    <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>
     <string name="versionavailable">%1$s 버전이 사용 가능합니다.</string>
     <!-- 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>
+    <plurals name="hours">
+        <item quantity="other">%1$d 시간</item>
+    </plurals>
+    <plurals name="minutes">
+        <item quantity="other">%1$d 분</item>
+    </plurals>
 </resources>
diff --git a/core/src/main/res/values-ko-rKR/validator.xml b/core/src/main/res/values-ko-rKR/validator.xml
index 3ea04e700d..f7ba8f1061 100644
--- a/core/src/main/res/values-ko-rKR/validator.xml
+++ b/core/src/main/res/values-ko-rKR/validator.xml
@@ -1,2 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
+<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/main/res/values-lt-rLT/strings.xml b/core/src/main/res/values-lt-rLT/strings.xml
index db446fc455..e22a9abecd 100644
--- a/core/src/main/res/values-lt-rLT/strings.xml
+++ b/core/src/main/res/values-lt-rLT/strings.xml
@@ -69,6 +69,26 @@
     <string name="pairing">Sujungiama</string>
     <string name="yes">Taip</string>
     <string name="no">Ne</string>
+    <string name="loopdisabled">CIKLAS NEAKTYVUS DĖL APRIBOJIMŲ</string>
+    <string name="bolusdelivered">%1$.2f vv bolusas sėkmingai suleistas</string>
+    <string name="novalidbasalrate">Jokio tinkamo bazės kiekio nenuskaityta iš pompos</string>
+    <string name="limitingmaxiob">Ribojamas maks AIO iki %1$.1f vv dėl %2$s</string>
+    <string name="unsafeusage">Nesaugus naudojimas</string>
+    <string name="pump_unreachable">Pompa nepasiekiama</string>
+    <string name="pump_time_updated">Pompos laikas pakeistas</string>
+    <string name="disableloop">Išjungti Ciklą</string>
+    <string name="enableloop">Įjungti Ciklą</string>
+    <string name="resumeloop">Atnaujinti ciklą</string>
+    <string name="suspendloop">Sustabdyti ciklą</string>
+    <string name="notification">Pranešimas</string>
+    <string name="noprofile">Dar negautas joks profilis iš NS</string>
+    <string name="exists">egzistuoja</string>
+    <string name="notexists">neegzistuoja</string>
+    <string name="glucose">Gliukozė</string>
+    <string name="name_short">Vardas:</string>
+    <string name="time">Laikas</string>
+    <string name="ns_wifi_ssids">WiFi pavadinimas</string>
+    <string name="addnew">Pridėti naują</string>
     <!--    Constraints-->
     <string name="limitingbasalratio">Ribojamas maksimalus bazės dydis%1$.2f vv/val dėl %2$s</string>
     <string name="pumplimit">pompos limitas</string>
@@ -117,6 +137,7 @@
     <string name="profile_carbs_per_unit">g/vv</string>
     <!--    ProfileFunction-->
     <string name="noprofileselected">Nepasirinktas profilis</string>
+    <string name="startprofile">Pradėti profilį %1$d%% %2$d min</string>
     <!--    PumpType-->
     <string name="def_extended_note">* Virtualioje pompoje palaikomos tik atskiros vertės, o ne diapazonas detalumui užtikrinti.</string>
     <!--    APSResult-->
@@ -156,10 +177,16 @@
     <string name="careportal_pumpbatterychange">Baterijos keitimas</string>
     <string name="careportal_temporarytarget">Laikinas tikslas</string>
     <string name="careportal_temporarytargetcancel">Laikino tikslo atšaukimas</string>
+    <string name="boluswizard">Boluso patarėjas</string>
     <string name="glucosetype_finger">Iš piršto</string>
     <string name="glucosetype_sensor">Iš sensoriaus</string>
     <string name="manual">Rankiniu būdu</string>
     <string name="unknown">nežinoma</string>
+    <string name="eatingsoon">Netrukus valgysiu</string>
+    <string name="hypo">Hipo</string>
+    <string name="wear">Išmanieji laikrodžiai</string>
+    <string name="automation">Automatiškai</string>
+    <string name="custom">Pasirinktinis</string>
     <!--    Command-->
     <string name="connectiontimedout">Prijungimo laikas baigėsi</string>
     <!--    PumpEnactResult-->
@@ -191,30 +218,6 @@
     <!--    Ntp-->
     <string name="timedetection">Laiko nustatymas</string>
     <string name="format_hour_minute">%1$dh %2$dm</string>
-    <!-- PumoCommon - Pump Abstract -->
-    <string name="pump_operation_not_supported_by_pump_driver">Pompa ir/ar jos valdiklis nepalaiko operacijos.</string>
-    <string name="pump_operation_not_yet_supported_by_pump">Pompa dar nepalaiko operacijos.</string>
-    <string name="common_resultok">Gerai</string>
-    <!-- PumoCommon - Pump Status -->
-    <string name="pump_status_never_contacted">Niekada nebuvo sujungta</string>
-    <string name="pump_status_waking_up">Pažadinimas</string>
-    <string name="pump_status_error_comm">Ryšio klaida</string>
-    <string name="pump_status_timeout_comm">Ryšiui skirtas laikas baigėsi</string>
-    <string name="pump_status_pump_unreachable">Pompa nepasiekiama</string>
-    <string name="pump_status_invalid_config">Neteisinga konfigūracija</string>
-    <string name="pump_status_active">Aktyvi</string>
-    <string name="pump_status_sleeping">Užmigusi</string>
-    <!-- PumpCommon - History Group -->
-    <string name="history_group_basal">Bazė</string>
-    <string name="history_group_configuration">Nustatymai</string>
-    <string name="history_group_notification">Pranešimai</string>
-    <string name="history_group_statistic">Statistika</string>
-    <string name="history_group_unknown">Nežinoma</string>
-    <string name="history_group_all">Visi</string>
-    <string name="history_group_bolus">Bolusai</string>
-    <string name="history_group_prime">Užpildyti sistemą</string>
-    <string name="history_group_alarm">Aliarmai</string>
-    <string name="history_group_glucose">Gliukozė</string>
     <string name="mute5min">Nutildyti 5 minutėms</string>
     <!-- Maintenance -->
     <string name="metadata_label_created_at">Sukurta</string>
@@ -264,6 +267,7 @@
     <string name="saturday_short">Š</string>
     <string name="sunday_short">S</string>
     <!-- User Entry -->
+    <!-- HardLimits -->
     <plurals name="days">
         <item quantity="one">%1$d d.</item>
         <item quantity="few">%1$d d.</item>
diff --git a/core/src/main/res/values-lt-rLT/validator.xml b/core/src/main/res/values-lt-rLT/validator.xml
index 3ea04e700d..74729daf5b 100644
--- a/core/src/main/res/values-lt-rLT/validator.xml
+++ b/core/src/main/res/values-lt-rLT/validator.xml
@@ -1,2 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
+<resources>
+    <string name="error_only_numeric_digits_allowed">Galimi tik skaičiai.</string>
+    <string name="error_only_numeric_digits_range_allowed">Galimi tik skaičiai intervale %1$s - %2$s.</string>
+    <string name="error_field_must_not_be_empty">Laukas negali būti tuščias</string>
+    <string name="error_phone_not_valid">Telefono numeris negalioja</string>
+</resources>
diff --git a/core/src/main/res/values-nl-rNL/strings.xml b/core/src/main/res/values-nl-rNL/strings.xml
index ff6c928433..289793a18c 100644
--- a/core/src/main/res/values-nl-rNL/strings.xml
+++ b/core/src/main/res/values-nl-rNL/strings.xml
@@ -2,6 +2,7 @@
 <resources>
     <!--    Keys-->
     <!--    General-->
+    <string name="refresh">Vernieuwen</string>
     <string name="error">Fout</string>
     <string name="not_set_short">Niet ingesteld</string>
     <string name="failedupdatebasalprofile">Update basaal profiel mislukt</string>
@@ -61,6 +62,8 @@
     <string name="eventtype">Gebeurtenis type</string>
     <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">Geavanceerde instellingen</string>
     <string name="bluetooth">Bluetooth</string>
     <string name="btwatchdog_title">BT Watchdog</string>
@@ -68,6 +71,7 @@
     <string name="pairing">Koppelen</string>
     <string name="yes">Ja</string>
     <string name="no">Nee</string>
+    <string name="loopdisabled">LOOP UITGESCHAKELD DOOR BEPERKINGEN</string>
     <!--    Constraints-->
     <string name="limitingbasalratio">Beperken van basaal tot max %1$.2f E/uur wegens de %2$s</string>
     <string name="pumplimit">Pomp limiet</string>
@@ -190,30 +194,6 @@
     <!--    Ntp-->
     <string name="timedetection">Tijd detectie</string>
     <string name="format_hour_minute">%1$du %2$dm</string>
-    <!-- PumoCommon - Pump Abstract -->
-    <string name="pump_operation_not_supported_by_pump_driver">Bewerking niet ondersteund door pomp en/of driver.</string>
-    <string name="pump_operation_not_yet_supported_by_pump">Operatie NU nog niet ondersteund door pomp.</string>
-    <string name="common_resultok">OK</string>
-    <!-- PumoCommon - Pump Status -->
-    <string name="pump_status_never_contacted">Nooit verbonden</string>
-    <string name="pump_status_waking_up">Ontwaken</string>
-    <string name="pump_status_error_comm">Communicatiefout</string>
-    <string name="pump_status_timeout_comm">Time-out op de communicatie</string>
-    <string name="pump_status_pump_unreachable">Pomp niet beschikbaar</string>
-    <string name="pump_status_invalid_config">Ongeldige configuratie</string>
-    <string name="pump_status_active">Actief</string>
-    <string name="pump_status_sleeping">Slapen</string>
-    <!-- PumpCommon - History Group -->
-    <string name="history_group_basal">Basalen</string>
-    <string name="history_group_configuration">Instellingen</string>
-    <string name="history_group_notification">Meldingen</string>
-    <string name="history_group_statistic">Statistieken</string>
-    <string name="history_group_unknown">Onbekend</string>
-    <string name="history_group_all">Alle</string>
-    <string name="history_group_bolus">Bolussen</string>
-    <string name="history_group_prime">Vullen</string>
-    <string name="history_group_alarm">Alarmen</string>
-    <string name="history_group_glucose">Glucose</string>
     <string name="mute5min">5 minuten dempen</string>
     <!-- Maintenance -->
     <string name="metadata_label_format">Bestandsformaat</string>
@@ -258,6 +238,7 @@
     <string name="alert_dialog_storage_permission_text">Herstart je telefoon of herstart AndroidAPS vanuit de systeem instellingen. \nAnders zullen er voor AndroidAPS geen logs worden aangemaakt (dit is belangrijk voor de ontwikkelaars, zo kunnen zij controleren of de algoritmes correct werken)!</string>
     <!-- WeekdayPicker -->
     <!-- User Entry -->
+    <!-- HardLimits -->
     <plurals name="days">
         <item quantity="one">%1$d dag</item>
         <item quantity="other">%1$d dagen</item>
diff --git a/core/src/main/res/values-no-rNO/strings.xml b/core/src/main/res/values-no-rNO/strings.xml
index d4f85d083e..69d7f3835e 100644
--- a/core/src/main/res/values-no-rNO/strings.xml
+++ b/core/src/main/res/values-no-rNO/strings.xml
@@ -81,7 +81,6 @@
     <string name="extended_bolus">Forlenget bolus</string>
     <string name="pump_time_updated">Pumpens tid er oppdatert</string>
     <string name="exit">Avslutt</string>
-    <string name="serial_number">Serienummer</string>
     <string name="removerecord">Fjern registrering</string>
     <string name="loopisdisabled">Loop er deaktivert</string>
     <string name="alarm">Alarm</string>
@@ -105,6 +104,7 @@
     <string name="notes_label">Merknader</string>
     <string name="remove_button">Fjern</string>
     <string name="addnew">Legg til ny</string>
+    <string name="wrong_pump_data">Data kommer fra forskjellige pumper. Bytt pumpevalg for å nullstille pumpens tilstand.</string>
     <!--    Constraints-->
     <string name="limitingbasalratio">Begrenser maks basal dose til %1$.2f E/t på grunn av %2$s</string>
     <string name="pumplimit">pumpebegrensning</string>
@@ -154,6 +154,7 @@
     <string name="profile_carbs_per_unit">g/E</string>
     <!--    ProfileFunction-->
     <string name="noprofileselected">Ingen profil valgt</string>
+    <string name="startprofile">Start profil %1$d%% i %2$d min</string>
     <!--    PumpType-->
     <string name="def_extended_note">* Bare konkrete verdier støttes som granularitet for basal/bolus i virtuell pumpe, ingen verdiområder.</string>
     <!--    APSResult-->
@@ -207,6 +208,10 @@
     <string name="wear">Wear</string>
     <string name="automation">Automatisering</string>
     <string name="custom">Egendefinert</string>
+    <string name="pump">Pumpe</string>
+    <string name="loop">Loop</string>
+    <string name="ns">NS</string>
+    <string name="record">Registrer</string>
     <!--    Command-->
     <string name="connectiontimedout">Tilkoblingen ble tidsavbrutt</string>
     <!--    PumpEnactResult-->
@@ -238,30 +243,6 @@
     <!--    Ntp-->
     <string name="timedetection">Tidsdetektering</string>
     <string name="format_hour_minute">%1$dt %2$dm</string>
-    <!-- PumoCommon - Pump Abstract -->
-    <string name="pump_operation_not_supported_by_pump_driver">Operasjonen støttes ikke av pumpen og/eller driveren.</string>
-    <string name="pump_operation_not_yet_supported_by_pump">Operasjonen støttes ikke av pumpen ennå.</string>
-    <string name="common_resultok">OK</string>
-    <!-- PumoCommon - Pump Status -->
-    <string name="pump_status_never_contacted">Aldri kontaktet</string>
-    <string name="pump_status_waking_up">Våkner opp</string>
-    <string name="pump_status_error_comm">Kommunikasjonsfeil</string>
-    <string name="pump_status_timeout_comm">Tidsavbrudd kommunikasjon</string>
-    <string name="pump_status_pump_unreachable">Pumpe utilgjengelig</string>
-    <string name="pump_status_invalid_config">Ugyldig oppsett</string>
-    <string name="pump_status_active">Aktiv</string>
-    <string name="pump_status_sleeping">Sover</string>
-    <!-- PumpCommon - History Group -->
-    <string name="history_group_basal">Basaldoser</string>
-    <string name="history_group_configuration">Innstillinger</string>
-    <string name="history_group_notification">Varsler</string>
-    <string name="history_group_statistic">Statistikk</string>
-    <string name="history_group_unknown">Ukjente</string>
-    <string name="history_group_all">Alle</string>
-    <string name="history_group_bolus">Boluser</string>
-    <string name="history_group_prime">Prime</string>
-    <string name="history_group_alarm">Alarmer</string>
-    <string name="history_group_glucose">Glukose</string>
     <string name="mute5min">Demp i 5 minutter</string>
     <!-- Maintenance -->
     <string name="metadata_label_format">Filformat</string>
@@ -320,6 +301,7 @@
     <string name="uel_carbs">KARBO</string>
     <string name="uel_extended_carbs">FORLENGET KARBO</string>
     <string name="uel_temp_basal">TEMP BASAL</string>
+    <string name="uel_tt">MIDLERTIDIG BS MÅL</string>
     <string name="uel_new_profile">NY PROFIL</string>
     <string name="uel_clone_profile">KOPIER PROFIL</string>
     <string name="uel_store_profile">LAGRE PROFIL</string>
@@ -338,23 +320,33 @@
     <string name="uel_clear_pairing_keys">NULLSTILL PARRINGS NØKLER</string>
     <string name="uel_accepts_temp_basal">AKSEPTER TEMP BASAL</string>
     <string name="uel_cancel_temp_basal">AVBRYT TEMP BASAL</string>
+    <string name="uel_cancel_bolus">AVBRYT BOLUS</string>
     <string name="uel_cancel_extended_bolus">AVBRYT FORLENGET BOLUS</string>
+    <string name="uel_cancel_tt">AVBRYT MIDLERTIDIG BS MÅL</string>
     <string name="uel_careportal">CAREPORTAL</string>
+    <string name="uel_site_change">BYTTE SLANGESETT</string>
+    <string name="uel_reservoir_change">BYTTE RESERVOAR</string>
     <string name="uel_calibration">KALIBRERING</string>
     <string name="uel_prime_bolus">PRIME BOLUS</string>
     <string name="uel_treatment">BEHANDLING</string>
     <string name="uel_careportal_ns_refresh">CAREPORTAL NS OPPDATER</string>
     <string name="uel_profile_switch_ns_refresh">PROFILBYTTE NS OPPDATER</string>
     <string name="uel_treatments_ns_refresh">BEHANDLINGER NS OPPDATER</string>
+    <string name="uel_tt_ns_refresh">OPPDATER MIDLERTIDIG BS MÅL NS</string>
     <string name="uel_automation_removed">AUTOMASJON FJERNET</string>
     <string name="uel_bg_removed">BS FJERNET</string>
     <string name="uel_careportal_removed">CAREPORTAL FJERNET</string>
+    <string name="uel_bolus_removed">BOLUS FJERNET</string>
+    <string name="uel_carbs_removed">KARBO FJERNET</string>
+    <string name="uel_temp_basal_removed">MIDLERTIDIG BS MÅL FJERNET</string>
     <string name="uel_extended_bolus_removed">FORLENGET BOLUS FJERNET</string>
+    <string name="uel_food">MAT</string>
     <string name="uel_food_removed">MÅLTID FJERNET</string>
     <string name="uel_profile_removed">PROFIL FJERNET</string>
     <string name="uel_profile_switch_removed">PROFILBYTTE FJERNET</string>
     <string name="uel_restart_events_removed">RESTART HENDELSER FJERNET</string>
     <string name="uel_treatment_removed">BEHANDLING FJERNET</string>
+    <string name="uel_tt_removed">MIDLERTIDIG BS MÅL FJERNET</string>
     <string name="uel_ns_paused">NS PAUSET</string>
     <string name="uel_ns_resume">GJENOPPTA NS</string>
     <string name="uel_ns_queue_cleared">NS KØ SLETTET</string>
@@ -375,9 +367,24 @@
     <string name="uel_import_databases">IMPORTER DATABASER</string>
     <string name="uel_otp_export">OTP EKSPORT</string>
     <string name="uel_otp_reset">OTP RESET</string>
+    <string name="uel_stop_sms">STOPP SMS</string>
     <string name="uel_export_csv">EKSPORTER BRUKEROPPFØRINGER</string>
+    <string name="uel_start_aaps">START AAPS</string>
+    <string name="uel_exit_aaps">AVSLUTT AAPS</string>
+    <string name="uel_plugin_enabled">PLUGIN AKTIVERT</string>
+    <string name="uel_plugin_disabled">PLUGIN DEAKTIVERT</string>
     <string name="uel_unknown">UKJENT</string>
+    <string name="ue_string">Tekst</string>
+    <string name="ue_source">Kildekode</string>
+    <string name="ue_utc_offset">UTC tid forskyvning</string>
+    <string name="ue_action">Handling</string>
+    <string name="ue_timestamp">Tidspunkt</string>
+    <string name="ue_none">Ingen enhet</string>
     <string name="ue_export_to_csv">Eksporter brukeroppføringer til Excel (csv)</string>
+    <string name="uel_loop_change">LOOP ENDRET</string>
+    <string name="uel_loop_removed">LOOP FJERNET</string>
+    <string name="uel_other">ANNET</string>
+    <!-- HardLimits -->
     <plurals name="days">
         <item quantity="one">%1$d dag</item>
         <item quantity="other">%1$d dager</item>
diff --git a/core/src/main/res/values-pl-rPL/strings.xml b/core/src/main/res/values-pl-rPL/strings.xml
index 551fe4e471..ca320d647b 100644
--- a/core/src/main/res/values-pl-rPL/strings.xml
+++ b/core/src/main/res/values-pl-rPL/strings.xml
@@ -68,6 +68,27 @@
     <string name="pairing">Parowanie</string>
     <string name="yes">Tak</string>
     <string name="no">Nie</string>
+    <string name="loopdisabled">PĘTLA WYLĄCZONA Z UWAGI NA OGRANICZENIA</string>
+    <string name="bolusdelivered">Bolus %1$.2f U podany prawidłowo</string>
+    <string name="novalidbasalrate">Brak prawidłowej dawki bazowej odczytanej z pompy</string>
+    <string name="limitingmaxiob">Ograniczam max IOB do %1$.1f U z uwagi na %2$s</string>
+    <string name="unsafeusage">niebezpieczne użycie</string>
+    <string name="pump_unreachable">Pompa nieosiągalna</string>
+    <string name="pump_time_updated">Czas pompy uaktualniony</string>
+    <string name="removerecord">Usuń wpis</string>
+    <string name="disableloop">Wyłącz pętle</string>
+    <string name="enableloop">Włącz pętle</string>
+    <string name="resumeloop">Wznów pętlę</string>
+    <string name="suspendloop">Wstrzymaj pętle</string>
+    <string name="notification">Powiadomienie</string>
+    <string name="noprofile">Nie załadowano profilu z NS</string>
+    <string name="exists">istnieje</string>
+    <string name="notexists">nie istnieje</string>
+    <string name="glucose">Glukoza</string>
+    <string name="name_short">Nazwa:</string>
+    <string name="time">Czas</string>
+    <string name="ns_wifi_ssids">WiFi SSID</string>
+    <string name="addnew">Dodaj nowy</string>
     <!--    Constraints-->
     <string name="limitingbasalratio">Ograniczam maks. dawkę bazową do %1$.2f U/h z uwagi na %2$s</string>
     <string name="pumplimit">ograniczenie pompy</string>
@@ -116,6 +137,7 @@
     <string name="profile_carbs_per_unit">g/U</string>
     <!--    ProfileFunction-->
     <string name="noprofileselected">Nie wybrano profilu</string>
+    <string name="startprofile">Uruchom profil %1$d%% na %2$d min</string>
     <!--    PumpType-->
     <string name="def_extended_note">*Tylko wartości dyskretne, nie zakresy są wspierane jako dawki bazowe/bolusy w pompie wirtualnej.</string>
     <!--    APSResult-->
@@ -155,10 +177,17 @@
     <string name="careportal_pumpbatterychange">Zmiana baterii pompy</string>
     <string name="careportal_temporarytarget">Cel tymczasowy (TT)</string>
     <string name="careportal_temporarytargetcancel">Odrzuć Cel tymczasowy</string>
+    <string name="boluswizard">Kalkulator bolusa</string>
     <string name="glucosetype_finger">Palec</string>
     <string name="glucosetype_sensor">Sensor</string>
     <string name="manual">Ręczne</string>
     <string name="unknown">nieznany</string>
+    <string name="eatingsoon">Wkrótce posiłek</string>
+    <string name="hypo">Hipo</string>
+    <string name="activity">Ćwiczenia</string>
+    <string name="wear">Oprogramowanie Wear (Smartwatch)</string>
+    <string name="automation">Automatyzacja</string>
+    <string name="custom">Niestandardowe</string>
     <!--    Command-->
     <string name="connectiontimedout">Przekroczono limit czasu połączenia</string>
     <!--    PumpEnactResult-->
@@ -190,30 +219,6 @@
     <!--    Ntp-->
     <string name="timedetection">Wykrywanie czasu</string>
     <string name="format_hour_minute">%1$dh %2$dm</string>
-    <!-- PumoCommon - Pump Abstract -->
-    <string name="pump_operation_not_supported_by_pump_driver">Operacja nie jest wspierana przez pompę i/lub sterownik pompy.</string>
-    <string name="pump_operation_not_yet_supported_by_pump">Operacja nie jest JESZCZE wspierana przez pompę.</string>
-    <string name="common_resultok">OK</string>
-    <!-- PumoCommon - Pump Status -->
-    <string name="pump_status_never_contacted">Nigdy nie połączona</string>
-    <string name="pump_status_waking_up">Wybudzanie</string>
-    <string name="pump_status_error_comm">Błąd komunikacji</string>
-    <string name="pump_status_timeout_comm">Przekroczony limit czasu połączenia</string>
-    <string name="pump_status_pump_unreachable">Pompa nieosiągalna</string>
-    <string name="pump_status_invalid_config">Nieprawidłowe ustawienia</string>
-    <string name="pump_status_active">Aktywna</string>
-    <string name="pump_status_sleeping">Uśpiona</string>
-    <!-- PumpCommon - History Group -->
-    <string name="history_group_basal">Dawki Bazowe</string>
-    <string name="history_group_configuration">Ustawienia</string>
-    <string name="history_group_notification">Powiadomienia</string>
-    <string name="history_group_statistic">Statystyki</string>
-    <string name="history_group_unknown">Nieznane</string>
-    <string name="history_group_all">Wszystko</string>
-    <string name="history_group_bolus">Bolusy</string>
-    <string name="history_group_prime">Napełnianie</string>
-    <string name="history_group_alarm">Alarmy</string>
-    <string name="history_group_glucose">Glukoza</string>
     <string name="mute5min">Wycisz na 5 minut</string>
     <!-- Maintenance -->
     <string name="metadata_label_created_at">Data utworzenia</string>
@@ -256,4 +261,5 @@
     <!-- Permissions -->
     <!-- WeekdayPicker -->
     <!-- User Entry -->
+    <!-- HardLimits -->
 </resources>
diff --git a/core/src/main/res/values-pl-rPL/validator.xml b/core/src/main/res/values-pl-rPL/validator.xml
index 3ea04e700d..e7f12e53ea 100644
--- a/core/src/main/res/values-pl-rPL/validator.xml
+++ b/core/src/main/res/values-pl-rPL/validator.xml
@@ -1,2 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
+<resources>
+    <string name="error_only_numeric_digits_allowed">Dozwolone są tylko cyfry.</string>
+    <string name="error_only_numeric_digits_range_allowed">Dozwolone są tylko cyfry w zakresie %1$s - %2$s.</string>
+    <string name="error_this_field_cannot_contain_special_character">To pole nie może zawierać znaków specjalnych</string>
+    <string name="error_only_standard_letters_are_allowed">Dozwolone są tylko standardowe litery</string>
+    <string name="error_field_must_not_be_empty">Pole nie może być puste</string>
+    <string name="error_email_address_not_valid">Nieprawidłowy adres e-mail</string>
+    <string name="error_creditcard_number_not_valid">Numer karty kredytowej nie jest prawidłowy</string>
+    <string name="error_phone_not_valid">Nieprawidłowy numer telefonu</string>
+    <string name="error_domain_not_valid">Nieprawidłowa nazwa domeny</string>
+    <string name="error_ip_not_valid">Nieprawidłowy adres IP</string>
+    <string name="error_url_not_valid">Adres Url sieci Web nie jest prawidłowy</string>
+    <string name="error_notvalid_personname">Nieprawidłowe imię lub nazwisko.</string>
+    <string name="error_notvalid_personfullname">Niepoprawne imię i nazwisko.</string>
+    <string name="error_date_not_valid">Nieprawidłowy format</string>
+    <string name="error_mustbe4digitnumber">Trzeba podać 4-cyfrowy numer</string>
+    <string name="error_mustbe6digitnumber">Trzeba podać 6-cyfrowy numer</string>
+    <string name="error_pin_not_valid">Pin powinien być od 3 do 6 cyfr, nie takich samych ani kolejnych</string>
+</resources>
diff --git a/core/src/main/res/values-pt-rBR/strings.xml b/core/src/main/res/values-pt-rBR/strings.xml
index 3116c3caba..06f743e9c2 100644
--- a/core/src/main/res/values-pt-rBR/strings.xml
+++ b/core/src/main/res/values-pt-rBR/strings.xml
@@ -61,6 +61,26 @@
     <string name="pairing">A emparelhar</string>
     <string name="yes">Sim</string>
     <string name="no">Não</string>
+    <string name="loopdisabled">LOOP DESATIVADO POR RESTRIÇÕES</string>
+    <string name="novalidbasalrate">Nenhum valor de basal temporaria valido foi lido da bomba</string>
+    <string name="limitingmaxiob">A limitar IOB máx. para %1$.1f U porque %2$s</string>
+    <string name="unsafeusage">uso não seguro</string>
+    <string name="pump_unreachable">Bomba inacessível</string>
+    <string name="pump_time_updated">Hora da bomba actualizada</string>
+    <string name="disableloop">Desativar loop</string>
+    <string name="enableloop">Ativar loop</string>
+    <string name="resumeloop">Retomar loop</string>
+    <string name="suspendloop">Suspender loop</string>
+    <string name="notification">Notificação</string>
+    <string name="noprofile">Nenhum perfil carregado de NS ainda</string>
+    <string name="exists">existe</string>
+    <string name="notexists">não existe</string>
+    <string name="glucose">Glicose</string>
+    <string name="name_short">Nome:</string>
+    <string name="time">Hora</string>
+    <string name="ns_wifi_ssids">WiFi SSID</string>
+    <string name="event_time_label">Hora do Evento</string>
+    <string name="addnew">Adicionar novo</string>
     <!--    Constraints-->
     <string name="limitingbasalratio">A basal max está limitada a %1$.2f U/h por %2$s</string>
     <string name="pumplimit">limite bomba</string>
@@ -105,6 +125,7 @@
     <string name="profile_carbs_per_unit">g/U</string>
     <!--    ProfileFunction-->
     <string name="noprofileselected">Nenhum perfil selecionado</string>
+    <string name="startprofile">Iniciar perfil %1$d%% para %2$d min</string>
     <!--    PumpType-->
     <string name="def_extended_note">* Somente valores discretos nos intervalos são suportados como granularidade para basal/bolus na bomba virtual.</string>
     <!--    APSResult-->
@@ -140,10 +161,16 @@
     <string name="careportal_pumpbatterychange">Mudança de Bateria</string>
     <string name="careportal_temporarytarget">Alvo Temporário</string>
     <string name="careportal_temporarytargetcancel">Cancelar alvo temporário</string>
+    <string name="boluswizard">Assistente de Bólus</string>
     <string name="glucosetype_finger">Dedo</string>
     <string name="glucosetype_sensor">Sensor</string>
     <string name="manual">Manual</string>
     <string name="unknown">desconhecido</string>
+    <string name="eatingsoon">Comer em breve</string>
+    <string name="hypo">Hipo</string>
+    <string name="wear">Wear</string>
+    <string name="automation">Automatização</string>
+    <string name="custom">Personalizado</string>
     <!--    Command-->
     <string name="connectiontimedout">Ligação expirou</string>
     <!--    PumpEnactResult-->
@@ -172,10 +199,6 @@
     <string name="tbb2">Basal diária * 2</string>
     <!--    Ntp-->
     <string name="timedetection">Detecção de tempo</string>
-    <!-- PumoCommon - Pump Abstract -->
-    <string name="pump_operation_not_yet_supported_by_pump">Operação não suportada ainda pela Bomba.</string>
-    <!-- PumoCommon - Pump Status -->
-    <!-- PumpCommon - History Group -->
     <!-- Maintenance -->
     <string name="metadata_label_created_at">Criado em</string>
     <string name="metadata_label_aaps_version">Versão AAPS</string>
@@ -213,4 +236,5 @@
     <!-- Permissions -->
     <!-- WeekdayPicker -->
     <!-- User Entry -->
+    <!-- HardLimits -->
 </resources>
diff --git a/core/src/main/res/values-pt-rBR/validator.xml b/core/src/main/res/values-pt-rBR/validator.xml
index 3ea04e700d..a9d025b786 100644
--- a/core/src/main/res/values-pt-rBR/validator.xml
+++ b/core/src/main/res/values-pt-rBR/validator.xml
@@ -1,2 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
+<resources>
+    <string name="error_only_numeric_digits_allowed">Apenas dígitos numéricos são permitidos.</string>
+    <string name="error_only_numeric_digits_range_allowed">Apenas dígitos numéricos dentro de um intervalo de %1$s - %2$s são permitidos.</string>
+    <string name="error_this_field_cannot_contain_special_character">Este campo não pode conter qualquer carácter especial</string>
+    <string name="error_only_standard_letters_are_allowed">Apenas letras padrão são permitidas</string>
+    <string name="error_field_must_not_be_empty">Este campo não deve estar vazio</string>
+    <string name="error_email_address_not_valid">Endereço de e-mail inválido</string>
+    <string name="error_creditcard_number_not_valid">Número de cartão de crédito inválido</string>
+    <string name="error_phone_not_valid">Número de telefone inválido</string>
+    <string name="error_domain_not_valid">Nome de domínio inválido</string>
+    <string name="error_ip_not_valid">Endereço IP inválido</string>
+    <string name="error_url_not_valid">Url do site não é válido</string>
+    <string name="error_notvalid_personname">Não é um nome ou sobrenome válido.</string>
+    <string name="error_notvalid_personfullname">Nome completo inválido.</string>
+    <string name="error_date_not_valid">Formato inválido</string>
+    <string name="error_mustbe4digitnumber">Deve ser número de 4 dígitos</string>
+    <string name="error_mustbe6digitnumber">Deve ser número de 6 dígitos</string>
+    <string name="error_pin_not_valid">Pin deve ser de 3 a 6 dígitos, não o mesmo ou em série</string>
+</resources>
diff --git a/core/src/main/res/values-pt-rPT/strings.xml b/core/src/main/res/values-pt-rPT/strings.xml
index 578b0d18e4..c3ef38543e 100644
--- a/core/src/main/res/values-pt-rPT/strings.xml
+++ b/core/src/main/res/values-pt-rPT/strings.xml
@@ -81,7 +81,6 @@
     <string name="extended_bolus">Bólus Prolongado</string>
     <string name="pump_time_updated">Hora da bomba actualizada</string>
     <string name="exit">Sair</string>
-    <string name="serial_number">Número de Série</string>
     <string name="removerecord">Remover registo</string>
     <string name="loopisdisabled">Loop está desactivado</string>
     <string name="alarm">Alarme</string>
@@ -154,6 +153,7 @@
     <string name="profile_carbs_per_unit">g/U</string>
     <!--    ProfileFunction-->
     <string name="noprofileselected">Nenhum perfil seleccionado</string>
+    <string name="startprofile">Iniciar perfil %1$d%% para %2$d min</string>
     <!--    PumpType-->
     <string name="def_extended_note">* Somente valores discretos nos intervalos são suportados como granularidade para basal/bolus na bomba virtual.</string>
     <!--    APSResult-->
@@ -238,30 +238,6 @@
     <!--    Ntp-->
     <string name="timedetection">Detecção de tempo</string>
     <string name="format_hour_minute">%1$dh %2$dm</string>
-    <!-- PumoCommon - Pump Abstract -->
-    <string name="pump_operation_not_supported_by_pump_driver">Operação não suportada pela Bomba e/ou Controlador.</string>
-    <string name="pump_operation_not_yet_supported_by_pump">Operação não suportada ainda pela Bomba.</string>
-    <string name="common_resultok">OK</string>
-    <!-- PumoCommon - Pump Status -->
-    <string name="pump_status_never_contacted">Nunca contactado</string>
-    <string name="pump_status_waking_up">A acordar</string>
-    <string name="pump_status_error_comm">Erro com comunicação</string>
-    <string name="pump_status_timeout_comm">Tempo limite para comunicação</string>
-    <string name="pump_status_pump_unreachable">Bomba inacessível</string>
-    <string name="pump_status_invalid_config">Configuração inválida</string>
-    <string name="pump_status_active">Activo</string>
-    <string name="pump_status_sleeping">A dormir</string>
-    <!-- PumpCommon - History Group -->
-    <string name="history_group_basal">Basais</string>
-    <string name="history_group_configuration">Configurações</string>
-    <string name="history_group_notification">Notificações</string>
-    <string name="history_group_statistic">Estatísticas</string>
-    <string name="history_group_unknown">Desconhecido</string>
-    <string name="history_group_all">Tudo</string>
-    <string name="history_group_bolus">Bólus</string>
-    <string name="history_group_prime">Purgar</string>
-    <string name="history_group_alarm">Alarmes</string>
-    <string name="history_group_glucose">Glucose</string>
     <string name="mute5min">Silenciar por 5 minutos</string>
     <!-- Maintenance -->
     <string name="metadata_label_format">Formato do ficheiro</string>
@@ -376,6 +352,7 @@
     <string name="uel_export_csv">EXPORTAR ENTRADAS DO UTILIZADOR</string>
     <string name="uel_unknown">DESCONHECIDO</string>
     <string name="ue_export_to_csv">Exportar Entradas do Utilizador para o Excel (csv)</string>
+    <!-- HardLimits -->
     <plurals name="days">
         <item quantity="one">%1$d dia</item>
         <item quantity="other">%1$d dias</item>
diff --git a/core/src/main/res/values-ro-rRO/strings.xml b/core/src/main/res/values-ro-rRO/strings.xml
index 4dfa4f073f..5f887266f2 100644
--- a/core/src/main/res/values-ro-rRO/strings.xml
+++ b/core/src/main/res/values-ro-rRO/strings.xml
@@ -79,7 +79,6 @@
     <string name="extended_bolus">Bolus extins</string>
     <string name="pump_time_updated">Timpul din pompă a fost actualizat</string>
     <string name="exit">Ieșire</string>
-    <string name="serial_number">Număr serial</string>
     <string name="removerecord">Șterge înregistrarea</string>
     <string name="loopisdisabled">Bucla este dezactivată</string>
     <string name="alarm">Alarmă</string>
@@ -151,6 +150,7 @@
     <string name="profile_carbs_per_unit">g/U</string>
     <!--    ProfileFunction-->
     <string name="noprofileselected">Niciun profil selectat</string>
+    <string name="startprofile">Utilizează profilul %1$d%% pentru %2$d min</string>
     <!--    PumpType-->
     <string name="def_extended_note">* Pompa virtuală acceptă doar valori specifice ca și incremente, nu și intervale de valori.
 * Doar valorile specifice, nu şi intervalele de valori sunt suportate ca şi incremente în pompa virtuală.</string>
@@ -191,10 +191,16 @@
     <string name="careportal_pumpbatterychange">Schimbare baterie pompă</string>
     <string name="careportal_temporarytarget">Ţintă temporară</string>
     <string name="careportal_temporarytargetcancel">Oprire ţintă temporară</string>
+    <string name="boluswizard">Asistent bolusare</string>
     <string name="glucosetype_finger">Deget</string>
     <string name="glucosetype_sensor">Senzor</string>
     <string name="manual">Manual</string>
     <string name="unknown">necunoscută</string>
+    <string name="eatingsoon">Mănânc în curând</string>
+    <string name="hypo">Hipo</string>
+    <string name="wear">Ceas</string>
+    <string name="automation">Automatizare</string>
+    <string name="custom">Personalizat</string>
     <!--    Command-->
     <string name="connectiontimedout">Conectare eșuată</string>
     <!--    PumpEnactResult-->
@@ -226,30 +232,6 @@
     <!--    Ntp-->
     <string name="timedetection">Detectare timp</string>
     <string name="format_hour_minute">%1$dh %2$dm</string>
-    <!-- PumoCommon - Pump Abstract -->
-    <string name="pump_operation_not_supported_by_pump_driver">Operațiunea nu este suportată de către pompă și/sau driver.</string>
-    <string name="pump_operation_not_yet_supported_by_pump">Operațiunea nu este ÎNCĂ suportată de către pompă.</string>
-    <string name="common_resultok">OK</string>
-    <!-- PumoCommon - Pump Status -->
-    <string name="pump_status_never_contacted">Niciodată contactată</string>
-    <string name="pump_status_waking_up">Se pornește</string>
-    <string name="pump_status_error_comm">Eroare de comunicație</string>
-    <string name="pump_status_timeout_comm">Comunicația nu a reușit la timp</string>
-    <string name="pump_status_pump_unreachable">Pompă indisponibilă</string>
-    <string name="pump_status_invalid_config">Configurație invalidă</string>
-    <string name="pump_status_active">Activă</string>
-    <string name="pump_status_sleeping">În repaus</string>
-    <!-- PumpCommon - History Group -->
-    <string name="history_group_basal">Bazale</string>
-    <string name="history_group_configuration">Configurații</string>
-    <string name="history_group_notification">Notificări</string>
-    <string name="history_group_statistic">Statistici</string>
-    <string name="history_group_unknown">Necunoscute</string>
-    <string name="history_group_all">Toate</string>
-    <string name="history_group_bolus">Bolusuri</string>
-    <string name="history_group_prime">Amorsare</string>
-    <string name="history_group_alarm">Alarme</string>
-    <string name="history_group_glucose">Glicemie</string>
     <string name="mute5min">Dezactivează pentru 5 minute</string>
     <!-- Maintenance -->
     <string name="metadata_label_format">Format fișier</string>
@@ -301,6 +283,7 @@
     <string name="saturday_short">S</string>
     <string name="sunday_short">D</string>
     <!-- User Entry -->
+    <!-- HardLimits -->
     <plurals name="days">
         <item quantity="one">%1$d zi</item>
         <item quantity="few">%1$d zile</item>
diff --git a/core/src/main/res/values-ru-rRU/strings.xml b/core/src/main/res/values-ru-rRU/strings.xml
index 3bbd252be8..0e32949ffc 100644
--- a/core/src/main/res/values-ru-rRU/strings.xml
+++ b/core/src/main/res/values-ru-rRU/strings.xml
@@ -81,7 +81,6 @@
     <string name="extended_bolus">Пролонгированный болюс</string>
     <string name="pump_time_updated">Время на помпе обновлено</string>
     <string name="exit">Выйти</string>
-    <string name="serial_number">Серийный номер</string>
     <string name="removerecord">Удалить запись</string>
     <string name="loopisdisabled">Зцикл не работает</string>
     <string name="alarm">Оповещения об опасности</string>
@@ -180,7 +179,7 @@
     <string name="careportal_note">Примечание</string>
     <string name="careportal_question">Вопрос</string>
     <string name="careportal_exercise">Нгрузка</string>
-    <string name="careportal_pumpsitechange">Сена места катетера помпы</string>
+    <string name="careportal_pumpsitechange">Смена места катетера помпы</string>
     <string name="careportal_cgmsensorinsert">Установка сенсора мониторинга глюкозы</string>
     <string name="careportal_cgmsensorstart">Сарт сенсора</string>
     <string name="careportal_cgm_sensor_stop">Останов сенсора мониторинга</string>
@@ -244,30 +243,6 @@
     <!--    Ntp-->
     <string name="timedetection">Определение времени</string>
     <string name="format_hour_minute">%1$dч %2$dмин</string>
-    <!-- PumoCommon - Pump Abstract -->
-    <string name="pump_operation_not_supported_by_pump_driver">Операция не поддерживается помпой и/или драйвером.</string>
-    <string name="pump_operation_not_yet_supported_by_pump">Операция ЕЩЕ не поддерживается помпой.</string>
-    <string name="common_resultok">OK</string>
-    <!-- PumoCommon - Pump Status -->
-    <string name="pump_status_never_contacted">Никогда не подключалась</string>
-    <string name="pump_status_waking_up">Пробуждение</string>
-    <string name="pump_status_error_comm">Ошибка связи</string>
-    <string name="pump_status_timeout_comm">Таймаут связи</string>
-    <string name="pump_status_pump_unreachable">Помпа недоступна</string>
-    <string name="pump_status_invalid_config">Недопустимая конфигурация</string>
-    <string name="pump_status_active">Активно</string>
-    <string name="pump_status_sleeping">Сон</string>
-    <!-- PumpCommon - History Group -->
-    <string name="history_group_basal">Базал</string>
-    <string name="history_group_configuration">Конфигурация</string>
-    <string name="history_group_notification">Уведомления</string>
-    <string name="history_group_statistic">Статистика</string>
-    <string name="history_group_unknown">Неизвестные</string>
-    <string name="history_group_all">Все</string>
-    <string name="history_group_bolus">Болюсы</string>
-    <string name="history_group_prime">Заполнение инфузионной системы</string>
-    <string name="history_group_alarm">Оповещения об опасности</string>
-    <string name="history_group_glucose">Гликемия</string>
     <string name="mute5min">Отключить уведомления на 5 минут</string>
     <!-- Maintenance -->
     <string name="metadata_label_format">Формат файла</string>
@@ -406,6 +381,24 @@
     <string name="ue_timestamp">Отметка времени</string>
     <string name="ue_none">Нет единиц</string>
     <string name="ue_export_to_csv">Экспорт пользовательских записей в Excel (csv)</string>
+    <string name="uel_loop_change">КОНТУР ИЗМЕНЕН</string>
+    <string name="uel_loop_removed">КОНТУР УДАЛЕН</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">Максимальное значение базала в профиле</string>
+    <string name="current_basal_value">Текущее значение базала</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">Величина базала</string>
     <plurals name="days">
         <item quantity="one">%1$d день</item>
         <item quantity="few">%1$d дня</item>
diff --git a/core/src/main/res/values-sk-rSK/strings.xml b/core/src/main/res/values-sk-rSK/strings.xml
index 3ca87ab3d9..10c4e30f10 100644
--- a/core/src/main/res/values-sk-rSK/strings.xml
+++ b/core/src/main/res/values-sk-rSK/strings.xml
@@ -81,7 +81,6 @@
     <string name="extended_bolus">Predĺžený bolus</string>
     <string name="pump_time_updated">Čas v pumpe bol aktualizovaný</string>
     <string name="exit">Koniec</string>
-    <string name="serial_number">Sériové číslo</string>
     <string name="removerecord">Odstrániť záznam</string>
     <string name="loopisdisabled">Uzavretý okruh je deaktivovaný</string>
     <string name="alarm">Alarm</string>
@@ -197,6 +196,7 @@
     <string name="careportal_openapsoffline">OpenAPS vypnuté</string>
     <string name="careportal_pumpbatterychange">Výmena batérie v pumpe</string>
     <string name="careportal_temporarytarget">Dočasný cieľ</string>
+    <string name="careportal_temporarytargetvalue">Hodnota dočasného cieľa</string>
     <string name="careportal_temporarytargetcancel">Zrušiť dočasný cieľ</string>
     <string name="boluswizard">Bolusová kalkulačka</string>
     <string name="glucosetype_finger">Prst</string>
@@ -244,30 +244,6 @@
     <!--    Ntp-->
     <string name="timedetection">Detekcia času</string>
     <string name="format_hour_minute">%1$dh %2$dm</string>
-    <!-- PumoCommon - Pump Abstract -->
-    <string name="pump_operation_not_supported_by_pump_driver">Operácia nie je podporovaná pumpou a/alebo ovladačom.</string>
-    <string name="pump_operation_not_yet_supported_by_pump">Operácia zatiaľ nepodporovaná pumpou.</string>
-    <string name="common_resultok">OK</string>
-    <!-- PumoCommon - Pump Status -->
-    <string name="pump_status_never_contacted">Nikdy nepripojené</string>
-    <string name="pump_status_waking_up">Prebúdzanie</string>
-    <string name="pump_status_error_comm">Chyba komunikácie</string>
-    <string name="pump_status_timeout_comm">Uplynul časový limit komunikácie</string>
-    <string name="pump_status_pump_unreachable">Pumpa nedostupná</string>
-    <string name="pump_status_invalid_config">Neplatná konfigurácia</string>
-    <string name="pump_status_active">Aktívna</string>
-    <string name="pump_status_sleeping">Spiaca</string>
-    <!-- PumpCommon - History Group -->
-    <string name="history_group_basal">Bazály</string>
-    <string name="history_group_configuration">Konfigurácie</string>
-    <string name="history_group_notification">Notifikácie</string>
-    <string name="history_group_statistic">Štatistika</string>
-    <string name="history_group_unknown">Neznáme</string>
-    <string name="history_group_all">Všetko</string>
-    <string name="history_group_bolus">Bolusy</string>
-    <string name="history_group_prime">Plnenie</string>
-    <string name="history_group_alarm">Alarmy</string>
-    <string name="history_group_glucose">Glykémia</string>
     <string name="mute5min">Stíšiť na 5 minút</string>
     <!-- Maintenance -->
     <string name="metadata_label_format">Formát súboru</string>
@@ -406,6 +382,24 @@
     <string name="ue_timestamp">Časová pečiatka</string>
     <string name="ue_none">Žiadna jednotka</string>
     <string name="ue_export_to_csv">Exportovať užívateľské záznamy do Excelu (csv)</string>
+    <string name="uel_loop_change">UZAVRETÝ OKRUH ZMENENÝ</string>
+    <string name="uel_loop_removed">UZAVRETÝ OKRUH ODSTRÁNENÝ</string>
+    <string name="uel_other">INÉ</string>
+    <!-- HardLimits -->
+    <string name="profile_low_target">Dolný cieľ profilu</string>
+    <string name="profile_high_target">Horný cieľ profilu</string>
+    <string name="temp_target_low_target">Dolná hodnota dočasného cieľa</string>
+    <string name="temp_target_high_target">Horná hodnota dočasného cieľa</string>
+    <string name="temp_target_value">Hodnota dočasného cieľa</string>
+    <string name="profile_dia">Profilová hodnota DIA</string>
+    <string name="profile_sensitivity_value">Profilová hodnota citlivosti</string>
+    <string name="profile_max_daily_basal_value">Profilová maximálna hodnota bazálu</string>
+    <string name="current_basal_value">Aktuálna hodnota bazálu</string>
+    <string name="profile_carbs_ratio_value">Profilový inzulino-sacharidový pomer</string>
+    <string name="valuelimitedto">%1$.2f obmedzené na %2$.2f</string>
+    <string name="valueoutofrange">»%1$s« je mimo pevne nastavené limity</string>
+    <string name="value_out_of_hard_limits">»%1$s« %2$.2f je mimo pevne nastavených limitov</string>
+    <string name="basal_value">Hodnota bazálu</string>
     <plurals name="days">
         <item quantity="one">%1$d deň</item>
         <item quantity="few">%1$d dní</item>
diff --git a/core/src/main/res/values-sl-rSI/strings.xml b/core/src/main/res/values-sl-rSI/strings.xml
index a1a4975ce9..0a9e749b51 100644
--- a/core/src/main/res/values-sl-rSI/strings.xml
+++ b/core/src/main/res/values-sl-rSI/strings.xml
@@ -20,12 +20,10 @@
     <!--    CarbsReq-->
     <!--    TDDStatsActivity-->
     <!--    Ntp-->
-    <!-- PumoCommon - Pump Abstract -->
-    <!-- PumoCommon - Pump Status -->
-    <!-- PumpCommon - History Group -->
     <!-- Maintenance -->
     <!-- VersionChecker -->
     <!-- Permissions -->
     <!-- WeekdayPicker -->
     <!-- User Entry -->
+    <!-- HardLimits -->
 </resources>
diff --git a/core/src/main/res/values-sv-rSE/strings.xml b/core/src/main/res/values-sv-rSE/strings.xml
index 9e7964ec9c..4c9a90f99a 100644
--- a/core/src/main/res/values-sv-rSE/strings.xml
+++ b/core/src/main/res/values-sv-rSE/strings.xml
@@ -68,6 +68,28 @@
     <string name="pairing">Parkoppling</string>
     <string name="yes">Ja</string>
     <string name="no">Nej</string>
+    <string name="loopdisabled">LOOP INAKTIVERAD PGA BEGRÄNSNINGAR</string>
+    <string name="bolusdelivered">Bolus %1$.2f enheter levererat</string>
+    <string name="novalidbasalrate">Ingen giltig data om temp basaler fanns i pumpen</string>
+    <string name="limitingmaxiob">Begränsar max IOB till %1$.1f pga %2$s</string>
+    <string name="unsafeusage">osäker användning</string>
+    <string name="pump_unreachable">Pumpen kan inte nås</string>
+    <string name="pump_time_updated">Tiden uppdaterad i pumpen</string>
+    <string name="removerecord">Ta bort post</string>
+    <string name="disableloop">Inaktivera loop</string>
+    <string name="enableloop">Aktivera loop</string>
+    <string name="resumeloop">Återuppta loop</string>
+    <string name="suspendloop">Pausa loop</string>
+    <string name="notification">Avisering</string>
+    <string name="noprofile">Ingen profil laddad från Nightscout ännu</string>
+    <string name="exists">finns</string>
+    <string name="notexists">finns inte</string>
+    <string name="glucose">Glukos</string>
+    <string name="name_short">Namn:</string>
+    <string name="time">Tid</string>
+    <string name="ns_wifi_ssids">WiFi nätverksnamn</string>
+    <string name="event_time_label">När</string>
+    <string name="addnew">Lägg till</string>
     <!--    Constraints-->
     <string name="limitingbasalratio">Max basal: %1$.2f E/h pga %2$s</string>
     <string name="pumplimit">pumpbegränsning</string>
@@ -116,6 +138,7 @@
     <string name="profile_carbs_per_unit">g/U</string>
     <!--    ProfileFunction-->
     <string name="noprofileselected">Ingen profil vald</string>
+    <string name="startprofile">Byt till profil %1$d%% i %2$d min</string>
     <!--    PumpType-->
     <string name="def_extended_note">* Inga spann stöds som granularitet för basal/bolus i den virtuella pumpen. Endast enkla värden.</string>
     <!--    APSResult-->
@@ -155,10 +178,17 @@
     <string name="careportal_pumpbatterychange">Byte pumpbatteri</string>
     <string name="careportal_temporarytarget">Temp mål</string>
     <string name="careportal_temporarytargetcancel">Avbryt temp mål</string>
+    <string name="boluswizard">Kalkylator</string>
     <string name="glucosetype_finger">Finger</string>
     <string name="glucosetype_sensor">Sensor</string>
     <string name="manual">Manuell</string>
     <string name="unknown">okänd</string>
+    <string name="eatingsoon">Äta snart</string>
+    <string name="hypo">Hypo</string>
+    <string name="activity">Träning</string>
+    <string name="wear">Klocka (Wear)</string>
+    <string name="automation">Automation</string>
+    <string name="custom">Anpassad</string>
     <!--    Command-->
     <string name="connectiontimedout">Anslutningen tog för lång tid</string>
     <!--    PumpEnactResult-->
@@ -190,30 +220,6 @@
     <!--    Ntp-->
     <string name="timedetection">Tidsdetektering</string>
     <string name="format_hour_minute">%1$dh %2$dm</string>
-    <!-- PumoCommon - Pump Abstract -->
-    <string name="pump_operation_not_supported_by_pump_driver">Operation stöds inte av pumpen/pumpdrivrutinen.</string>
-    <string name="pump_operation_not_yet_supported_by_pump">Operationen stöds inte av pumpen ännu.</string>
-    <string name="common_resultok">OK</string>
-    <!-- PumoCommon - Pump Status -->
-    <string name="pump_status_never_contacted">Aldrig ansluten</string>
-    <string name="pump_status_waking_up">Väcker</string>
-    <string name="pump_status_error_comm">Kommunikationsfel</string>
-    <string name="pump_status_timeout_comm">Kommunikationstimeout</string>
-    <string name="pump_status_pump_unreachable">Pumpen kan inte nås</string>
-    <string name="pump_status_invalid_config">Felaktig konfiguration</string>
-    <string name="pump_status_active">Aktiv</string>
-    <string name="pump_status_sleeping">Sover</string>
-    <!-- PumpCommon - History Group -->
-    <string name="history_group_basal">Basaldoser</string>
-    <string name="history_group_configuration">Konfigurationer</string>
-    <string name="history_group_notification">Notiser</string>
-    <string name="history_group_statistic">Statistik</string>
-    <string name="history_group_unknown">Okända</string>
-    <string name="history_group_all">Alla</string>
-    <string name="history_group_bolus">Bolusar</string>
-    <string name="history_group_prime">Förfyllningar</string>
-    <string name="history_group_alarm">Larm</string>
-    <string name="history_group_glucose">Glukos</string>
     <string name="mute5min">Tysta i 5 minuter</string>
     <!-- Maintenance -->
     <string name="metadata_label_created_at">Skapad</string>
@@ -256,4 +262,5 @@
     <!-- Permissions -->
     <!-- WeekdayPicker -->
     <!-- User Entry -->
+    <!-- HardLimits -->
 </resources>
diff --git a/core/src/main/res/values-sv-rSE/validator.xml b/core/src/main/res/values-sv-rSE/validator.xml
index 3ea04e700d..3b2288d895 100644
--- a/core/src/main/res/values-sv-rSE/validator.xml
+++ b/core/src/main/res/values-sv-rSE/validator.xml
@@ -1,2 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
+<resources>
+    <string name="error_only_numeric_digits_allowed">Endast siffror tillåtna.</string>
+    <string name="error_only_numeric_digits_range_allowed">Endast siffror mellan %1$s - %2$s är tillåtna.</string>
+    <string name="error_this_field_cannot_contain_special_character">Det här fältet får inte innehålla något specialtecken</string>
+    <string name="error_only_standard_letters_are_allowed">Endast vanliga bokstäver är tillåtna</string>
+    <string name="error_field_must_not_be_empty">Detta fält får inte vara tomt</string>
+    <string name="error_email_address_not_valid">Ogiltig e-postadress</string>
+    <string name="error_creditcard_number_not_valid">Ogiltigt kreditkortsnummer</string>
+    <string name="error_phone_not_valid">Ogiltigt telefonnummer</string>
+    <string name="error_domain_not_valid">Ogiltigt domännamn</string>
+    <string name="error_ip_not_valid">Ogiltig IP-adress</string>
+    <string name="error_url_not_valid">Ogiltig URL</string>
+    <string name="error_notvalid_personname">Ogiltigt för- eller efternamn.</string>
+    <string name="error_notvalid_personfullname">Ogiltigt namn</string>
+    <string name="error_date_not_valid">Ogiltigt format</string>
+    <string name="error_mustbe4digitnumber">Måste vara fyra siffror</string>
+    <string name="error_mustbe6digitnumber">Måste vara sex siffror</string>
+    <string name="error_not_a_minimum_length">För kort</string>
+    <string name="error_pin_not_valid">Pin ska vara 3-6 siffror, inte samma eller efter varandra</string>
+</resources>
diff --git a/core/src/main/res/values-ta-rIN/strings.xml b/core/src/main/res/values-ta-rIN/strings.xml
index a1a4975ce9..0a9e749b51 100644
--- a/core/src/main/res/values-ta-rIN/strings.xml
+++ b/core/src/main/res/values-ta-rIN/strings.xml
@@ -20,12 +20,10 @@
     <!--    CarbsReq-->
     <!--    TDDStatsActivity-->
     <!--    Ntp-->
-    <!-- PumoCommon - Pump Abstract -->
-    <!-- PumoCommon - Pump Status -->
-    <!-- PumpCommon - History Group -->
     <!-- Maintenance -->
     <!-- VersionChecker -->
     <!-- Permissions -->
     <!-- WeekdayPicker -->
     <!-- User Entry -->
+    <!-- HardLimits -->
 </resources>
diff --git a/core/src/main/res/values-tr-rTR/strings.xml b/core/src/main/res/values-tr-rTR/strings.xml
index 9323ad6fb4..7a4d5e1725 100644
--- a/core/src/main/res/values-tr-rTR/strings.xml
+++ b/core/src/main/res/values-tr-rTR/strings.xml
@@ -5,6 +5,20 @@
     <string name="pump_basebasalrate">%1$.2f U/h</string>
     <string name="yes">Evet</string>
     <string name="no">Hayır</string>
+    <string name="loopdisabled">DÖNGÜ KISITLAMALARDAN İPTAL EDİLDİ</string>
+    <string name="novalidbasalrate">Pompadan okunan geçerli bir bazal oranı yok</string>
+    <string name="limitingmaxiob">%2$s\'den dolayı max IOB\'yi (Aktif İnsülin) %1$.1f U ile sınırlandırılıyor</string>
+    <string name="unsafeusage">güvenli olmayan kullanım</string>
+    <string name="pump_unreachable">Pompa ulaşılamıyor</string>
+    <string name="pump_time_updated">Pompa zamanı güncellendi</string>
+    <string name="disableloop">Döngü devre dışı bırak</string>
+    <string name="enableloop">Döngü etkinleştir</string>
+    <string name="resumeloop">Döngüyü başlat</string>
+    <string name="suspendloop">Döngüyü duraklat</string>
+    <string name="noprofile">Henüz NightSout\'tan profil yüklenmedi</string>
+    <string name="glucose">Glikoz</string>
+    <string name="time">Zaman</string>
+    <string name="ns_wifi_ssids">WiFi SSID</string>
     <!--    Constraints-->
     <!--    Dialogs-->
     <!--    BlePreCheck-->
@@ -18,18 +32,20 @@
     <!--    Temptarget-->
     <!--    TDD-->
     <!--    Translator-->
+    <string name="eatingsoon">Yakında Öğün</string>
+    <string name="hypo">Hipo</string>
+    <string name="wear">Wear</string>
+    <string name="custom">Özel</string>
     <!--    Command-->
     <!--    PumpEnactResult-->
     <!--    CarbsReq-->
     <!--    TDDStatsActivity-->
     <!--    Ntp-->
-    <!-- PumoCommon - Pump Abstract -->
-    <!-- PumoCommon - Pump Status -->
-    <!-- PumpCommon - History Group -->
     <!-- Maintenance -->
     <!-- VersionChecker -->
     <string name="versionavailable">Sürüm %1$s mevcut</string>
     <!-- Permissions -->
     <!-- WeekdayPicker -->
     <!-- User Entry -->
+    <!-- HardLimits -->
 </resources>
diff --git a/core/src/main/res/values-tr-rTR/validator.xml b/core/src/main/res/values-tr-rTR/validator.xml
index 3ea04e700d..2ad874719e 100644
--- a/core/src/main/res/values-tr-rTR/validator.xml
+++ b/core/src/main/res/values-tr-rTR/validator.xml
@@ -1,2 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
+<resources>
+    <string name="error_only_numeric_digits_allowed">Yalnızca sayısal rakam girebilirsiniz.</string>
+    <string name="error_only_numeric_digits_range_allowed">%1$s - %2$s aralığında yalnızca sayısal rakamlar kullanılabilir.</string>
+    <string name="error_field_must_not_be_empty">Alan boş olmamalı</string>
+    <string name="error_phone_not_valid">Telefon numarası geçerli değil</string>
+</resources>
diff --git a/core/src/main/res/values-zh-rCN/strings.xml b/core/src/main/res/values-zh-rCN/strings.xml
index e3fe1eb4dd..2b6f47d568 100644
--- a/core/src/main/res/values-zh-rCN/strings.xml
+++ b/core/src/main/res/values-zh-rCN/strings.xml
@@ -5,6 +5,27 @@
     <string name="pump_basebasalrate">%1$.2f U/h</string>
     <string name="yes">是</string>
     <string name="no">否</string>
+    <string name="loopdisabled">按约束条件禁用循环</string>
+    <string name="novalidbasalrate">从泵中无法读取有效的基础率</string>
+    <string name="limitingmaxiob">由于 %2$s, 将最大 IOB(活性胰岛素) 限制为 %1$.1f U</string>
+    <string name="unsafeusage">不安全的用法</string>
+    <string name="pump_unreachable">泵无法连接</string>
+    <string name="pump_time_updated">泵时间已经更新</string>
+    <string name="removerecord">删除记录</string>
+    <string name="disableloop">禁用闭环</string>
+    <string name="enableloop">启用闭环</string>
+    <string name="resumeloop">恢复闭环</string>
+    <string name="suspendloop">暂停闭环</string>
+    <string name="notification">通知</string>
+    <string name="noprofile">尚未从 NS 加载配置文件</string>
+    <string name="exists">存在</string>
+    <string name="notexists">不存在</string>
+    <string name="glucose">血糖</string>
+    <string name="cob">COB活性碳水</string>
+    <string name="name_short">名称:</string>
+    <string name="time">时间</string>
+    <string name="ns_wifi_ssids">WiFi SSID</string>
+    <string name="addnew">添加新条目</string>
     <!--    Constraints-->
     <!--    Dialogs-->
     <!--    BlePreCheck-->
@@ -12,21 +33,25 @@
     <!--    Protection-->
     <!--    Profile-->
     <!--    ProfileFunction-->
+    <string name="startprofile">启动配置文件 %1$d%%在 %2$d 分钟</string>
     <!--    PumpType-->
     <!--    APSResult-->
     <!--    ProfileSwitch-->
     <!--    Temptarget-->
     <!--    TDD-->
     <!--    Translator-->
+    <string name="boluswizard">大剂量向导</string>
+    <string name="eatingsoon">很快吃饭</string>
+    <string name="hypo">低</string>
+    <string name="activity">活动</string>
+    <string name="wear">手表</string>
+    <string name="automation">自动操作</string>
+    <string name="custom">自定义</string>
     <!--    Command-->
     <!--    PumpEnactResult-->
     <!--    CarbsReq-->
     <!--    TDDStatsActivity-->
     <!--    Ntp-->
-    <!-- PumoCommon - Pump Abstract -->
-    <string name="pump_operation_not_yet_supported_by_pump">泵不支持操作 YYT 。</string>
-    <!-- PumoCommon - Pump Status -->
-    <!-- PumpCommon - History Group -->
     <!-- Maintenance -->
     <string name="metadata_label_created_at">创建于</string>
     <string name="metadata_label_aaps_version">AAPS 版本</string>
@@ -65,4 +90,5 @@
     <!-- Permissions -->
     <!-- WeekdayPicker -->
     <!-- User Entry -->
+    <!-- HardLimits -->
 </resources>
diff --git a/core/src/main/res/values-zh-rCN/validator.xml b/core/src/main/res/values-zh-rCN/validator.xml
index 3ea04e700d..87a88ef29a 100644
--- a/core/src/main/res/values-zh-rCN/validator.xml
+++ b/core/src/main/res/values-zh-rCN/validator.xml
@@ -1,2 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
+<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_field_must_not_be_empty">此字段不能为空</string>
+    <string name="error_phone_not_valid">电话号码无效</string>
+</resources>
diff --git a/core/src/main/res/values/colors.xml b/core/src/main/res/values/colors.xml
index 694164b776..ead398c2a6 100644
--- a/core/src/main/res/values/colors.xml
+++ b/core/src/main/res/values/colors.xml
@@ -12,7 +12,7 @@
     <color name="black_overlay">#66000000</color>
 
     <!--    Fragments-->
-    <color name="colorInitializingBorder">#00695c</color>
+    <color name="pumpStatusBackground">#505050</color>
 
     <!--    Dialogs-->
     <color name="dialog_title_background">#303030</color>
diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml
index 8742f92523..512cfec8eb 100644
--- a/core/src/main/res/values/strings.xml
+++ b/core/src/main/res/values/strings.xml
@@ -57,6 +57,12 @@
     <string name="key_active_pump_change_timestamp" translatable="false">active_pump_change_timestamp</string>
     <string name="key_active_pump_type" translatable="false">active_pump_type</string>
     <string name="key_active_pump_serial_number" translatable="false">active_pump_serial_number</string>
+    <string name="key_age" translatable="false">age</string>
+    <string name="key_child" translatable="false">child</string>
+    <string name="key_teenage" translatable="false">teenage</string>
+    <string name="key_adult" translatable="false">adult</string>
+    <string name="key_resistantadult" translatable="false">resistantadult</string>
+    <string name="key_pregnant" translatable="false">pregnant</string>
 
     <!--    General-->
     <string name="refresh">Refresh</string>
@@ -75,6 +81,7 @@
     <string name="connected">Connected</string>
     <string name="disconnected">Disconnected</string>
     <string name="disconnecting">Disconnecting</string>
+    <string name="waiting_for_disconnection">Waiting for disconnection</string>
     <string name="androidaps_start">AndroidAPS started</string>
     <string name="formatinsulinunits1">%1$.1f U</string>
     <string name="formatinsulinunits">%1$.2f U</string>
@@ -138,7 +145,6 @@
     <string name="extended_bolus">Extended bolus</string>
     <string name="pump_time_updated">Pump time updated</string>
     <string name="exit">Exit</string>
-    <string name="serial_number">Serial number</string>
     <string name="removerecord">Remove record</string>
     <string name="loopisdisabled">Loop is disabled</string>
     <string name="alarm">Alarm</string>
@@ -267,6 +273,7 @@
     <string name="careportal_openapsoffline">OpenAPS Offline</string>
     <string name="careportal_pumpbatterychange">Pump Battery Change</string>
     <string name="careportal_temporarytarget">Temporary target</string>
+    <string name="careportal_temporarytargetvalue">Temporary target value</string>
     <string name="careportal_temporarytargetcancel">Temporary target cancel</string>
     <string name="boluswizard">Bolus wizard</string>
     <string name="glucosetype_finger">Finger</string>
@@ -283,6 +290,8 @@
     <string name="loop">Loop</string>
     <string name="ns">NS</string>
     <string name="record">Record</string>
+    <string name="reading_pump_history">Reading pump history</string>
+    <string name="pump_icon">Pump icon</string>
 
     <!--    Command-->
     <string name="connectiontimedout">Connection timed out</string>
@@ -320,32 +329,6 @@
     <string name="timedetection">Time detection</string>
     <string name="format_hour_minute">%1$dh %2$dm</string>
 
-    <!-- PumoCommon - Pump Abstract -->
-    <string name="pump_operation_not_supported_by_pump_driver">Operation not supported by pump and/or driver.</string>
-    <string name="pump_operation_not_yet_supported_by_pump">Operation not YET supported by pump.</string>
-    <string name="common_resultok">OK</string>
-
-    <!-- PumoCommon - Pump Status -->
-    <string name="pump_status_never_contacted">Never contacted</string>
-    <string name="pump_status_waking_up">Waking up</string>
-    <string name="pump_status_error_comm">Error with communication</string>
-    <string name="pump_status_timeout_comm">Timeout on communication</string>
-    <string name="pump_status_pump_unreachable">Pump unreachable</string>
-    <string name="pump_status_invalid_config">Invalid configuration</string>
-    <string name="pump_status_active">Active</string>
-    <string name="pump_status_sleeping">Sleeping</string>
-
-    <!-- PumpCommon - History Group -->
-    <string name="history_group_basal">Basals</string>
-    <string name="history_group_configuration">Configurations</string>
-    <string name="history_group_notification">Notifications</string>
-    <string name="history_group_statistic">Statistics</string>
-    <string name="history_group_unknown">Unknowns</string>
-    <string name="history_group_all">All</string>
-    <string name="history_group_bolus">Boluses</string>
-    <string name="history_group_prime">Prime</string>
-    <string name="history_group_alarm">Alarms</string>
-    <string name="history_group_glucose">Glucose</string>
     <string name="mute5min">Mute for 5 minutes</string>
 
     <!-- Maintenance -->
@@ -494,6 +477,25 @@
     <string name="ue_none">No Unit</string>
     <string name="ue_export_to_csv">Export User Entries to Excel (csv)</string>
     <string name="ue_csv_header" translatable="false">"%1$s;%2$s;%3$s;%4$s;%5$s;%6$s;%7$s;%8$s;%9$s;%10$s;%11$s;%12$s;%13$s;%14$s;%15$s;%16$s;%17$s"</string>
+    <string name="uel_loop_change">LOOP CHANGED</string>
+    <string name="uel_loop_removed">LOOP REMOVED</string>
+    <string name="uel_other">OTHER</string>
+
+    <!-- HardLimits -->
+    <string name="profile_low_target">Profile low target</string>
+    <string name="profile_high_target">Profile high target</string>
+    <string name="temp_target_low_target">Temporary target bottom value</string>
+    <string name="temp_target_high_target">Temporary target top value</string>
+    <string name="temp_target_value">Temporary target value</string>
+    <string name="profile_dia">Profile DIA value</string>
+    <string name="profile_sensitivity_value">Profile sensitivity value</string>
+    <string name="profile_max_daily_basal_value">Maximal profile basal value</string>
+    <string name="current_basal_value">Current basal value</string>
+    <string name="profile_carbs_ratio_value">Profile carbs ratio value</string>
+    <string name="valuelimitedto">%1$.2f limited to %2$.2f</string>
+    <string name="valueoutofrange">»%1$s« is out of hard limits</string>
+    <string name="value_out_of_hard_limits">»%1$s« %2$.2f is out of hard limits</string>
+    <string name="basal_value">Basal value</string>
 
     <plurals name="days">
         <item quantity="one">%1$d day</item>
diff --git a/core/src/test/java/info/nightscout/androidaps/TestBaseWithProfile.kt b/core/src/test/java/info/nightscout/androidaps/TestBaseWithProfile.kt
index 8b145c52a4..bd213d3c8e 100644
--- a/core/src/test/java/info/nightscout/androidaps/TestBaseWithProfile.kt
+++ b/core/src/test/java/info/nightscout/androidaps/TestBaseWithProfile.kt
@@ -4,7 +4,11 @@ import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.data.ProfileSealed
 import info.nightscout.androidaps.extensions.pureProfileFromJson
-import info.nightscout.androidaps.interfaces.*
+import info.nightscout.androidaps.interfaces.ActivePlugin
+import info.nightscout.androidaps.interfaces.Config
+import info.nightscout.androidaps.interfaces.Profile
+import info.nightscout.androidaps.interfaces.ProfileFunction
+import info.nightscout.androidaps.interfaces.ProfileStore
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.utils.DefaultValueHelper
@@ -13,15 +17,12 @@ import info.nightscout.androidaps.utils.resources.ResourceHelper
 import org.json.JSONObject
 import org.junit.Before
 import org.mockito.Mock
-import org.powermock.core.classloader.annotations.PrepareForTest
 
 @Suppress("SpellCheckingInspection")
-@PrepareForTest(FabricPrivacy::class)
 open class TestBaseWithProfile : TestBase() {
 
     @Mock lateinit var activePluginProvider: ActivePlugin
     @Mock lateinit var resourceHelper: ResourceHelper
-    @Mock lateinit var treatmentsInterface: TreatmentsInterface
     @Mock lateinit var fabricPrivacy: FabricPrivacy
     @Mock lateinit var profileFunction: ProfileFunction
     @Mock lateinit var defaultValueHelper: DefaultValueHelper
diff --git a/core/src/test/java/info/nightscout/androidaps/data/ConstraintTest.kt b/core/src/test/java/info/nightscout/androidaps/data/ConstraintTest.kt
index 8259d37968..b702ea05bd 100644
--- a/core/src/test/java/info/nightscout/androidaps/data/ConstraintTest.kt
+++ b/core/src/test/java/info/nightscout/androidaps/data/ConstraintTest.kt
@@ -2,19 +2,13 @@ package info.nightscout.androidaps.data
 
 import info.nightscout.androidaps.TestBase
 import info.nightscout.androidaps.interfaces.Constraint
-import info.nightscout.androidaps.utils.sharedPreferences.SP
 import org.junit.Assert
 import org.junit.Before
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.powermock.core.classloader.annotations.PrepareForTest
-import org.powermock.modules.junit4.PowerMockRunner
 
 /**
  * Created by mike on 19.03.2018.
  */
-@RunWith(PowerMockRunner::class)
-@PrepareForTest(SP::class)
 class ConstraintTest : TestBase() {
 
     @Test fun doTests() {
diff --git a/core/src/test/java/info/nightscout/androidaps/data/IobTest.kt b/core/src/test/java/info/nightscout/androidaps/data/IobTest.kt
index 7a550b03f6..b941a8014f 100644
--- a/core/src/test/java/info/nightscout/androidaps/data/IobTest.kt
+++ b/core/src/test/java/info/nightscout/androidaps/data/IobTest.kt
@@ -2,10 +2,7 @@ package info.nightscout.androidaps.data
 
 import org.junit.Assert
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.powermock.modules.junit4.PowerMockRunner
 
-@RunWith(PowerMockRunner::class)
 class IobTest {
 
     @Test fun plusTest() {
diff --git a/core/src/test/java/info/nightscout/androidaps/data/IobTotalTest.kt b/core/src/test/java/info/nightscout/androidaps/data/IobTotalTest.kt
index bfe97bc80a..c9c30b296a 100644
--- a/core/src/test/java/info/nightscout/androidaps/data/IobTotalTest.kt
+++ b/core/src/test/java/info/nightscout/androidaps/data/IobTotalTest.kt
@@ -1,17 +1,15 @@
 package info.nightscout.androidaps.data
 
 import android.content.Context
+import info.nightscout.androidaps.TestBase
 import info.nightscout.androidaps.utils.DateUtil
 import org.junit.Assert
 import org.junit.Before
 import org.junit.Test
-import org.junit.runner.RunWith
 import org.mockito.Mock
-import org.powermock.modules.junit4.PowerMockRunner
 
 @Suppress("SpellCheckingInspection")
-@RunWith(PowerMockRunner::class)
-class IobTotalTest {
+class IobTotalTest : TestBase() {
 
     @Mock lateinit var context: Context
 
diff --git a/core/src/test/java/info/nightscout/androidaps/data/MealDataTest.kt b/core/src/test/java/info/nightscout/androidaps/data/MealDataTest.kt
index 07ecaffe97..4dd36c1f99 100644
--- a/core/src/test/java/info/nightscout/androidaps/data/MealDataTest.kt
+++ b/core/src/test/java/info/nightscout/androidaps/data/MealDataTest.kt
@@ -2,10 +2,7 @@ package info.nightscout.androidaps.data
 
 import org.junit.Assert
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.powermock.modules.junit4.PowerMockRunner
 
-@RunWith(PowerMockRunner::class)
 class MealDataTest {
 
     @Test fun canCreateObject() {
diff --git a/core/src/test/java/info/nightscout/androidaps/data/NonOverlappingIntervalsTest.kt b/core/src/test/java/info/nightscout/androidaps/data/NonOverlappingIntervalsTest.kt
deleted file mode 100644
index 2f0c580b83..0000000000
--- a/core/src/test/java/info/nightscout/androidaps/data/NonOverlappingIntervalsTest.kt
+++ /dev/null
@@ -1,55 +0,0 @@
-package info.nightscout.androidaps.data
-
-import dagger.android.AndroidInjector
-import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.TestBase
-import info.nightscout.androidaps.db.TemporaryBasal
-import info.nightscout.androidaps.utils.T
-import org.junit.Assert
-import org.junit.Test
-import org.junit.runner.RunWith
-import org.powermock.modules.junit4.PowerMockRunner
-
-@RunWith(PowerMockRunner::class)
-class NonOverlappingIntervalsTest : TestBase() {
-
-    private val startDate = System.currentTimeMillis()
-    var list = NonOverlappingIntervals<TemporaryBasal>()
-
-    val injector = HasAndroidInjector { AndroidInjector {} }
-
-    @Test
-    fun doTests() {
-        // create one 10h interval and test value in and out
-        list.add(TemporaryBasal(injector).date(startDate).duration(T.hours(10).mins().toInt()).absolute(1.0))
-        Assert.assertEquals(null, list.getValueByInterval(startDate - T.secs(1).msecs()))
-        Assert.assertEquals(1.0, list.getValueByInterval(startDate)!!.absoluteRate, 0.01)
-        Assert.assertEquals(null, list.getValueByInterval(startDate + T.hours(10).msecs() + 1))
-
-        // stop temp  after 5h
-        list.add(TemporaryBasal(injector).date(startDate + T.hours(5).msecs()).duration(0))
-        Assert.assertEquals(null, list.getValueByInterval(startDate - T.secs(1).msecs()))
-        Assert.assertEquals(1.0, list.getValueByInterval(startDate)!!.absoluteRate, 0.01)
-        Assert.assertEquals(1.0, list.getValueByInterval(startDate + T.hours(5).msecs() - 1)!!.absoluteRate, 0.01)
-        Assert.assertEquals(null, list.getValueByInterval(startDate + T.hours(5).msecs() + 1))
-        Assert.assertEquals(null, list.getValueByInterval(startDate + T.hours(10).msecs() + 1))
-
-        // insert 1h interval inside
-        list.add(TemporaryBasal(injector).date(startDate + T.hours(3).msecs()).duration(T.hours(1).mins().toInt()).absolute(2.0))
-        Assert.assertEquals(null, list.getValueByInterval(startDate - T.secs(1).msecs()))
-        Assert.assertEquals(1.0, list.getValueByInterval(startDate)!!.absoluteRate, 0.01)
-        Assert.assertEquals(null, list.getValueByInterval(startDate + T.hours(5).msecs() - 1))
-        Assert.assertEquals(2.0, list.getValueByInterval(startDate + T.hours(3).msecs())!!.absoluteRate, 0.01)
-        Assert.assertEquals(2.0, list.getValueByInterval(startDate + T.hours(4).msecs() - 1)!!.absoluteRate, 0.01)
-        Assert.assertEquals(null, list.getValueByInterval(startDate + T.hours(4).msecs() + 1))
-        Assert.assertEquals(null, list.getValueByInterval(startDate + T.hours(10).msecs() + 1))
-    }
-
-    @Test
-    fun testCopyConstructor() {
-        list.reset()
-        list.add(TemporaryBasal(injector).date(startDate).duration(T.hours(10).mins().toInt()).absolute(1.0))
-        val list2 = NonOverlappingIntervals(list)
-        Assert.assertEquals(1, list2.list.size.toLong())
-    }
-}
\ No newline at end of file
diff --git a/core/src/test/java/info/nightscout/androidaps/data/OverlappingIntervalsTest.kt b/core/src/test/java/info/nightscout/androidaps/data/OverlappingIntervalsTest.kt
deleted file mode 100644
index 09b41eb0fb..0000000000
--- a/core/src/test/java/info/nightscout/androidaps/data/OverlappingIntervalsTest.kt
+++ /dev/null
@@ -1,58 +0,0 @@
-package info.nightscout.androidaps.data
-
-import info.nightscout.androidaps.utils.T
-import org.junit.Assert
-import org.junit.Test
-import org.junit.runner.RunWith
-import org.powermock.modules.junit4.PowerMockRunner
-import java.util.*
-
-@RunWith(PowerMockRunner::class)
-class OverlappingIntervalsTest {
-
-    private val startDate = System.currentTimeMillis()
-    private var list = OverlappingIntervals<TempTargetTest>()
-    @Test fun doTests() {
-        // create one 10h interval and test value in and out
-        list.add(TempTargetTest().date(startDate).duration(T.hours(10).mins()).low(100.0).high(100.0))
-        Assert.assertEquals(null, list.getValueByInterval(startDate - T.secs(1).msecs()))
-        Assert.assertEquals(100.0, list.getValueByInterval(startDate)!!.target(), 0.01)
-        Assert.assertEquals(null, list.getValueByInterval(startDate + T.hours(10).msecs() + 1))
-
-        // stop temp target after 5h
-        list.add(TempTargetTest().date(startDate + T.hours(5).msecs()).duration(0))
-        Assert.assertEquals(null, list.getValueByInterval(startDate - T.secs(1).msecs()))
-        Assert.assertEquals(100.0, list.getValueByInterval(startDate)!!.target(), 0.01)
-        Assert.assertEquals(100.0, list.getValueByInterval(startDate + T.hours(5).msecs() - 1)!!.target(), 0.01)
-        Assert.assertEquals(null, list.getValueByInterval(startDate + T.hours(5).msecs() + 1))
-        Assert.assertEquals(null, list.getValueByInterval(startDate + T.hours(10).msecs() + 1))
-
-        // insert 1h interval inside
-        list.add(TempTargetTest().date(startDate + T.hours(3).msecs()).duration(T.hours(1).mins()).low(200.0).high(200.0))
-        Assert.assertEquals(null, list.getValueByInterval(startDate - T.secs(1).msecs()))
-        Assert.assertEquals(100.0, list.getValueByInterval(startDate)!!.target(), 0.01)
-        Assert.assertEquals(100.0, list.getValueByInterval(startDate + T.hours(5).msecs() - 1)!!.target(), 0.01)
-        Assert.assertEquals(null, list.getValueByInterval(startDate + T.hours(5).msecs() + 1))
-        Assert.assertEquals(200.0, list.getValueByInterval(startDate + T.hours(3).msecs())!!.target(), 0.01)
-        Assert.assertEquals(100.0, list.getValueByInterval(startDate + T.hours(4).msecs() + 1)!!.target(), 0.01)
-        Assert.assertEquals(null, list.getValueByInterval(startDate + T.hours(10).msecs() + 1))
-    }
-
-    @Test fun testCopyConstructor() {
-        list.reset()
-        list.add(TempTargetTest().date(startDate).duration(T.hours(10).mins()).low(100.0).high(100.0))
-        val list2 = OverlappingIntervals(list)
-        Assert.assertEquals(1, list2.list.size.toLong())
-    }
-
-    @Test fun testReversingArrays() {
-        val someList: MutableList<TempTargetTest> = ArrayList()
-        someList.add(TempTargetTest().date(startDate).duration(T.hours(3).mins()).low(200.0).high(200.0))
-        someList.add(TempTargetTest().date(startDate + T.hours(1).msecs()).duration(T.hours(1).mins()).low(100.0).high(100.0))
-        list.reset()
-        list.add(someList)
-        Assert.assertEquals(startDate, list[0]?.data?.timestamp)
-        Assert.assertEquals(startDate + T.hours(1).msecs(), list.getReversed(0).data.timestamp)
-        Assert.assertEquals(startDate + T.hours(1).msecs(), list.reversedList[0].data.timestamp)
-    }
-}
\ No newline at end of file
diff --git a/core/src/test/java/info/nightscout/androidaps/data/ProfileIntervalsTest.kt b/core/src/test/java/info/nightscout/androidaps/data/ProfileIntervalsTest.kt
deleted file mode 100644
index b2d530ddcc..0000000000
--- a/core/src/test/java/info/nightscout/androidaps/data/ProfileIntervalsTest.kt
+++ /dev/null
@@ -1,82 +0,0 @@
-package info.nightscout.androidaps.data
-
-import info.nightscout.androidaps.TestBaseWithProfile
-import info.nightscout.androidaps.TestPumpPlugin
-import info.nightscout.androidaps.utils.T
-import org.junit.Assert
-import org.junit.Before
-import org.junit.Test
-import org.junit.runner.RunWith
-import org.mockito.Mockito.`when`
-import org.powermock.modules.junit4.PowerMockRunner
-import java.util.*
-
-@RunWith(PowerMockRunner::class)
-class ProfileIntervalsTest : TestBaseWithProfile() {
-    @Test
-    fun fake() {}
-/*
-    lateinit var testPumpPlugin: TestPumpPlugin
-    private val startDate = System.currentTimeMillis()
-    var list = ProfileIntervals<ProfileSwitch>()
-
-    @Before
-    fun mock() {
-        testPumpPlugin = TestPumpPlugin(profileInjector)
-        `when`(activePluginProvider.activePump).thenReturn(testPumpPlugin)
-    }
-
-    @Test
-    fun doTests() {
-        // create one 10h interval and test value in and out
-        list.add(ProfileSwitch(profileInjector).date(startDate).duration(T.hours(10).mins().toInt()).profileName("1").profile(validProfile))
-        // for older date first record should be returned only if has zero duration
-        Assert.assertEquals(null, list.getValueToTime(startDate - T.secs(1).msecs()))
-        Assert.assertEquals("1", (list.getValueToTime(startDate) as ProfileSwitch).profileName)
-        Assert.assertEquals(null, list.getValueToTime(startDate + T.hours(10).msecs() + 1))
-        list.reset()
-        list.add(ProfileSwitch(profileInjector).date(startDate).profileName("1").profile(validProfile))
-        Assert.assertEquals("1", (list.getValueToTime(startDate - T.secs(1).msecs()) as ProfileSwitch?)!!.profileName)
-        Assert.assertEquals("1", (list.getValueToTime(startDate) as ProfileSwitch).profileName)
-        Assert.assertEquals("1", (list.getValueToTime(startDate + T.hours(10).msecs() + 1) as ProfileSwitch?)!!.profileName)
-
-        // switch to different profile after 5h
-        list.add(ProfileSwitch(profileInjector).date(startDate + T.hours(5).msecs()).duration(0).profileName("2").profile(validProfile))
-        Assert.assertEquals("1", (list.getValueToTime(startDate - T.secs(1).msecs()) as ProfileSwitch?)!!.profileName)
-        Assert.assertEquals("1", (list.getValueToTime(startDate + T.hours(5).msecs() - 1) as ProfileSwitch?)!!.profileName)
-        Assert.assertEquals("2", (list.getValueToTime(startDate + T.hours(5).msecs() + 1) as ProfileSwitch?)!!.profileName)
-
-        // insert 1h interval inside
-        list.add(ProfileSwitch(profileInjector).date(startDate + T.hours(6).msecs()).duration(T.hours(1).mins().toInt()).profileName("3").profile(validProfile))
-        Assert.assertEquals("2", (list.getValueToTime(startDate + T.hours(6).msecs() - 1) as ProfileSwitch?)!!.profileName)
-        Assert.assertEquals("3", (list.getValueToTime(startDate + T.hours(6).msecs() + 1) as ProfileSwitch?)!!.profileName)
-        Assert.assertEquals("2", (list.getValueToTime(startDate + T.hours(7).msecs() + 1) as ProfileSwitch?)!!.profileName)
-    }
-
-    @Test
-    fun testCopyConstructor() {
-        list.reset()
-        list.add(ProfileSwitch(profileInjector).date(startDate).duration(T.hours(10).mins().toInt()).profileName("4").profile(validProfile))
-        val list2 = ProfileIntervals(list)
-        Assert.assertEquals(1, list2.list.size.toLong())
-    }
-
-    @Test fun invalidProfilesShouldNotBeReturned() {
-        list.reset()
-        list.add(ProfileSwitch(profileInjector).date(startDate + T.hours(1).msecs()).profileName("6"))
-        Assert.assertEquals(null, list[0])
-    }
-
-    @Test fun testReversingArrays() {
-        val someList: MutableList<ProfileSwitch> = ArrayList()
-        someList.add(ProfileSwitch(profileInjector).date(startDate).duration(T.hours(3).mins().toInt()).profileName("5").profile(validProfile))
-        someList.add(ProfileSwitch(profileInjector).date(startDate + T.hours(1).msecs()).duration(T.hours(1).mins().toInt()).profileName("6").profile(validProfile))
-        list.reset()
-        list.add(someList)
-        Assert.assertEquals(startDate, list[0]?.date)
-        Assert.assertEquals(startDate + T.hours(1).msecs(), list.getReversed(0).date)
-        Assert.assertEquals(startDate + T.hours(1).msecs(), list.reversedList[0].date)
-    }
-
- */
-}
\ No newline at end of file
diff --git a/core/src/test/java/info/nightscout/androidaps/data/ProfileTest.kt b/core/src/test/java/info/nightscout/androidaps/data/ProfileTest.kt
index d141926a7e..3c1e6b5732 100644
--- a/core/src/test/java/info/nightscout/androidaps/data/ProfileTest.kt
+++ b/core/src/test/java/info/nightscout/androidaps/data/ProfileTest.kt
@@ -2,11 +2,10 @@ package info.nightscout.androidaps.data
 
 import android.content.Context
 import dagger.android.AndroidInjector
-import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.TestBase
 import info.nightscout.androidaps.TestPumpPlugin
 import info.nightscout.androidaps.core.R
-import info.nightscout.androidaps.events.Event
+import info.nightscout.androidaps.database.AppRepository
 import info.nightscout.androidaps.extensions.pureProfileFromJson
 import info.nightscout.androidaps.interfaces.ActivePlugin
 import info.nightscout.androidaps.interfaces.Config
@@ -14,18 +13,18 @@ import info.nightscout.androidaps.interfaces.GlucoseUnit
 import info.nightscout.androidaps.interfaces.Profile
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.utils.DateUtil
+import info.nightscout.androidaps.utils.HardLimits
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import info.nightscout.androidaps.utils.rx.TestAapsSchedulers
+import info.nightscout.androidaps.utils.sharedPreferences.SP
 import org.json.JSONObject
 import org.junit.Assert
 import org.junit.Before
 import org.junit.Test
 import org.mockito.Mock
 import org.mockito.Mockito.`when`
-import org.mockito.Mockito.any
 import org.mockito.Mockito.anyInt
 import org.mockito.Mockito.anyString
-import org.mockito.Mockito.doNothing
 import java.util.*
 
 /**
@@ -38,25 +37,29 @@ class ProfileTest : TestBase() {
     @Mock lateinit var resourceHelper: ResourceHelper
     @Mock lateinit var context: Context
     @Mock lateinit var config: Config
+    @Mock lateinit var sp: SP
+    @Mock lateinit var repository: AppRepository
 
     private lateinit var rxBus: RxBusWrapper
     private lateinit var dateUtil: DateUtil
     private lateinit var testPumpPlugin: TestPumpPlugin
+    private lateinit var hardLimits: HardLimits
 
-    private var okProfile = "{\"dia\":\"3\",\"carbratio\":[{\"time\":\"00:00\",\"value\":\"30\"}],\"sens\":[{\"time\":\"00:00\",\"value\":\"100\"},{\"time\":\"2:00\",\"value\":\"110\"}],\"timezone\":\"UTC\",\"basal\":[{\"time\":\"00:00\",\"value\":\"0.1\"}],\"target_low\":[{\"time\":\"00:00\",\"value\":\"4\"}],\"target_high\":[{\"time\":\"00:00\",\"value\":\"5\"}],\"startDate\":\"1970-01-01T00:00:00.000Z\",\"units\":\"mmol\"}"
-    private var belowLimitValidProfile = "{\"dia\":\"3\",\"carbratio\":[{\"time\":\"00:00\",\"value\":\"30\"}],\"carbs_hr\":\"20\",\"delay\":\"20\",\"sens\":[{\"time\":\"00:00\",\"value\":\"100\"}],\"timezone\":\"UTC\",\"basal\":[{\"time\":\"00:00\",\"value\":\"0.001\"}],\"target_low\":[{\"time\":\"00:00\",\"value\":\"4\"}],\"target_high\":[{\"time\":\"00:00\",\"value\":\"5\"}],\"startDate\":\"1970-01-01T00:00:00.000Z\",\"units\":\"mmol\"}"
-    private var notAlignedBasalValidProfile = "{\"dia\":\"3\",\"carbratio\":[{\"time\":\"00:00\",\"value\":\"30\"}],\"carbs_hr\":\"20\",\"delay\":\"20\",\"sens\":[{\"time\":\"00:00\",\"value\":\"100\"}],\"timezone\":\"UTC\",\"basal\":[{\"time\":\"00:30\",\"value\":\"0.1\"}],\"target_low\":[{\"time\":\"00:00\",\"value\":\"4\"}],\"target_high\":[{\"time\":\"00:00\",\"value\":\"5\"}],\"startDate\":\"1970-01-01T00:00:00.000Z\",\"units\":\"mmol\"}"
-    private var notStartingAtZeroValidProfile = "{\"dia\":\"3\",\"carbratio\":[{\"time\":\"00:30\",\"value\":\"30\"}],\"carbs_hr\":\"20\",\"delay\":\"20\",\"sens\":[{\"time\":\"00:00\",\"value\":\"100\"}],\"timezone\":\"UTC\",\"basal\":[{\"time\":\"00:00\",\"value\":\"0.1\"}],\"target_low\":[{\"time\":\"00:00\",\"value\":\"4\"}],\"target_high\":[{\"time\":\"00:00\",\"value\":\"5\"}],\"startDate\":\"1970-01-01T00:00:00.000Z\",\"units\":\"mmol\"}"
-    private var noUnitsValidProfile = "{\"dia\":\"3\",\"carbratio\":[{\"time\":\"00:00\",\"value\":\"30\"}],\"carbs_hr\":\"20\",\"delay\":\"20\",\"sens\":[{\"time\":\"00:00\",\"value\":\"100\"}],\"timezone\":\"UTC\",\"basal\":[{\"time\":\"00:00\",\"value\":\"0.1\"}],\"target_low\":[{\"time\":\"00:00\",\"value\":\"4\"}],\"target_high\":[{\"time\":\"00:00\",\"value\":\"5\"}],\"startDate\":\"1970-01-01T00:00:00.000Z\"}"
-    private var wrongProfile = "{\"dia\":\"3\",\"carbs_hr\":\"20\",\"delay\":\"20\",\"sens\":[{\"time\":\"00:00\",\"value\":\"100\"}],\"timezone\":\"UTC\",\"basal\":[{\"time\":\"00:00\",\"value\":\"0.1\"}],\"target_low\":[{\"time\":\"00:00\",\"value\":\"4\"}],\"target_high\":[{\"time\":\"00:00\",\"value\":\"5\"}],\"startDate\":\"1970-01-01T00:00:00.000Z\",\"units\":\"mmol\"}"
+    private var okProfile = "{\"dia\":\"5\",\"carbratio\":[{\"time\":\"00:00\",\"value\":\"30\"}],\"sens\":[{\"time\":\"00:00\",\"value\":\"6\"},{\"time\":\"2:00\",\"value\":\"6.2\"}],\"timezone\":\"UTC\",\"basal\":[{\"time\":\"00:00\",\"value\":\"0.1\"}],\"target_low\":[{\"time\":\"00:00\",\"value\":\"4\"}],\"target_high\":[{\"time\":\"00:00\",\"value\":\"5\"}],\"startDate\":\"1970-01-01T00:00:00.000Z\",\"units\":\"mmol\"}"
+    private var belowLimitValidProfile = "{\"dia\":\"5\",\"carbratio\":[{\"time\":\"00:00\",\"value\":\"30\"}],\"carbs_hr\":\"20\",\"delay\":\"20\",\"sens\":[{\"time\":\"00:00\",\"value\":\"100\"}],\"timezone\":\"UTC\",\"basal\":[{\"time\":\"00:00\",\"value\":\"0.001\"}],\"target_low\":[{\"time\":\"00:00\",\"value\":\"4\"}],\"target_high\":[{\"time\":\"00:00\",\"value\":\"5\"}],\"startDate\":\"1970-01-01T00:00:00.000Z\",\"units\":\"mmol\"}"
+    private var notAlignedBasalValidProfile = "{\"dia\":\"5\",\"carbratio\":[{\"time\":\"00:00\",\"value\":\"30\"}],\"carbs_hr\":\"20\",\"delay\":\"20\",\"sens\":[{\"time\":\"00:00\",\"value\":\"100\"}],\"timezone\":\"UTC\",\"basal\":[{\"time\":\"00:30\",\"value\":\"0.1\"}],\"target_low\":[{\"time\":\"00:00\",\"value\":\"4\"}],\"target_high\":[{\"time\":\"00:00\",\"value\":\"5\"}],\"startDate\":\"1970-01-01T00:00:00.000Z\",\"units\":\"mmol\"}"
+    private var notStartingAtZeroValidProfile = "{\"dia\":\"5\",\"carbratio\":[{\"time\":\"00:30\",\"value\":\"30\"}],\"carbs_hr\":\"20\",\"delay\":\"20\",\"sens\":[{\"time\":\"00:00\",\"value\":\"100\"}],\"timezone\":\"UTC\",\"basal\":[{\"time\":\"00:00\",\"value\":\"0.1\"}],\"target_low\":[{\"time\":\"00:00\",\"value\":\"4\"}],\"target_high\":[{\"time\":\"00:00\",\"value\":\"5\"}],\"startDate\":\"1970-01-01T00:00:00.000Z\",\"units\":\"mmol\"}"
+    private var noUnitsValidProfile = "{\"dia\":\"5\",\"carbratio\":[{\"time\":\"00:00\",\"value\":\"30\"}],\"carbs_hr\":\"20\",\"delay\":\"20\",\"sens\":[{\"time\":\"00:00\",\"value\":\"100\"}],\"timezone\":\"UTC\",\"basal\":[{\"time\":\"00:00\",\"value\":\"0.1\"}],\"target_low\":[{\"time\":\"00:00\",\"value\":\"4\"}],\"target_high\":[{\"time\":\"00:00\",\"value\":\"5\"}],\"startDate\":\"1970-01-01T00:00:00.000Z\"}"
+    private var wrongProfile = "{\"dia\":\"5\",\"carbs_hr\":\"20\",\"delay\":\"20\",\"sens\":[{\"time\":\"00:00\",\"value\":\"100\"}],\"timezone\":\"UTC\",\"basal\":[{\"time\":\"00:00\",\"value\":\"0.1\"}],\"target_low\":[{\"time\":\"00:00\",\"value\":\"4\"}],\"target_high\":[{\"time\":\"00:00\",\"value\":\"5\"}],\"startDate\":\"1970-01-01T00:00:00.000Z\",\"units\":\"mmol\"}"
 
     //String profileStore = "{\"defaultProfile\":\"Default\",\"store\":{\"Default\":" + validProfile + "}}";
 
     @Before
     fun prepare() {
-        testPumpPlugin = TestPumpPlugin(HasAndroidInjector { AndroidInjector { } })
+        testPumpPlugin = TestPumpPlugin { AndroidInjector { } }
         dateUtil = DateUtil(context)
         rxBus = RxBusWrapper(TestAapsSchedulers())
+        hardLimits = HardLimits(aapsLogger, rxBus, sp, resourceHelper, context, repository)
         `when`(activePluginProvider.activePump).thenReturn(testPumpPlugin)
         `when`(resourceHelper.gs(R.string.profile_per_unit)).thenReturn("/U")
         `when`(resourceHelper.gs(R.string.profile_carbs_per_unit)).thenReturn("g/U")
@@ -69,10 +72,10 @@ class ProfileTest : TestBase() {
 
         // Test valid profile
         var p = ProfileSealed.Pure(pureProfileFromJson(JSONObject(okProfile), dateUtil)!!)
-        Assert.assertEquals(true, p.isValid("Test", testPumpPlugin, config, resourceHelper, rxBus))
+        Assert.assertEquals(true, p.isValid("Test", testPumpPlugin, config, resourceHelper, rxBus, hardLimits).isValid)
 //        Assert.assertEquals(true, p.log().contains("NS units: mmol"))
 //        JSONAssert.assertEquals(JSONObject(okProfile), p.toPureNsJson(dateUtil), false)
-        Assert.assertEquals(3.0, p.dia, 0.01)
+        Assert.assertEquals(5.0, p.dia, 0.01)
 //        Assert.assertEquals(TimeZone.getTimeZone("UTC"), p.timeZone)
         Assert.assertEquals("00:30", dateUtil.format_HH_MM(30 * 60))
         val c = Calendar.getInstance()
@@ -80,13 +83,13 @@ class ProfileTest : TestBase() {
         c[Calendar.MINUTE] = 0
         c[Calendar.SECOND] = 0
         c[Calendar.MILLISECOND] = 0
-        Assert.assertEquals(1800.0, p.getIsfMgdl(c.timeInMillis), 0.01)
+        Assert.assertEquals(108.0, p.getIsfMgdl(c.timeInMillis), 0.01)
         c[Calendar.HOUR_OF_DAY] = 2
-        Assert.assertEquals(1980.0, p.getIsfMgdl(c.timeInMillis), 0.01)
+        Assert.assertEquals(111.6, p.getIsfMgdl(c.timeInMillis), 0.01)
 //        Assert.assertEquals(110.0, p.getIsfTimeFromMidnight(2 * 60 * 60), 0.01)
         Assert.assertEquals("""
-    00:00    100,0 mmol/U
-    02:00    110,0 mmol/U
+    00:00    6,0 mmol/U
+    02:00    6,2 mmol/U
     """.trimIndent(), p.getIsfList(resourceHelper, dateUtil).replace(".", ","))
         Assert.assertEquals(30.0, p.getIc(c.timeInMillis), 0.01)
         Assert.assertEquals(30.0, p.getIcTimeFromMidnight(2 * 60 * 60), 0.01)
@@ -121,7 +124,7 @@ class ProfileTest : TestBase() {
 
         //Test basal profile below limit
         p = ProfileSealed.Pure(pureProfileFromJson(JSONObject(belowLimitValidProfile), dateUtil)!!)
-        p.isValid("Test", testPumpPlugin, config, resourceHelper, rxBus)
+        p.isValid("Test", testPumpPlugin, config, resourceHelper, rxBus, hardLimits)
 
         // Test profile w/o units
         Assert.assertNull(pureProfileFromJson(JSONObject(noUnitsValidProfile), dateUtil))
@@ -139,21 +142,21 @@ class ProfileTest : TestBase() {
         Assert.assertEquals(0.05, p.getBasal(c.timeInMillis), 0.01)
         Assert.assertEquals(1.2, p.percentageBasalSum(), 0.01)
         Assert.assertEquals(60.0, p.getIc(c.timeInMillis), 0.01)
-        Assert.assertEquals(3960.0, p.getIsfMgdl(c.timeInMillis), 0.01)
+        Assert.assertEquals(223.2, p.getIsfMgdl(c.timeInMillis), 0.01)
 
         // Test timeshift functionality
         p = ProfileSealed.Pure(pureProfileFromJson(JSONObject(okProfile), dateUtil)!!)
         p.ts = 1
         Assert.assertEquals(
             """
-                00:00    110.0 mmol/U
-                01:00    100.0 mmol/U
-                03:00    110.0 mmol/U
+                00:00    6.2 mmol/U
+                01:00    6.0 mmol/U
+                03:00    6.2 mmol/U
                 """.trimIndent(), p.getIsfList(resourceHelper, dateUtil))
 
         // Test hour alignment
         testPumpPlugin.pumpDescription.is30minBasalRatesCapable = false
         p = ProfileSealed.Pure(pureProfileFromJson(JSONObject(notAlignedBasalValidProfile), dateUtil)!!)
-        p.isValid("Test", testPumpPlugin, config, resourceHelper, rxBus)
+        p.isValid("Test", testPumpPlugin, config, resourceHelper, rxBus, hardLimits)
     }
 }
\ No newline at end of file
diff --git a/core/src/test/java/info/nightscout/androidaps/data/PumpEnactResultTest.kt b/core/src/test/java/info/nightscout/androidaps/data/PumpEnactResultTest.kt
index ed9c772189..687c9a64e8 100644
--- a/core/src/test/java/info/nightscout/androidaps/data/PumpEnactResultTest.kt
+++ b/core/src/test/java/info/nightscout/androidaps/data/PumpEnactResultTest.kt
@@ -1,6 +1,5 @@
 package info.nightscout.androidaps.data
 
-import android.text.Html
 import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.TestBaseWithProfile
@@ -9,14 +8,9 @@ import org.json.JSONObject
 import org.junit.Assert
 import org.junit.Before
 import org.junit.Test
-import org.junit.runner.RunWith
 import org.mockito.Mockito.`when`
-import org.powermock.core.classloader.annotations.PrepareForTest
-import org.powermock.modules.junit4.PowerMockRunner
 import org.skyscreamer.jsonassert.JSONAssert
 
-@RunWith(PowerMockRunner::class)
-@PrepareForTest(Html::class)
 class PumpEnactResultTest : TestBaseWithProfile() {
 
     val injector = HasAndroidInjector {
diff --git a/core/src/test/java/info/nightscout/androidaps/data/TempTargetTest.kt b/core/src/test/java/info/nightscout/androidaps/data/TempTargetTest.kt
deleted file mode 100644
index f8b5364341..0000000000
--- a/core/src/test/java/info/nightscout/androidaps/data/TempTargetTest.kt
+++ /dev/null
@@ -1,86 +0,0 @@
-package info.nightscout.androidaps.data
-
-import info.nightscout.androidaps.Constants
-import info.nightscout.androidaps.core.R
-import info.nightscout.androidaps.database.entities.TemporaryTarget
-import info.nightscout.androidaps.database.interfaces.end
-import info.nightscout.androidaps.interfaces.GlucoseUnit
-import info.nightscout.androidaps.interfaces.Interval
-import info.nightscout.androidaps.interfaces.Profile
-import info.nightscout.androidaps.utils.DecimalFormatter
-import info.nightscout.androidaps.utils.T
-import info.nightscout.androidaps.utils.resources.ResourceHelper
-import java.util.concurrent.TimeUnit
-
-class TempTargetTest(
-    var data: TemporaryTarget = TemporaryTarget(
-        timestamp = 0,
-        utcOffset = 0,
-        reason = TemporaryTarget.Reason.CUSTOM,
-        highTarget = 0.0,
-        lowTarget = 0.0,
-        duration = 0
-    )
-) : Interval {
-
-    fun date(timestamp: Long): TempTargetTest {
-        data.timestamp = timestamp
-        return this
-    }
-
-    fun duration(duration: Long): TempTargetTest {
-        data.duration = T.mins(duration).msecs()
-        return this
-    }
-
-    fun low(low: Double): TempTargetTest {
-        data.lowTarget = low
-        return this
-    }
-
-    fun high(high: Double): TempTargetTest {
-        data.highTarget = high
-        return this
-    }
-
-    fun target(): Double {
-        return (data.lowTarget + data.highTarget) / 2
-    }
-
-    // -------- Interval interface ---------
-
-    private var cuttedEnd: Long? = null
-
-    override fun durationInMsec(): Long = data.duration
-    override fun start(): Long = data.timestamp
-    override fun originalEnd(): Long = data.end // planned end time at time of creation
-    override fun end(): Long = cuttedEnd ?: originalEnd() // end time after cut
-    override fun cutEndTo(end: Long) {
-        cuttedEnd = end
-    }
-
-    override fun match(time: Long): Boolean = start() <= time && end() >= time
-    override fun before(time: Long): Boolean = end() < time
-    override fun after(time: Long): Boolean = start() > time
-    override val isInProgress: Boolean get() = match(System.currentTimeMillis())
-    override val isEndingEvent: Boolean get() = data.duration == 0L
-    override val isValid: Boolean get() = true
-
-    // -------- Interval interface end ---------
-/*
-    fun lowValueToUnitsToString(units: String): String =
-        if (units == Constants.MGDL) DecimalFormatter.to0Decimal(data.lowTarget)
-        else DecimalFormatter.to1Decimal(data.lowTarget * Constants.MGDL_TO_MMOLL)
-
-    fun highValueToUnitsToString(units: String): String =
-        if (units == Constants.MGDL) DecimalFormatter.to0Decimal(data.highTarget)
-        else DecimalFormatter.to1Decimal(data.highTarget * Constants.MGDL_TO_MMOLL)
-
-    override fun toString(): String = data.toString()
-
-    fun friendlyDescription(units: String, resourceHelper: ResourceHelper): String =
-        Profile.toTargetRangeString(data.lowTarget, data.highTarget, GlucoseUnit.MGDL, units) +
-            units +
-            "@" + resourceHelper.gs(R.string.format_mins, TimeUnit.MILLISECONDS.toMinutes(data.duration)) + "(" + data.reason.text + ")"
- */
-}
\ No newline at end of file
diff --git a/core/src/test/java/info/nightscout/androidaps/interfaces/PluginDescriptionTest.kt b/core/src/test/java/info/nightscout/androidaps/interfaces/PluginDescriptionTest.kt
index c288a064dc..59184335e5 100644
--- a/core/src/test/java/info/nightscout/androidaps/interfaces/PluginDescriptionTest.kt
+++ b/core/src/test/java/info/nightscout/androidaps/interfaces/PluginDescriptionTest.kt
@@ -3,10 +3,7 @@ package info.nightscout.androidaps.interfaces
 import androidx.fragment.app.Fragment
 import org.junit.Assert
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.powermock.modules.junit4.PowerMockRunner
 
-@RunWith(PowerMockRunner::class)
 class PluginDescriptionTest {
 
     @Test fun mainTypeTest() {
diff --git a/core/src/test/java/info/nightscout/androidaps/plugins/aps/loop/APSResultTest.kt b/core/src/test/java/info/nightscout/androidaps/plugins/aps/loop/APSResultTest.kt
index aa3b7944b3..67d0c695f2 100644
--- a/core/src/test/java/info/nightscout/androidaps/plugins/aps/loop/APSResultTest.kt
+++ b/core/src/test/java/info/nightscout/androidaps/plugins/aps/loop/APSResultTest.kt
@@ -14,15 +14,10 @@ import info.nightscout.androidaps.utils.sharedPreferences.SP
 import org.junit.Assert
 import org.junit.Before
 import org.junit.Test
-import org.junit.runner.RunWith
 import org.mockito.ArgumentMatchers
 import org.mockito.Mock
 import org.mockito.Mockito.`when`
-import org.powermock.core.classloader.annotations.PrepareForTest
-import org.powermock.modules.junit4.PowerMockRunner
 
-@RunWith(PowerMockRunner::class)
-@PrepareForTest(ConstraintChecker::class)
 class APSResultTest : TestBaseWithProfile() {
 
     @Mock lateinit var constraintChecker: ConstraintChecker
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/constraints/versionChecker/VersionCheckerUtilsKtTest.kt b/core/src/test/java/info/nightscout/androidaps/plugins/contraints/versionChecker/VersionCheckerUtilsKtTest.kt
similarity index 97%
rename from app/src/test/java/info/nightscout/androidaps/plugins/constraints/versionChecker/VersionCheckerUtilsKtTest.kt
rename to core/src/test/java/info/nightscout/androidaps/plugins/contraints/versionChecker/VersionCheckerUtilsKtTest.kt
index 473c9656cb..1f04d0c94e 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/constraints/versionChecker/VersionCheckerUtilsKtTest.kt
+++ b/core/src/test/java/info/nightscout/androidaps/plugins/contraints/versionChecker/VersionCheckerUtilsKtTest.kt
@@ -1,9 +1,11 @@
-package info.nightscout.androidaps.plugins.constraints.versionChecker
+package info.nightscout.androidaps.plugins.contraints.versionChecker
 
 import android.content.Context
-import info.nightscout.androidaps.utils.buildHelper.ConfigImpl
 import info.nightscout.androidaps.TestBase
+import info.nightscout.androidaps.interfaces.Config
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.constraints.versionChecker.VersionCheckerUtils
+import info.nightscout.androidaps.receivers.ReceiverStatusStore
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import info.nightscout.androidaps.utils.sharedPreferences.SP
 import org.junit.Assert.assertArrayEquals
@@ -14,17 +16,18 @@ import org.mockito.Mock
 
 class VersionCheckerUtilsKtTest : TestBase() {
 
-    lateinit var versionCheckerUtils: VersionCheckerUtils
+    private lateinit var versionCheckerUtils: VersionCheckerUtils
 
     @Mock lateinit var sp: SP
     @Mock lateinit var resourceHelper: ResourceHelper
     @Mock lateinit var context: Context
-    val config = ConfigImpl()
+    @Mock lateinit var receiverStatusStore: ReceiverStatusStore
+    @Mock lateinit var config: Config
 
     private val rxBus = RxBusWrapper(aapsSchedulers)
 
     @Before fun setup() {
-        versionCheckerUtils = VersionCheckerUtils(aapsLogger, sp, resourceHelper, rxBus, config, context)
+        versionCheckerUtils = VersionCheckerUtils(aapsLogger, sp, resourceHelper, rxBus, config, context, receiverStatusStore)
     }
 
     @Test
@@ -124,6 +127,7 @@ class VersionCheckerUtilsKtTest : TestBase() {
         }
 
     */
+    @Suppress("SpellCheckingInspection")
     @Test
     fun findVersionMatchesRegularVersion() {
         val buildGradle = """blabla
diff --git a/core/src/test/java/info/nightscout/androidaps/plugins/general/maintenance/formats/ClassicPrefsFormatTest.kt b/core/src/test/java/info/nightscout/androidaps/plugins/general/maintenance/formats/ClassicPrefsFormatTest.kt
index 0e79137e97..8ad8516c7d 100644
--- a/core/src/test/java/info/nightscout/androidaps/plugins/general/maintenance/formats/ClassicPrefsFormatTest.kt
+++ b/core/src/test/java/info/nightscout/androidaps/plugins/general/maintenance/formats/ClassicPrefsFormatTest.kt
@@ -5,15 +5,10 @@ import info.nightscout.androidaps.utils.resources.ResourceHelper
 import info.nightscout.androidaps.utils.userEntry.UserEntryPresentationHelper
 import org.junit.Assert
 import org.junit.Test
-import org.junit.runner.RunWith
 import org.mockito.Mock
 import org.mockito.Mockito.`when`
-import org.powermock.core.classloader.annotations.PrepareForTest
-import org.powermock.modules.junit4.PowerMockRunner
 import java.io.File
 
-@RunWith(PowerMockRunner::class)
-@PrepareForTest(File::class, UserEntryPresentationHelper::class)
 class ClassicPrefsFormatTest : TestBase() {
 
     @Mock lateinit var resourceHelper: ResourceHelper
diff --git a/core/src/test/java/info/nightscout/androidaps/plugins/general/maintenance/formats/EncryptedPrefsFormatTest.kt b/core/src/test/java/info/nightscout/androidaps/plugins/general/maintenance/formats/EncryptedPrefsFormatTest.kt
index 4094ff8a71..087cfcadc1 100644
--- a/core/src/test/java/info/nightscout/androidaps/plugins/general/maintenance/formats/EncryptedPrefsFormatTest.kt
+++ b/core/src/test/java/info/nightscout/androidaps/plugins/general/maintenance/formats/EncryptedPrefsFormatTest.kt
@@ -9,20 +9,12 @@ import org.junit.Assert
 import org.junit.Assume
 import org.junit.Before
 import org.junit.Test
-import org.junit.runner.RunWith
 import org.mockito.ArgumentMatchers
 import org.mockito.Mock
 import org.mockito.Mockito
-import org.powermock.core.classloader.annotations.PowerMockIgnore
-import org.powermock.core.classloader.annotations.PrepareForTest
-import org.powermock.modules.junit4.PowerMockRunner
 import java.io.File
 
 @Suppress("SpellCheckingInspection")
-@PowerMockIgnore("javax.crypto.*")
-@RunWith(PowerMockRunner::class)
-@PrepareForTest(File::class)
-@kotlin.ExperimentalStdlibApi
 class EncryptedPrefsFormatTest : TestBase() {
 
     @Mock lateinit var resourceHelper: ResourceHelper
diff --git a/core/src/test/java/info/nightscout/androidaps/plugins/iob/iobCalculator/GlucoseStatusTest.kt b/core/src/test/java/info/nightscout/androidaps/plugins/iob/iobCalculator/GlucoseStatusTest.kt
index 31319712a1..20975c9654 100644
--- a/core/src/test/java/info/nightscout/androidaps/plugins/iob/iobCalculator/GlucoseStatusTest.kt
+++ b/core/src/test/java/info/nightscout/androidaps/plugins/iob/iobCalculator/GlucoseStatusTest.kt
@@ -12,20 +12,14 @@ import info.nightscout.androidaps.utils.T
 import org.junit.Assert
 import org.junit.Before
 import org.junit.Test
-import org.junit.runner.RunWith
 import org.mockito.Mock
 import org.mockito.Mockito.`when`
-import org.powermock.api.mockito.PowerMockito
-import org.powermock.core.classloader.annotations.PrepareForTest
-import org.powermock.modules.junit4.PowerMockRunner
 import java.util.*
 
 /**
  * Created by mike on 26.03.2018.
  */
 @Suppress("SpellCheckingInspection")
-@RunWith(PowerMockRunner::class)
-@PrepareForTest(DateUtil::class, AutosensDataStore::class)
 class GlucoseStatusTest : TestBase() {
 
     @Mock lateinit var dateUtil: DateUtil
@@ -48,7 +42,7 @@ class GlucoseStatusTest : TestBase() {
     }
 
     @Test fun calculateValidGlucoseStatus() {
-        PowerMockito.`when`(autosensDataStore.getBgReadingsDataTableCopy()).thenReturn(generateValidBgData())
+        `when`(autosensDataStore.getBgReadingsDataTableCopy()).thenReturn(generateValidBgData())
         val glucoseStatus = GlucoseStatusProvider(aapsLogger, iobCobCalculatorPlugin, dateUtil).glucoseStatusData!!
         Assert.assertEquals(214.0, glucoseStatus.glucose, 0.001)
         Assert.assertEquals(-2.0, glucoseStatus.delta, 0.001)
@@ -58,7 +52,7 @@ class GlucoseStatusTest : TestBase() {
     }
 
     @Test fun calculateMostRecentGlucoseStatus() {
-        PowerMockito.`when`(autosensDataStore.getBgReadingsDataTableCopy()).thenReturn(generateMostRecentBgData())
+        `when`(autosensDataStore.getBgReadingsDataTableCopy()).thenReturn(generateMostRecentBgData())
         val glucoseStatus: GlucoseStatus = GlucoseStatusProvider(aapsLogger, iobCobCalculatorPlugin, dateUtil).glucoseStatusData!!
         Assert.assertEquals(215.0, glucoseStatus.glucose, 0.001) // (214+216) / 2
         Assert.assertEquals(-1.0, glucoseStatus.delta, 0.001)
@@ -68,7 +62,7 @@ class GlucoseStatusTest : TestBase() {
     }
 
     @Test fun oneRecordShouldProduceZeroDeltas() {
-        PowerMockito.`when`(autosensDataStore.getBgReadingsDataTableCopy()).thenReturn(generateOneCurrentRecordBgData())
+        `when`(autosensDataStore.getBgReadingsDataTableCopy()).thenReturn(generateOneCurrentRecordBgData())
         val glucoseStatus: GlucoseStatus = GlucoseStatusProvider(aapsLogger, iobCobCalculatorPlugin, dateUtil).glucoseStatusData!!
         Assert.assertEquals(214.0, glucoseStatus.glucose, 0.001)
         Assert.assertEquals(0.0, glucoseStatus.delta, 0.001)
@@ -78,19 +72,19 @@ class GlucoseStatusTest : TestBase() {
     }
 
     @Test fun insufficientDataShouldReturnNull() {
-        PowerMockito.`when`(autosensDataStore.getBgReadingsDataTableCopy()).thenReturn(generateInsufficientBgData())
+        `when`(autosensDataStore.getBgReadingsDataTableCopy()).thenReturn(generateInsufficientBgData())
         val glucoseStatus: GlucoseStatus? = GlucoseStatusProvider(aapsLogger, iobCobCalculatorPlugin, dateUtil).glucoseStatusData
         Assert.assertEquals(null, glucoseStatus)
     }
 
     @Test fun oldDataShouldReturnNull() {
-        PowerMockito.`when`(autosensDataStore.getBgReadingsDataTableCopy()).thenReturn(generateOldBgData())
+        `when`(autosensDataStore.getBgReadingsDataTableCopy()).thenReturn(generateOldBgData())
         val glucoseStatus: GlucoseStatus? = GlucoseStatusProvider(aapsLogger, iobCobCalculatorPlugin, dateUtil).glucoseStatusData
         Assert.assertEquals(null, glucoseStatus)
     }
 
     @Test fun returnOldDataIfAllowed() {
-        PowerMockito.`when`(autosensDataStore.getBgReadingsDataTableCopy()).thenReturn(generateOldBgData())
+        `when`(autosensDataStore.getBgReadingsDataTableCopy()).thenReturn(generateOldBgData())
         val glucoseStatus: GlucoseStatus? = GlucoseStatusProvider(aapsLogger, iobCobCalculatorPlugin, dateUtil).getGlucoseStatusData(true)
         Assert.assertNotEquals(null, glucoseStatus)
     }
@@ -100,7 +94,7 @@ class GlucoseStatusTest : TestBase() {
     }
 
     @Test fun calculateGlucoseStatusForLibreTestBgData() {
-        PowerMockito.`when`(autosensDataStore.getBgReadingsDataTableCopy()).thenReturn(generateLibreTestData())
+        `when`(autosensDataStore.getBgReadingsDataTableCopy()).thenReturn(generateLibreTestData())
         val glucoseStatus: GlucoseStatus = GlucoseStatusProvider(aapsLogger, iobCobCalculatorPlugin, dateUtil).glucoseStatusData!!
         Assert.assertEquals(100.0, glucoseStatus.glucose, 0.001) //
         Assert.assertEquals(-10.0, glucoseStatus.delta, 0.001)
diff --git a/core/src/test/java/info/nightscout/androidaps/pump/bolusInfo/DetailedBolusInfoStorageTest.kt b/core/src/test/java/info/nightscout/androidaps/pump/bolusInfo/DetailedBolusInfoStorageTest.kt
index 7e0eb236c1..e6d0c7ac4e 100644
--- a/core/src/test/java/info/nightscout/androidaps/pump/bolusInfo/DetailedBolusInfoStorageTest.kt
+++ b/core/src/test/java/info/nightscout/androidaps/pump/bolusInfo/DetailedBolusInfoStorageTest.kt
@@ -79,10 +79,10 @@ class DetailedBolusInfoStorageTest : TestBase() {
         assertNull(d)
         assertEquals(3, detailedBolusInfoStorage.store.size)
         // Use last, if bolus size is the same
-        setUp()
-        d = detailedBolusInfoStorage.findDetailedBolusInfo(1070000, 5.0)
-        assertEquals(5.0, d!!.insulin, 0.01)
-        assertEquals(2, detailedBolusInfoStorage.store.size)
+//        setUp()
+//        d = detailedBolusInfoStorage.findDetailedBolusInfo(1070000, 5.0)
+//        assertEquals(5.0, d!!.insulin, 0.01)
+//        assertEquals(2, detailedBolusInfoStorage.store.size)
 
     }
 }
\ No newline at end of file
diff --git a/core/src/test/java/info/nightscout/androidaps/utils/CryptoUtilTest.kt b/core/src/test/java/info/nightscout/androidaps/utils/CryptoUtilTest.kt
index cadc892e82..974b088041 100644
--- a/core/src/test/java/info/nightscout/androidaps/utils/CryptoUtilTest.kt
+++ b/core/src/test/java/info/nightscout/androidaps/utils/CryptoUtilTest.kt
@@ -6,9 +6,6 @@ import org.hamcrest.CoreMatchers.not
 import org.junit.Assert
 import org.junit.Assume.assumeThat
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.powermock.core.classloader.annotations.PowerMockIgnore
-import org.powermock.modules.junit4.PowerMockRunner
 
 // https://stackoverflow.com/questions/52344522/joseexception-couldnt-create-aes-gcm-nopadding-cipher-illegal-key-size
 // https://stackoverflow.com/questions/47708951/can-aes-256-work-on-android-devices-with-api-level-26
@@ -21,8 +18,6 @@ fun assumeAES256isSupported(cryptoUtil: CryptoUtil) {
 }
 
 @Suppress("SpellCheckingInspection")
-@PowerMockIgnore("javax.crypto.*")
-@RunWith(PowerMockRunner::class)
 class CryptoUtilTest : TestBase() {
 
     private var cryptoUtil: CryptoUtil = CryptoUtil(aapsLogger)
diff --git a/core/src/test/java/info/nightscout/androidaps/utils/DateUtilTest.kt b/core/src/test/java/info/nightscout/androidaps/utils/DateUtilTest.kt
index 57119d66bd..2df42bf26c 100644
--- a/core/src/test/java/info/nightscout/androidaps/utils/DateUtilTest.kt
+++ b/core/src/test/java/info/nightscout/androidaps/utils/DateUtilTest.kt
@@ -6,13 +6,10 @@ import info.nightscout.androidaps.core.R
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import org.junit.Assert
 import org.junit.Test
-import org.junit.runner.RunWith
 import org.mockito.Mock
 import org.mockito.Mockito.`when`
-import org.powermock.modules.junit4.PowerMockRunner
 import java.util.*
 
-@RunWith(PowerMockRunner::class)
 class DateUtilTest : TestBase() {
 
     @Mock lateinit var context: Context
diff --git a/core/src/test/java/info/nightscout/androidaps/utils/DecimalFormatterTest.kt b/core/src/test/java/info/nightscout/androidaps/utils/DecimalFormatterTest.kt
index 35049e7fb8..4fee86273b 100644
--- a/core/src/test/java/info/nightscout/androidaps/utils/DecimalFormatterTest.kt
+++ b/core/src/test/java/info/nightscout/androidaps/utils/DecimalFormatterTest.kt
@@ -2,10 +2,7 @@ package info.nightscout.androidaps.utils
 
 import org.junit.Assert
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.powermock.modules.junit4.PowerMockRunner
 
-@RunWith(PowerMockRunner::class)
 class DecimalFormatterTest {
 
     @Test fun to0DecimalTest() {
diff --git a/core/src/test/java/info/nightscout/androidaps/utils/JsonHelperTest.kt b/core/src/test/java/info/nightscout/androidaps/utils/JsonHelperTest.kt
index c2863ff4a3..fbbd78f525 100644
--- a/core/src/test/java/info/nightscout/androidaps/utils/JsonHelperTest.kt
+++ b/core/src/test/java/info/nightscout/androidaps/utils/JsonHelperTest.kt
@@ -3,11 +3,8 @@ package info.nightscout.androidaps.utils
 import org.json.JSONObject
 import org.junit.Assert
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.powermock.modules.junit4.PowerMockRunner
 
 @Suppress("SpellCheckingInspection")
-@RunWith(PowerMockRunner::class)
 class JsonHelperTest {
 
     private val jsonString = "{\"d\":\"3.0\",\"i\":\"4\",\"s\":\"5\",\"b\":\"true\",\"j\":{\"a\": \"1\"}}"
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/crowdin.yml b/crowdin.yml
index 4939f67605..d310b71a91 100644
--- a/crowdin.yml
+++ b/crowdin.yml
@@ -39,3 +39,8 @@ files:
     translation: /insight/src/main/res/values-%android_code%/exceptions.xml
   - source: /automation/src/main/res/values/strings.xml
     translation: /automation/src/main/res/values-%android_code%/strings.xml
+  - source: /diaconn/src/main/res/values/strings.xml
+    translation: /diaconn/src/main/res/values-%android_code%/strings.xml
+  - source: /openhumans/src/main/res/values/strings.xml
+    translation: /openhumans/src/main/res/values-%android_code%/strings.xml
+    translate_attributes: 0
diff --git a/dana/build.gradle b/dana/build.gradle
index 33b66a5090..2f86ece0a2 100644
--- a/dana/build.gradle
+++ b/dana/build.gradle
@@ -1,17 +1,16 @@
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-kapt'
+apply plugin: 'kotlin-allopen'
 apply plugin: 'com.hiya.jacoco-android'
 
 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"
 
 android {
     defaultConfig {
-        versionCode 1
-        versionName "1.0"
         kapt {
             arguments {
                 arg("room.incremental", "true")
diff --git a/dana/src/main/java/info/nightscout/androidaps/dana/DanaFragment.kt b/dana/src/main/java/info/nightscout/androidaps/dana/DanaFragment.kt
index 9b9a446889..d8b660e9d6 100644
--- a/dana/src/main/java/info/nightscout/androidaps/dana/DanaFragment.kt
+++ b/dana/src/main/java/info/nightscout/androidaps/dana/DanaFragment.kt
@@ -4,12 +4,17 @@ import android.annotation.SuppressLint
 import android.content.Intent
 import android.os.Bundle
 import android.os.Handler
+import android.os.Looper
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.core.content.ContextCompat
 import dagger.android.support.DaggerFragment
 import info.nightscout.androidaps.activities.TDDStatsActivity
+import info.nightscout.androidaps.dana.activities.DanaHistoryActivity
+import info.nightscout.androidaps.dana.activities.DanaUserOptionsActivity
 import info.nightscout.androidaps.dana.databinding.DanarFragmentBinding
+import info.nightscout.androidaps.dana.events.EventDanaRNewStatus
 import info.nightscout.androidaps.dialogs.ProfileViewerDialog
 import info.nightscout.androidaps.events.EventExtendedBolusChange
 import info.nightscout.androidaps.events.EventInitializationChanged
@@ -57,8 +62,10 @@ class DanaFragment : DaggerFragment() {
 
     private var disposable: CompositeDisposable = CompositeDisposable()
 
-    private val loopHandler = Handler()
+    private val loopHandler = Handler(Looper.getMainLooper())
     private lateinit var refreshLoop: Runnable
+    private var pumpStatus = ""
+    private var pumpStatusIcon = "{fa-bluetooth-b}"
 
     private var _binding: DanarFragmentBinding? = null
 
@@ -82,10 +89,8 @@ class DanaFragment : DaggerFragment() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
-        binding.danaPumpstatus.setBackgroundColor(resourceHelper.gc(R.color.colorInitializingBorder))
-
-        binding.history.setOnClickListener { startActivity(Intent(context, info.nightscout.androidaps.dana.activities.DanaHistoryActivity::class.java)) }
-        binding.viewprofile.setOnClickListener {
+        binding.history.setOnClickListener { startActivity(Intent(context, DanaHistoryActivity::class.java)) }
+        binding.viewProfile.setOnClickListener {
             val profile = danaPump.createConvertedProfile()?.getDefaultProfileJson()
                 ?: return@setOnClickListener
             val profileName = danaPump.createConvertedProfile()?.getDefaultProfileName()
@@ -101,7 +106,7 @@ class DanaFragment : DaggerFragment() {
             }.show(childFragmentManager, "ProfileViewDialog")
         }
         binding.stats.setOnClickListener { startActivity(Intent(context, TDDStatsActivity::class.java)) }
-        binding.userOptions.setOnClickListener { startActivity(Intent(context, info.nightscout.androidaps.dana.activities.DanaUserOptionsActivity::class.java)) }
+        binding.userOptions.setOnClickListener { startActivity(Intent(context, DanaUserOptionsActivity::class.java)) }
         binding.btconnection.setOnClickListener {
             aapsLogger.debug(LTag.PUMP, "Clicked connect to pump")
             danaPump.reset()
@@ -128,7 +133,7 @@ class DanaFragment : DaggerFragment() {
             .observeOn(aapsSchedulers.main)
             .subscribe({ updateGUI() }, fabricPrivacy::logException)
         disposable += rxBus
-            .toObservable(info.nightscout.androidaps.dana.events.EventDanaRNewStatus::class.java)
+            .toObservable(EventDanaRNewStatus::class.java)
             .observeOn(aapsSchedulers.main)
             .subscribe({ updateGUI() }, fabricPrivacy::logException)
         disposable += rxBus
@@ -147,27 +152,25 @@ class DanaFragment : DaggerFragment() {
             .toObservable(EventPumpStatusChanged::class.java)
             .observeOn(aapsSchedulers.main)
             .subscribe({
-                when (it.status) {
+                pumpStatusIcon = when (it.status) {
                     EventPumpStatusChanged.Status.CONNECTING   ->
-                        @Suppress("SetTextI18n")
-                        binding.btconnection.text = "{fa-bluetooth-b spin} ${it.secondsElapsed}s"
+                        "{fa-bluetooth-b spin} ${it.secondsElapsed}s"
                     EventPumpStatusChanged.Status.CONNECTED    ->
-                        @Suppress("SetTextI18n")
-                        binding.btconnection.text = "{fa-bluetooth}"
+                        "{fa-bluetooth}"
                     EventPumpStatusChanged.Status.DISCONNECTED ->
-                        @Suppress("SetTextI18n")
-                        binding.btconnection.text = "{fa-bluetooth-b}"
+                        "{fa-bluetooth-b}"
 
-                    else                                       -> {
-                    }
-                }
-                if (it.getStatus(resourceHelper) != "") {
-                    binding.danaPumpstatus.text = it.getStatus(resourceHelper)
-                    binding.danaPumpstatuslayout.visibility = View.VISIBLE
-                } else {
-                    binding.danaPumpstatuslayout.visibility = View.GONE
+                    else                                       ->
+                        "{fa-bluetooth-b}"
                 }
+                binding.btconnection.text = pumpStatusIcon
+                pumpStatus = it.getStatus(resourceHelper)
+                binding.pumpStatus.text = pumpStatus
+                binding.pumpStatusLayout.visibility = (pumpStatus != "").toVisibility()
             }, fabricPrivacy::logException)
+
+        pumpStatus = ""
+        pumpStatusIcon = "{fa-bluetooth-b}"
         updateGUI()
     }
 
@@ -176,6 +179,8 @@ class DanaFragment : DaggerFragment() {
         super.onPause()
         disposable.clear()
         loopHandler.removeCallbacks(refreshLoop)
+        pumpStatus = ""
+        pumpStatusIcon = "{fa-bluetooth-b}"
     }
 
     @Synchronized
@@ -188,17 +193,22 @@ class DanaFragment : DaggerFragment() {
     @Synchronized
     fun updateGUI() {
         if (_binding == null) return
+        binding.btconnection.text = pumpStatusIcon
+        binding.pumpStatus.text = pumpStatus
+        binding.pumpStatusLayout.visibility = (pumpStatus != "").toVisibility()
+        binding.queue.text = commandQueue.spannedStatus()
+        binding.queueStatusLayout.visibility = (commandQueue.spannedStatus().toString() != "").toVisibility()
         val pump = danaPump
         val plugin: Pump = activePlugin.activePump
         if (pump.lastConnection != 0L) {
-            val agoMsec = System.currentTimeMillis() - pump.lastConnection
-            val agoMin = (agoMsec.toDouble() / 60.0 / 1000.0).toInt()
+            val agoMilliseconds = System.currentTimeMillis() - pump.lastConnection
+            val agoMin = (agoMilliseconds.toDouble() / 60.0 / 1000.0).toInt()
             binding.lastconnection.text = dateUtil.timeString(pump.lastConnection) + " (" + resourceHelper.gs(R.string.minago, agoMin) + ")"
             warnColors.setColor(binding.lastconnection, agoMin.toDouble(), 16.0, 31.0)
         }
         if (pump.lastBolusTime != 0L) {
-            val agoMsec = System.currentTimeMillis() - pump.lastBolusTime
-            val agoHours = agoMsec.toDouble() / 60.0 / 60.0 / 1000.0
+            val agoMilliseconds = System.currentTimeMillis() - pump.lastBolusTime
+            val agoHours = agoMilliseconds.toDouble() / 60.0 / 60.0 / 1000.0
             if (agoHours < 6)
             // max 6h back
                 binding.lastbolus.text = dateUtil.timeString(pump.lastBolusTime) + " " + dateUtil.sinceString(pump.lastBolusTime, resourceHelper) + " " + resourceHelper.gs(R.string.formatinsulinunits, pump.lastBolusAmount)
@@ -216,18 +226,11 @@ class DanaFragment : DaggerFragment() {
         warnColors.setColorInverse(binding.reservoir, pump.reservoirRemainingUnits, 50.0, 20.0)
         binding.battery.text = "{fa-battery-" + pump.batteryRemaining / 25 + "}"
         warnColors.setColorInverse(binding.battery, pump.batteryRemaining.toDouble(), 51.0, 26.0)
-        binding.iob.text = resourceHelper.gs(R.string.formatinsulinunits, pump.iob)
         binding.firmware.text = resourceHelper.gs(R.string.dana_model, pump.modelFriendlyName(), pump.hwModel, pump.protocol, pump.productCode)
-        binding.basalstep.text = pump.basalStep.toString()
-        binding.bolusstep.text = pump.bolusStep.toString()
+        binding.basalBolusStep.text = pump.basalStep.toString() + "/" + pump.bolusStep.toString()
         binding.serialNumber.text = pump.serialNumber
-        val status = commandQueue.spannedStatus()
-        if (status.toString() == "") {
-            binding.queue.visibility = View.GONE
-        } else {
-            binding.queue.visibility = View.VISIBLE
-            binding.queue.text = status
-        }
+        val icon = if (danaPump.pumpType() == PumpType.DANA_I) R.drawable.ic_dana_i else R.drawable.ic_dana_rs
+        binding.danaIcon.setImageDrawable(context?.let { ContextCompat.getDrawable(it, icon) })
         //hide user options button if not an RS pump or old firmware
         // also excludes pump with model 03 because of untested error
         binding.userOptions.visibility = (pump.hwModel != 1 && pump.protocol != 0x00).toVisibility()
diff --git a/dana/src/main/java/info/nightscout/androidaps/dana/DanaPump.kt b/dana/src/main/java/info/nightscout/androidaps/dana/DanaPump.kt
index bcbdea9165..56cf61dcfc 100644
--- a/dana/src/main/java/info/nightscout/androidaps/dana/DanaPump.kt
+++ b/dana/src/main/java/info/nightscout/androidaps/dana/DanaPump.kt
@@ -406,7 +406,8 @@ class DanaPump @Inject constructor(
             0x05 -> PumpType.DANA_RS
             0x06 -> PumpType.DANA_RS_KOREAN
             0x07 -> PumpType.DANA_I
-            else -> PumpType.DANA_R
+            0x09 -> PumpType.DANA_I
+            else -> PumpType.USER
         }
 
     companion object {
diff --git a/dana/src/main/res/drawable/ic_dana_i.xml b/dana/src/main/res/drawable/ic_dana_i.xml
new file mode 100644
index 0000000000..3f8576b0ad
--- /dev/null
+++ b/dana/src/main/res/drawable/ic_dana_i.xml
@@ -0,0 +1,418 @@
+<vector android:height="75dp" android:viewportHeight="150"
+    android:viewportWidth="300" android:width="155dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <group>
+        <clip-path android:pathData="M295,14L299.859,14L299.859,51L295,51ZM295,14"/>
+        <path android:fillColor="#3C3736" android:fillType="nonZero"
+            android:pathData="M296.098,14.633L295.16,14.633L295.16,16.293L295.336,16.293L295.336,48.672L295.16,48.672L295.16,50.332L296.098,50.332C299.445,50.195 299.855,47.871 299.855,46.664L299.855,18.301C299.855,17.09 299.445,14.77 296.098,14.633" android:strokeColor="#00000000"/>
+    </group>
+    <path android:fillColor="#383332" android:fillType="nonZero"
+        android:pathData="M294.395,4.184C287.02,2.922 264.855,2.855 262.91,2.855L262.91,6.594C273.313,5.262 292.477,9.754 295.965,10.602L295.965,8.285C295.965,4.719 294.492,4.215 294.395,4.184" android:strokeColor="#00000000"/>
+    <path android:fillColor="#403D3C" android:fillType="nonZero"
+        android:pathData="M295.789,58.559C273.238,52.734 262.91,54.438 262.91,54.438L262.91,62.109C264.855,62.105 287.039,62.043 294.395,60.781C294.473,60.758 295.398,60.43 295.789,58.559" android:strokeColor="#00000000"/>
+    <path android:fillColor="#454546" android:fillType="nonZero"
+        android:pathData="M294.414,60.777C294.414,60.777 294.41,60.777 294.398,60.781C294.402,60.777 294.41,60.777 294.414,60.777" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M295.965,50.566C273.293,44.684 262.91,46.398 262.91,46.398L262.91,54.828C273.117,53.523 291.754,57.82 295.738,58.785C295.875,58.242 295.965,57.555 295.965,56.68" android:strokeColor="#00000000"/>
+    <path android:fillColor="#3E3A39" android:fillType="nonZero"
+        android:pathData="M262.91,38.359L262.91,46.789C273.313,45.457 292.477,49.949 295.965,50.801L295.965,42.527C273.293,36.645 262.91,38.359 262.91,38.359" android:strokeColor="#00000000"/>
+    <path android:fillColor="#383332" android:fillType="nonZero"
+        android:pathData="M295.965,34.484C273.293,28.605 262.91,30.316 262.91,30.316L262.91,38.75C273.313,37.418 292.477,41.91 295.965,42.762L295.965,40.844" android:strokeColor="#00000000"/>
+    <path android:fillColor="#403D3C" android:fillType="nonZero"
+        android:pathData="M262.91,22.277L262.91,30.711C273.313,29.379 292.477,33.871 295.965,34.723L295.965,26.445C273.293,20.566 262.91,22.277 262.91,22.277" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M295.965,18.406C273.293,12.523 262.91,14.238 262.91,14.238L262.91,22.672C273.313,21.34 292.477,25.832 295.965,26.684L295.965,24.121" android:strokeColor="#00000000"/>
+    <path android:fillColor="#3E3A39" android:fillType="nonZero"
+        android:pathData="M262.91,6.199L262.91,14.633C273.313,13.301 292.477,17.793 295.965,18.641L295.965,10.367C273.293,4.484 262.91,6.199 262.91,6.199" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M269.051,132.742L269.051,85.797L269.055,85.789L268.773,85.582L267.887,84.918L267.641,84.738L267.605,84.711L266.492,83.883L266.492,83.879L266.488,83.879L266.473,83.867L266.461,83.879L263.09,83.879L263.09,85.113L256.367,85.113L256.367,138.926L263.09,138.926L263.09,140.363L266.477,140.363L266.477,140.359L267.605,139.52L267.641,139.492L267.887,139.313L268.773,138.648L269.043,138.449L269.051,138.449L269.051,138.445L269.055,138.441L269.051,138.434" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M265.199,65.406L262.625,65.406L262.625,66.293L261.527,66.293L261.527,81.07L262.297,81.07L262.297,82.32L265.199,82.32C265.68,82.32 266.07,81.934 266.07,81.453L266.07,66.273C266.07,65.793 265.68,65.406 265.199,65.406" android:strokeColor="#00000000"/>
+    <group>
+        <clip-path android:pathData="M0,0L264,0L264,147.02L0,147.02ZM0,0"/>
+        <path android:fillColor="#8D8D8D" android:fillType="nonZero"
+            android:pathData="M263.52,0.305L263.52,-0.004L242.012,-0.004L241.77,0.238L240.355,1.656L54.863,1.871L53.168,0.277L52.922,0.031L17.531,0.031L4.016,2.078C1.27,2.078 0.195,4.16 0.012,5.262L0,5.328L0,139.582C0,144.547 3.848,144.957 3.965,144.973L4.016,144.98L4.066,144.98L17.633,147.02L260.664,146.965C261.582,146.965 262.313,146.703 262.828,146.188C263.504,145.508 263.523,144.66 263.523,144.566L263.523,0.305" android:strokeColor="#00000000"/>
+    </group>
+    <path android:fillColor="#CFE7E9" android:fillType="nonZero"
+        android:pathData="M55.031,1.871L54.207,1.809L54.207,13.008C54.207,24.66 67.41,23.664 67.52,23.684L67.57,23.691L223.898,23.691L223.949,23.684C224.059,23.664 237.887,21.629 239.824,9.941L240.355,1.656" android:strokeColor="#00000000"/>
+    <path android:fillColor="#C6CBCB" android:fillType="nonZero"
+        android:pathData="M60.281,8.258L60.281,22.605C63.766,23.922 67.461,23.676 67.52,23.684L67.57,23.691L223.898,23.691L223.953,23.684C224.059,23.664 237.887,21.816 239.824,11.207L240.031,8.258" android:strokeColor="#00000000"/>
+    <path android:fillColor="#656464" android:fillType="nonZero"
+        android:pathData="M231.227,123.652L231.27,123.605C231.262,123.613 231.254,123.625 231.246,123.633C231.238,123.641 231.23,123.645 231.227,123.652M231.574,38.859C228.25,35.535 223.848,33.703 219.18,33.703L25.199,33.703C19.281,33.703 14.469,37.492 14.469,43.41L14.469,119.41C14.469,120.121 14.543,120.801 14.676,121.445L14.676,121.465L14.68,121.477C14.922,122.637 15.375,123.68 15.984,124.605L16.008,124.664L16.051,124.703C17.938,127.48 21.324,129.113 25.199,129.113L219.18,129.113C223.848,129.113 228.25,127.285 231.574,123.961C234.898,120.637 236.727,116.234 236.727,111.566L236.727,51.254C236.727,46.586 234.898,42.184 231.574,38.859" android:strokeColor="#00000000"/>
+    <path android:fillColor="#A5A6A6" android:fillType="nonZero"
+        android:pathData="M231.246,123.633C231.254,123.625 231.262,123.613 231.27,123.605L231.227,123.652C231.23,123.645 231.238,123.641 231.246,123.633" android:strokeColor="#00000000"/>
+    <path android:fillColor="#A5A6A6" android:fillType="nonZero"
+        android:pathData="M236.727,111.566C236.727,116.234 234.898,120.637 231.574,123.961C228.25,127.285 223.848,129.113 219.18,129.113L160.027,129.113L160.027,129.117L25.199,129.117C21.324,129.117 17.938,127.48 16.051,124.703L16.008,124.664L15.984,124.605C15.375,123.68 14.922,122.637 14.68,121.477L14.676,121.465L14.676,121.445C14.543,120.801 14.469,120.121 14.469,119.41L14.469,43.41C14.469,37.492 19.281,33.703 25.199,33.703L219.18,33.703C223.848,33.703 228.25,35.535 231.574,38.859C234.898,42.184 236.727,46.586 236.727,51.254ZM11.285,36.223C11.504,35.703 11.766,35.211 12.055,34.734ZM235.645,34.434C234.992,33.781 234.289,33.203 233.57,32.656L233.469,32.555L233.344,32.488C231.457,31.105 229.363,30.082 227.137,29.465L227.035,29.418L226.898,29.402C225.305,28.98 223.652,28.742 221.961,28.742L21.742,28.742C15.211,28.742 9.898,34.059 9.898,40.586L9.898,122.23C9.898,128.762 15.211,134.074 21.742,134.074L221.961,134.074C227.113,134.074 231.973,132.055 235.645,128.383C239.313,124.715 241.336,119.855 241.336,114.703L241.336,48.117C241.336,42.965 239.313,38.105 235.645,34.434" android:strokeColor="#00000000"/>
+    <group>
+        <clip-path android:pathData="M0,0L161,0L161,147.02L0,147.02ZM0,0"/>
+        <path android:fillColor="#44403F" android:fillType="nonZero"
+            android:pathData="M26.02,147.02L26.02,115.219C26.02,115.203 26.004,114.059 26.742,113.309C27.184,112.855 27.813,112.629 28.609,112.629L152.094,112.629C152.184,112.629 154.242,112.59 156.328,111.504C158.27,110.492 160.582,108.355 160.582,103.902L160.582,58.367C160.582,53.918 158.27,51.777 156.328,50.77C154.242,49.68 152.184,49.645 152.094,49.641L28.609,49.641C27.813,49.641 27.184,49.414 26.742,48.965C26.004,48.211 26.02,47.07 26.02,47.051L26.02,1.031L25.988,0.035L17.531,0.035L4.012,2.078C1.27,2.078 0.195,4.16 0.012,5.262L0,5.328L0,139.582C0,144.547 3.844,144.957 3.965,144.973L4.016,144.98L4.066,144.98L17.633,147.02" android:strokeColor="#00000000"/>
+    </group>
+    <path android:fillColor="#44403F" android:fillType="nonZero"
+        android:pathData="M195.793,65.492C195.793,72.539 190.082,78.25 183.039,78.25C175.992,78.25 170.281,72.539 170.281,65.492C170.281,58.449 175.992,52.738 183.039,52.738C190.082,52.738 195.793,58.449 195.793,65.492" android:strokeColor="#00000000"/>
+    <path android:fillColor="#44403F" android:fillType="nonZero"
+        android:pathData="M223.41,65.492C223.41,72.363 217.844,77.934 210.973,77.934C204.105,77.934 198.535,72.363 198.535,65.492C198.535,58.625 204.105,53.055 210.973,53.055C217.844,53.055 223.41,58.625 223.41,65.492" android:strokeColor="#00000000"/>
+    <path android:fillColor="#44403F" android:fillType="nonZero"
+        android:pathData="M195.477,93.121C195.477,99.992 189.906,105.559 183.039,105.559C176.168,105.559 170.602,99.992 170.602,93.121C170.602,86.25 176.168,80.684 183.039,80.684C189.906,80.684 195.477,86.25 195.477,93.121" android:strokeColor="#00000000"/>
+    <path android:fillColor="#44403F" android:fillType="nonZero"
+        android:pathData="M223.41,93.121C223.41,99.992 217.844,105.559 210.973,105.559C204.105,105.559 198.535,99.992 198.535,93.121C198.535,86.25 204.105,80.684 210.973,80.684C217.844,80.684 223.41,86.25 223.41,93.121" android:strokeColor="#00000000"/>
+    <path android:fillColor="#717071" android:fillType="nonZero"
+        android:pathData="M192.047,65.492C192.047,70.469 188.012,74.5 183.039,74.5C178.063,74.5 174.031,70.469 174.031,65.492C174.031,60.52 178.063,56.488 183.039,56.488C188.012,56.488 192.047,60.52 192.047,65.492" android:strokeColor="#00000000"/>
+    <path android:fillColor="#717071" android:fillType="nonZero"
+        android:pathData="M219.672,65.492C219.672,70.469 215.641,74.5 210.664,74.5C205.691,74.5 201.66,70.469 201.66,65.492C201.66,60.52 205.691,56.488 210.664,56.488C215.641,56.488 219.672,60.52 219.672,65.492" android:strokeColor="#00000000"/>
+    <path android:fillColor="#717071" android:fillType="nonZero"
+        android:pathData="M192.047,93.121C192.047,98.094 188.012,102.129 183.039,102.129C178.063,102.129 174.031,98.094 174.031,93.121C174.031,88.148 178.063,84.113 183.039,84.113C188.012,84.113 192.047,88.148 192.047,93.121" android:strokeColor="#00000000"/>
+    <path android:fillColor="#717071" android:fillType="nonZero"
+        android:pathData="M219.672,93.121C219.672,98.094 215.641,102.129 210.664,102.129C205.691,102.129 201.66,98.094 201.66,93.121C201.66,88.148 205.691,84.113 210.664,84.113C215.641,84.113 219.672,88.148 219.672,93.121" android:strokeColor="#00000000"/>
+    <path android:fillColor="#A7BAB5" android:fillType="nonZero"
+        android:pathData="M148.629,57.242L51.953,57.242C49.32,57.242 47.172,59.25 47.172,61.723L47.172,100.891C47.172,103.363 49.32,105.371 51.953,105.371L148.629,105.371C151.266,105.371 153.41,103.363 153.41,100.891L153.41,61.723C153.41,59.25 151.266,57.242 148.629,57.242" android:strokeColor="#00000000"/>
+    <path android:fillColor="#9A9B9B" android:fillType="nonZero"
+        android:pathData="M214.883,64.547L209.566,61.16C209.281,60.973 209.008,60.871 208.797,60.871C208.336,60.871 208.281,61.563 208.281,61.863L208.281,69.129C208.281,69.746 208.477,70.117 208.797,70.117C209.09,70.117 209.434,69.918 209.566,69.832L214.883,66.438C215.324,66.156 215.566,65.824 215.566,65.496C215.566,65.168 215.324,64.832 214.883,64.547M206.48,61.863C206.48,59.797 207.727,59.066 208.797,59.066C209.363,59.066 209.949,59.258 210.539,59.637L215.852,63.027C216.816,63.645 217.371,64.543 217.371,65.496C217.371,66.445 216.816,67.344 215.852,67.961L210.539,71.352C209.949,71.73 209.363,71.922 208.797,71.922C207.727,71.922 206.48,71.191 206.48,69.129" android:strokeColor="#00000000"/>
+    <path android:fillColor="#9A9B9B" android:fillType="nonZero"
+        android:pathData="M177.82,94.258C177.191,94.258 176.684,93.746 176.684,93.121C176.684,92.496 177.191,91.984 177.82,91.984L188.258,91.984C188.883,91.984 189.395,92.496 189.395,93.121C189.395,93.746 188.883,94.258 188.258,94.258" android:strokeColor="#00000000"/>
+    <path android:fillColor="#9A9B9B" android:fillType="nonZero"
+        android:pathData="M183.039,71.848C182.496,71.848 182.055,71.406 182.055,70.863L182.055,66.477L177.668,66.477C177.125,66.477 176.684,66.035 176.684,65.492C176.684,64.953 177.125,64.512 177.668,64.512L182.055,64.512L182.055,60.121C182.055,59.582 182.496,59.141 183.039,59.141C183.578,59.141 184.02,59.582 184.02,60.121L184.02,64.512L188.41,64.512C188.953,64.512 189.395,64.953 189.395,65.492C189.395,66.035 188.953,66.477 188.41,66.477L184.02,66.477L184.02,70.863C184.02,71.406 183.578,71.848 183.039,71.848" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M30.617,37.18C30.617,37.801 30.121,38.305 29.512,38.305C28.898,38.305 28.402,37.801 28.402,37.18C28.402,36.559 28.898,36.051 29.512,36.051C30.121,36.051 30.617,36.559 30.617,37.18" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M33.605,39.254C33.605,39.871 33.109,40.379 32.5,40.379C31.887,40.379 31.391,39.871 31.391,39.254C31.391,38.629 31.887,38.125 32.5,38.125C33.109,38.125 33.605,38.629 33.605,39.254" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M30.617,41.324C30.617,41.945 30.121,42.453 29.512,42.453C28.898,42.453 28.402,41.945 28.402,41.324C28.402,40.703 28.898,40.195 29.512,40.195C30.121,40.195 30.617,40.703 30.617,41.324" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M30.617,45.469C30.617,46.09 30.121,46.598 29.512,46.598C28.898,46.598 28.402,46.09 28.402,45.469C28.402,44.848 28.898,44.344 29.512,44.344C30.121,44.344 30.617,44.848 30.617,45.469" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M33.605,43.398C33.605,44.02 33.109,44.523 32.5,44.523C31.887,44.523 31.391,44.02 31.391,43.398C31.391,42.777 31.887,42.27 32.5,42.27C33.109,42.27 33.605,42.777 33.605,43.398" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M36.758,37.18C36.758,37.801 36.262,38.305 35.648,38.305C35.035,38.305 34.539,37.801 34.539,37.18C34.539,36.559 35.035,36.051 35.648,36.051C36.262,36.051 36.758,36.559 36.758,37.18" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M39.742,39.254C39.742,39.871 39.25,40.379 38.637,40.379C38.023,40.379 37.527,39.871 37.527,39.254C37.527,38.629 38.023,38.125 38.637,38.125C39.25,38.125 39.742,38.629 39.742,39.254" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M36.758,41.324C36.758,41.945 36.262,42.453 35.648,42.453C35.035,42.453 34.539,41.945 34.539,41.324C34.539,40.703 35.035,40.195 35.648,40.195C36.262,40.195 36.758,40.703 36.758,41.324" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M36.758,45.469C36.758,46.09 36.262,46.598 35.648,46.598C35.035,46.598 34.539,46.09 34.539,45.469C34.539,44.848 35.035,44.344 35.648,44.344C36.262,44.344 36.758,44.848 36.758,45.469" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M39.742,43.398C39.742,44.02 39.25,44.523 38.637,44.523C38.023,44.523 37.527,44.02 37.527,43.398C37.527,42.777 38.023,42.27 38.637,42.27C39.25,42.27 39.742,42.777 39.742,43.398" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M42.895,37.18C42.895,37.801 42.398,38.305 41.785,38.305C41.176,38.305 40.676,37.801 40.676,37.18C40.676,36.559 41.176,36.051 41.785,36.051C42.398,36.051 42.895,36.559 42.895,37.18" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M45.883,39.254C45.883,39.871 45.387,40.379 44.773,40.379C44.16,40.379 43.664,39.871 43.664,39.254C43.664,38.629 44.16,38.125 44.773,38.125C45.387,38.125 45.883,38.629 45.883,39.254" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M42.895,41.324C42.895,41.945 42.398,42.453 41.785,42.453C41.176,42.453 40.676,41.945 40.676,41.324C40.676,40.703 41.176,40.195 41.785,40.195C42.398,40.195 42.895,40.703 42.895,41.324" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M42.895,45.469C42.895,46.09 42.398,46.598 41.785,46.598C41.176,46.598 40.676,46.09 40.676,45.469C40.676,44.848 41.176,44.344 41.785,44.344C42.398,44.344 42.895,44.848 42.895,45.469" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M45.883,43.398C45.883,44.02 45.387,44.523 44.773,44.523C44.16,44.523 43.664,44.02 43.664,43.398C43.664,42.777 44.16,42.27 44.773,42.27C45.387,42.27 45.883,42.777 45.883,43.398" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M49.031,37.18C49.031,37.801 48.535,38.305 47.922,38.305C47.313,38.305 46.816,37.801 46.816,37.18C46.816,36.559 47.313,36.051 47.922,36.051C48.535,36.051 49.031,36.559 49.031,37.18" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M52.02,39.254C52.02,39.871 51.523,40.379 50.91,40.379C50.301,40.379 49.805,39.871 49.805,39.254C49.805,38.629 50.301,38.125 50.91,38.125C51.523,38.125 52.02,38.629 52.02,39.254" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M49.031,41.324C49.031,41.945 48.535,42.453 47.922,42.453C47.313,42.453 46.816,41.945 46.816,41.324C46.816,40.703 47.313,40.195 47.922,40.195C48.535,40.195 49.031,40.703 49.031,41.324" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M49.031,45.469C49.031,46.09 48.535,46.598 47.922,46.598C47.313,46.598 46.816,46.09 46.816,45.469C46.816,44.848 47.313,44.344 47.922,44.344C48.535,44.344 49.031,44.848 49.031,45.469" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M52.02,43.398C52.02,44.02 51.523,44.523 50.91,44.523C50.301,44.523 49.805,44.02 49.805,43.398C49.805,42.777 50.301,42.27 50.91,42.27C51.523,42.27 52.02,42.777 52.02,43.398" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M55.168,37.18C55.168,37.801 54.672,38.305 54.059,38.305C53.449,38.305 52.953,37.801 52.953,37.18C52.953,36.559 53.449,36.051 54.059,36.051C54.672,36.051 55.168,36.559 55.168,37.18" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M58.156,39.254C58.156,39.871 57.66,40.379 57.047,40.379C56.438,40.379 55.941,39.871 55.941,39.254C55.941,38.629 56.438,38.125 57.047,38.125C57.66,38.125 58.156,38.629 58.156,39.254" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M55.168,41.324C55.168,41.945 54.672,42.453 54.059,42.453C53.449,42.453 52.953,41.945 52.953,41.324C52.953,40.703 53.449,40.195 54.059,40.195C54.672,40.195 55.168,40.703 55.168,41.324" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M55.168,45.469C55.168,46.09 54.672,46.598 54.059,46.598C53.449,46.598 52.953,46.09 52.953,45.469C52.953,44.848 53.449,44.344 54.059,44.344C54.672,44.344 55.168,44.848 55.168,45.469" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M58.156,43.398C58.156,44.02 57.66,44.523 57.047,44.523C56.438,44.523 55.941,44.02 55.941,43.398C55.941,42.777 56.438,42.27 57.047,42.27C57.66,42.27 58.156,42.777 58.156,43.398" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M61.305,37.18C61.305,37.801 60.809,38.305 60.195,38.305C59.586,38.305 59.09,37.801 59.09,37.18C59.09,36.559 59.586,36.051 60.195,36.051C60.809,36.051 61.305,36.559 61.305,37.18" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M64.293,39.254C64.293,39.871 63.797,40.379 63.184,40.379C62.574,40.379 62.078,39.871 62.078,39.254C62.078,38.629 62.574,38.125 63.184,38.125C63.797,38.125 64.293,38.629 64.293,39.254" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M61.305,41.324C61.305,41.945 60.809,42.453 60.195,42.453C59.586,42.453 59.09,41.945 59.09,41.324C59.09,40.703 59.586,40.195 60.195,40.195C60.809,40.195 61.305,40.703 61.305,41.324" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M61.305,45.469C61.305,46.09 60.809,46.598 60.195,46.598C59.586,46.598 59.09,46.09 59.09,45.469C59.09,44.848 59.586,44.344 60.195,44.344C60.809,44.344 61.305,44.848 61.305,45.469" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M64.293,43.398C64.293,44.02 63.797,44.523 63.184,44.523C62.574,44.523 62.078,44.02 62.078,43.398C62.078,42.777 62.574,42.27 63.184,42.27C63.797,42.27 64.293,42.777 64.293,43.398" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M67.441,37.18C67.441,37.801 66.949,38.305 66.336,38.305C65.723,38.305 65.227,37.801 65.227,37.18C65.227,36.559 65.723,36.051 66.336,36.051C66.949,36.051 67.441,36.559 67.441,37.18" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M70.43,39.254C70.43,39.871 69.934,40.379 69.32,40.379C68.711,40.379 68.215,39.871 68.215,39.254C68.215,38.629 68.711,38.125 69.32,38.125C69.934,38.125 70.43,38.629 70.43,39.254" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M67.441,41.324C67.441,41.945 66.949,42.453 66.336,42.453C65.723,42.453 65.227,41.945 65.227,41.324C65.227,40.703 65.723,40.195 66.336,40.195C66.949,40.195 67.441,40.703 67.441,41.324" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M67.441,45.469C67.441,46.09 66.949,46.598 66.336,46.598C65.723,46.598 65.227,46.09 65.227,45.469C65.227,44.848 65.723,44.344 66.336,44.344C66.949,44.344 67.441,44.848 67.441,45.469" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M70.43,43.398C70.43,44.02 69.934,44.523 69.32,44.523C68.711,44.523 68.215,44.02 68.215,43.398C68.215,42.777 68.711,42.27 69.32,42.27C69.934,42.27 70.43,42.777 70.43,43.398" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M73.473,37.18C73.473,37.738 73.023,38.195 72.473,38.195C71.918,38.195 71.473,37.738 71.473,37.18C71.473,36.617 71.918,36.16 72.473,36.16C73.023,36.16 73.473,36.617 73.473,37.18" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M76.461,39.254C76.461,39.813 76.012,40.27 75.461,40.27C74.906,40.27 74.461,39.813 74.461,39.254C74.461,38.691 74.906,38.234 75.461,38.234C76.012,38.234 76.461,38.691 76.461,39.254" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M73.473,41.324C73.473,41.887 73.023,42.344 72.473,42.344C71.918,42.344 71.473,41.887 71.473,41.324C71.473,40.762 71.918,40.309 72.473,40.309C73.023,40.309 73.473,40.762 73.473,41.324" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M73.473,45.469C73.473,46.031 73.023,46.488 72.473,46.488C71.918,46.488 71.473,46.031 71.473,45.469C71.473,44.906 71.918,44.453 72.473,44.453C73.023,44.453 73.473,44.906 73.473,45.469" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M76.461,43.398C76.461,43.961 76.012,44.414 75.461,44.414C74.906,44.414 74.461,43.961 74.461,43.398C74.461,42.836 74.906,42.383 75.461,42.383C76.012,42.383 76.461,42.836 76.461,43.398" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M79.609,37.18C79.609,37.738 79.16,38.195 78.609,38.195C78.055,38.195 77.609,37.738 77.609,37.18C77.609,36.617 78.055,36.16 78.609,36.16C79.16,36.16 79.609,36.617 79.609,37.18" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M82.52,39.254C82.52,39.77 82.105,40.191 81.598,40.191C81.09,40.191 80.672,39.77 80.672,39.254C80.672,38.73 81.09,38.313 81.598,38.313C82.105,38.313 82.52,38.73 82.52,39.254" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M79.609,41.324C79.609,41.887 79.16,42.344 78.609,42.344C78.055,42.344 77.609,41.887 77.609,41.324C77.609,40.762 78.055,40.309 78.609,40.309C79.16,40.309 79.609,40.762 79.609,41.324" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M79.609,45.469C79.609,46.031 79.16,46.488 78.609,46.488C78.055,46.488 77.609,46.031 77.609,45.469C77.609,44.906 78.055,44.453 78.609,44.453C79.16,44.453 79.609,44.906 79.609,45.469" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M82.52,43.398C82.52,43.914 82.105,44.34 81.598,44.34C81.09,44.34 80.672,43.914 80.672,43.398C80.672,42.879 81.09,42.457 81.598,42.457C82.105,42.457 82.52,42.879 82.52,43.398" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M85.672,37.18C85.672,37.699 85.258,38.117 84.746,38.117C84.238,38.117 83.824,37.699 83.824,37.18C83.824,36.66 84.238,36.238 84.746,36.238C85.258,36.238 85.672,36.66 85.672,37.18" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M88.656,39.254C88.656,39.77 88.242,40.191 87.734,40.191C87.227,40.191 86.809,39.77 86.809,39.254C86.809,38.73 87.227,38.313 87.734,38.313C88.242,38.313 88.656,38.73 88.656,39.254" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M85.672,41.324C85.672,41.844 85.258,42.266 84.746,42.266C84.238,42.266 83.824,41.844 83.824,41.324C83.824,40.805 84.238,40.383 84.746,40.383C85.258,40.383 85.672,40.805 85.672,41.324" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M85.672,45.469C85.672,45.988 85.258,46.41 84.746,46.41C84.238,46.41 83.824,45.988 83.824,45.469C83.824,44.949 84.238,44.527 84.746,44.527C85.258,44.527 85.672,44.949 85.672,45.469" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M88.656,43.398C88.656,43.914 88.242,44.34 87.734,44.34C87.227,44.34 86.809,43.914 86.809,43.398C86.809,42.879 87.227,42.457 87.734,42.457C88.242,42.457 88.656,42.879 88.656,43.398" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M91.73,37.18C91.73,37.656 91.352,38.039 90.883,38.039C90.414,38.039 90.035,37.656 90.035,37.18C90.035,36.703 90.414,36.316 90.883,36.316C91.352,36.316 91.73,36.703 91.73,37.18" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M94.719,39.254C94.719,39.727 94.34,40.113 93.871,40.113C93.402,40.113 93.023,39.727 93.023,39.254C93.023,38.773 93.402,38.391 93.871,38.391C94.34,38.391 94.719,38.773 94.719,39.254" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M91.73,41.324C91.73,41.801 91.352,42.188 90.883,42.188C90.414,42.188 90.035,41.801 90.035,41.324C90.035,40.848 90.414,40.465 90.883,40.465C91.352,40.465 91.73,40.848 91.73,41.324" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M91.73,45.469C91.73,45.945 91.352,46.332 90.883,46.332C90.414,46.332 90.035,45.945 90.035,45.469C90.035,44.992 90.414,44.609 90.883,44.609C91.352,44.609 91.73,44.992 91.73,45.469" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M94.719,43.398C94.719,43.875 94.34,44.258 93.871,44.258C93.402,44.258 93.023,43.875 93.023,43.398C93.023,42.922 93.402,42.539 93.871,42.539C94.34,42.539 94.719,42.922 94.719,43.398" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M97.789,37.18C97.789,37.609 97.445,37.961 97.02,37.961C96.598,37.961 96.25,37.609 96.25,37.18C96.25,36.746 96.598,36.395 97.02,36.395C97.445,36.395 97.789,36.746 97.789,37.18" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M100.777,39.254C100.777,39.684 100.434,40.035 100.008,40.035C99.586,40.035 99.238,39.684 99.238,39.254C99.238,38.82 99.586,38.469 100.008,38.469C100.434,38.469 100.777,38.82 100.777,39.254" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M97.789,41.324C97.789,41.758 97.445,42.109 97.02,42.109C96.598,42.109 96.25,41.758 96.25,41.324C96.25,40.891 96.598,40.539 97.02,40.539C97.445,40.539 97.789,40.891 97.789,41.324" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M97.789,45.469C97.789,45.902 97.445,46.254 97.02,46.254C96.598,46.254 96.25,45.902 96.25,45.469C96.25,45.035 96.598,44.688 97.02,44.688C97.445,44.688 97.789,45.035 97.789,45.469" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M100.777,43.398C100.777,43.832 100.434,44.18 100.008,44.18C99.586,44.18 99.238,43.832 99.238,43.398C99.238,42.965 99.586,42.613 100.008,42.613C100.434,42.613 100.777,42.965 100.777,43.398" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M103.93,37.18C103.93,37.609 103.586,37.961 103.156,37.961C102.734,37.961 102.387,37.609 102.387,37.18C102.387,36.746 102.734,36.395 103.156,36.395C103.586,36.395 103.93,36.746 103.93,37.18" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M106.914,39.254C106.914,39.684 106.57,40.035 106.145,40.035C105.723,40.035 105.375,39.684 105.375,39.254C105.375,38.82 105.723,38.469 106.145,38.469C106.57,38.469 106.914,38.82 106.914,39.254" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M103.93,41.324C103.93,41.758 103.586,42.109 103.156,42.109C102.734,42.109 102.387,41.758 102.387,41.324C102.387,40.891 102.734,40.539 103.156,40.539C103.586,40.539 103.93,40.891 103.93,41.324" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M103.93,45.469C103.93,45.902 103.586,46.254 103.156,46.254C102.734,46.254 102.387,45.902 102.387,45.469C102.387,45.035 102.734,44.688 103.156,44.688C103.586,44.688 103.93,45.035 103.93,45.469" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M106.914,43.398C106.914,43.832 106.57,44.18 106.145,44.18C105.723,44.18 105.375,43.832 105.375,43.398C105.375,42.965 105.723,42.613 106.145,42.613C106.57,42.613 106.914,42.965 106.914,43.398" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M109.988,37.18C109.988,37.566 109.68,37.883 109.297,37.883C108.914,37.883 108.602,37.566 108.602,37.18C108.602,36.789 108.914,36.473 109.297,36.473C109.68,36.473 109.988,36.789 109.988,37.18" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M112.977,39.254C112.977,39.641 112.668,39.957 112.281,39.957C111.898,39.957 111.59,39.641 111.59,39.254C111.59,38.863 111.898,38.547 112.281,38.547C112.668,38.547 112.977,38.863 112.977,39.254" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M109.988,41.324C109.988,41.715 109.68,42.031 109.297,42.031C108.914,42.031 108.602,41.715 108.602,41.324C108.602,40.934 108.914,40.617 109.297,40.617C109.68,40.617 109.988,40.934 109.988,41.324" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M109.988,45.469C109.988,45.859 109.68,46.176 109.297,46.176C108.914,46.176 108.602,45.859 108.602,45.469C108.602,45.078 108.914,44.766 109.297,44.766C109.68,44.766 109.988,45.078 109.988,45.469" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M112.977,43.398C112.977,43.789 112.668,44.102 112.281,44.102C111.898,44.102 111.59,43.789 111.59,43.398C111.59,43.008 111.898,42.691 112.281,42.691C112.668,42.691 112.977,43.008 112.977,43.398" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M116.051,37.18C116.051,37.523 115.773,37.805 115.434,37.805C115.094,37.805 114.816,37.523 114.816,37.18C114.816,36.832 115.094,36.551 115.434,36.551C115.773,36.551 116.051,36.832 116.051,37.18" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M119.035,39.254C119.035,39.598 118.762,39.879 118.422,39.879C118.078,39.879 117.805,39.598 117.805,39.254C117.805,38.906 118.078,38.625 118.422,38.625C118.762,38.625 119.035,38.906 119.035,39.254" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M116.051,41.324C116.051,41.672 115.773,41.953 115.434,41.953C115.094,41.953 114.816,41.672 114.816,41.324C114.816,40.98 115.094,40.699 115.434,40.699C115.773,40.699 116.051,40.98 116.051,41.324" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M116.051,45.469C116.051,45.816 115.773,46.098 115.434,46.098C115.094,46.098 114.816,45.816 114.816,45.469C114.816,45.125 115.094,44.844 115.434,44.844C115.773,44.844 116.051,45.125 116.051,45.469" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M119.035,43.398C119.035,43.742 118.762,44.023 118.422,44.023C118.078,44.023 117.805,43.742 117.805,43.398C117.805,43.051 118.078,42.773 118.422,42.773C118.762,42.773 119.035,43.051 119.035,43.398" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M122.188,37.18C122.188,37.523 121.91,37.805 121.57,37.805C121.23,37.805 120.953,37.523 120.953,37.18C120.953,36.832 121.23,36.551 121.57,36.551C121.91,36.551 122.188,36.832 122.188,37.18" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M125.172,39.254C125.172,39.598 124.898,39.879 124.559,39.879C124.219,39.879 123.941,39.598 123.941,39.254C123.941,38.906 124.219,38.625 124.559,38.625C124.898,38.625 125.172,38.906 125.172,39.254" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M122.188,41.324C122.188,41.672 121.91,41.953 121.57,41.953C121.23,41.953 120.953,41.672 120.953,41.324C120.953,40.98 121.23,40.699 121.57,40.699C121.91,40.699 122.188,40.98 122.188,41.324" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M122.188,45.469C122.188,45.816 121.91,46.098 121.57,46.098C121.23,46.098 120.953,45.816 120.953,45.469C120.953,45.125 121.23,44.844 121.57,44.844C121.91,44.844 122.188,45.125 122.188,45.469" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M125.172,43.398C125.172,43.742 124.898,44.023 124.559,44.023C124.219,44.023 123.941,43.742 123.941,43.398C123.941,43.051 124.219,42.773 124.559,42.773C124.898,42.773 125.172,43.051 125.172,43.398" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M128.246,37.18C128.246,37.48 128.008,37.727 127.707,37.727C127.41,37.727 127.168,37.48 127.168,37.18C127.168,36.875 127.41,36.633 127.707,36.633C128.008,36.633 128.246,36.875 128.246,37.18" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M131.156,39.254C131.156,39.512 130.953,39.723 130.695,39.723C130.441,39.723 130.234,39.512 130.234,39.254C130.234,38.992 130.441,38.781 130.695,38.781C130.953,38.781 131.156,38.992 131.156,39.254" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M128.246,41.324C128.246,41.629 128.008,41.871 127.707,41.871C127.41,41.871 127.168,41.629 127.168,41.324C127.168,41.023 127.41,40.777 127.707,40.777C128.008,40.777 128.246,41.023 128.246,41.324" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M128.246,45.469C128.246,45.773 128.008,46.02 127.707,46.02C127.41,46.02 127.168,45.773 127.168,45.469C127.168,45.168 127.41,44.922 127.707,44.922C128.008,44.922 128.246,45.168 128.246,45.469" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M131.156,43.398C131.156,43.656 130.953,43.867 130.695,43.867C130.441,43.867 130.234,43.656 130.234,43.398C130.234,43.137 130.441,42.926 130.695,42.926C130.953,42.926 131.156,43.137 131.156,43.398" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M134.309,37.18C134.309,37.438 134.102,37.648 133.844,37.648C133.59,37.648 133.383,37.438 133.383,37.18C133.383,36.918 133.59,36.707 133.844,36.707C134.102,36.707 134.309,36.918 134.309,37.18" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M137.297,39.254C137.297,39.512 137.09,39.723 136.832,39.723C136.578,39.723 136.371,39.512 136.371,39.254C136.371,38.992 136.578,38.781 136.832,38.781C137.09,38.781 137.297,38.992 137.297,39.254" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M134.309,41.324C134.309,41.586 134.102,41.797 133.844,41.797C133.59,41.797 133.383,41.586 133.383,41.324C133.383,41.066 133.59,40.855 133.844,40.855C134.102,40.855 134.309,41.066 134.309,41.324" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M134.309,45.469C134.309,45.73 134.102,45.941 133.844,45.941C133.59,45.941 133.383,45.73 133.383,45.469C133.383,45.211 133.59,45 133.844,45C134.102,45 134.309,45.211 134.309,45.469" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M137.297,43.398C137.297,43.656 137.09,43.867 136.832,43.867C136.578,43.867 136.371,43.656 136.371,43.398C136.371,43.137 136.578,42.926 136.832,42.926C137.09,42.926 137.297,43.137 137.297,43.398" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M140.367,37.18C140.367,37.395 140.195,37.57 139.98,37.57C139.77,37.57 139.598,37.395 139.598,37.18C139.598,36.965 139.77,36.789 139.98,36.789C140.195,36.789 140.367,36.965 140.367,37.18" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M143.355,39.254C143.355,39.469 143.184,39.645 142.969,39.645C142.758,39.645 142.586,39.469 142.586,39.254C142.586,39.035 142.758,38.859 142.969,38.859C143.184,38.859 143.355,39.035 143.355,39.254" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M140.367,41.324C140.367,41.539 140.195,41.715 139.98,41.715C139.77,41.715 139.598,41.539 139.598,41.324C139.598,41.109 139.77,40.934 139.98,40.934C140.195,40.934 140.367,41.109 140.367,41.324" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M140.367,45.469C140.367,45.684 140.195,45.859 139.98,45.859C139.77,45.859 139.598,45.684 139.598,45.469C139.598,45.254 139.77,45.078 139.98,45.078C140.195,45.078 140.367,45.254 140.367,45.469" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M143.355,43.398C143.355,43.613 143.184,43.789 142.969,43.789C142.758,43.789 142.586,43.613 142.586,43.398C142.586,43.184 142.758,43.008 142.969,43.008C143.184,43.008 143.355,43.184 143.355,43.398" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M146.426,37.18C146.426,37.352 146.289,37.492 146.117,37.492C145.949,37.492 145.813,37.352 145.813,37.18C145.813,37.008 145.949,36.867 146.117,36.867C146.289,36.867 146.426,37.008 146.426,37.18" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M149.414,39.254C149.414,39.426 149.277,39.566 149.105,39.566C148.938,39.566 148.801,39.426 148.801,39.254C148.801,39.078 148.938,38.938 149.105,38.938C149.277,38.938 149.414,39.078 149.414,39.254" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M146.426,41.324C146.426,41.496 146.289,41.637 146.117,41.637C145.949,41.637 145.813,41.496 145.813,41.324C145.813,41.152 145.949,41.012 146.117,41.012C146.289,41.012 146.426,41.152 146.426,41.324" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M146.426,45.469C146.426,45.641 146.289,45.781 146.117,45.781C145.949,45.781 145.813,45.641 145.813,45.469C145.813,45.297 145.949,45.156 146.117,45.156C146.289,45.156 146.426,45.297 146.426,45.469" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M149.414,43.398C149.414,43.57 149.277,43.711 149.105,43.711C148.938,43.711 148.801,43.57 148.801,43.398C148.801,43.223 148.938,43.086 149.105,43.086C149.277,43.086 149.414,43.223 149.414,43.398" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M152.488,37.18C152.488,37.309 152.383,37.414 152.258,37.414C152.129,37.414 152.023,37.309 152.023,37.18C152.023,37.047 152.129,36.941 152.258,36.941C152.383,36.941 152.488,37.047 152.488,37.18" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M155.477,39.254C155.477,39.383 155.371,39.488 155.242,39.488C155.117,39.488 155.012,39.383 155.012,39.254C155.012,39.121 155.117,39.016 155.242,39.016C155.371,39.016 155.477,39.121 155.477,39.254" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M152.488,41.324C152.488,41.453 152.383,41.559 152.258,41.559C152.129,41.559 152.023,41.453 152.023,41.324C152.023,41.195 152.129,41.09 152.258,41.09C152.383,41.09 152.488,41.195 152.488,41.324" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M152.488,45.469C152.488,45.602 152.383,45.703 152.258,45.703C152.129,45.703 152.023,45.602 152.023,45.469C152.023,45.34 152.129,45.234 152.258,45.234C152.383,45.234 152.488,45.34 152.488,45.469" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M155.477,43.398C155.477,43.527 155.371,43.633 155.242,43.633C155.117,43.633 155.012,43.527 155.012,43.398C155.012,43.266 155.117,43.164 155.242,43.164C155.371,43.164 155.477,43.266 155.477,43.398" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M30.656,116.375C30.656,116.996 30.152,117.5 29.531,117.5C28.906,117.5 28.402,116.996 28.402,116.375C28.402,115.75 28.906,115.246 29.531,115.246C30.152,115.246 30.656,115.75 30.656,116.375" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M33.699,118.445C33.699,119.066 33.195,119.574 32.57,119.574C31.949,119.574 31.445,119.066 31.445,118.445C31.445,117.824 31.949,117.316 32.57,117.316C33.195,117.316 33.699,117.824 33.699,118.445" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M30.656,120.52C30.656,121.141 30.152,121.648 29.531,121.648C28.906,121.648 28.402,121.141 28.402,120.52C28.402,119.898 28.906,119.391 29.531,119.391C30.152,119.391 30.656,119.898 30.656,120.52" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M30.656,124.664C30.656,125.285 30.152,125.793 29.531,125.793C28.906,125.793 28.402,125.285 28.402,124.664C28.402,124.043 28.906,123.535 29.531,123.535C30.152,123.535 30.656,124.043 30.656,124.664" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M33.699,122.594C33.699,123.215 33.195,123.719 32.57,123.719C31.949,123.719 31.445,123.215 31.445,122.594C31.445,121.969 31.949,121.465 32.57,121.465C33.195,121.465 33.699,121.969 33.699,122.594" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M36.715,116.375C36.715,116.891 36.293,117.313 35.773,117.313C35.258,117.313 34.832,116.891 34.832,116.375C34.832,115.852 35.258,115.434 35.773,115.434C36.293,115.434 36.715,115.852 36.715,116.375" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M39.754,118.445C39.754,118.965 39.332,119.387 38.813,119.387C38.297,119.387 37.875,118.965 37.875,118.445C37.875,117.926 38.297,117.504 38.813,117.504C39.332,117.504 39.754,117.926 39.754,118.445" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M36.715,120.52C36.715,121.039 36.293,121.461 35.773,121.461C35.258,121.461 34.832,121.039 34.832,120.52C34.832,120 35.258,119.578 35.773,119.578C36.293,119.578 36.715,120 36.715,120.52" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M36.715,124.664C36.715,125.184 36.293,125.605 35.773,125.605C35.258,125.605 34.832,125.184 34.832,124.664C34.832,124.145 35.258,123.723 35.773,123.723C36.293,123.723 36.715,124.145 36.715,124.664" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M39.754,122.594C39.754,123.113 39.332,123.531 38.813,123.531C38.297,123.531 37.875,123.113 37.875,122.594C37.875,122.074 38.297,121.652 38.813,121.652C39.332,121.652 39.754,122.074 39.754,122.594" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M36.715,116.375C36.715,116.891 36.293,117.313 35.773,117.313C35.258,117.313 34.832,116.891 34.832,116.375C34.832,115.852 35.258,115.434 35.773,115.434C36.293,115.434 36.715,115.852 36.715,116.375" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M39.754,118.445C39.754,118.965 39.332,119.387 38.813,119.387C38.297,119.387 37.875,118.965 37.875,118.445C37.875,117.926 38.297,117.504 38.813,117.504C39.332,117.504 39.754,117.926 39.754,118.445" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M36.715,120.52C36.715,121.039 36.293,121.461 35.773,121.461C35.258,121.461 34.832,121.039 34.832,120.52C34.832,120 35.258,119.578 35.773,119.578C36.293,119.578 36.715,120 36.715,120.52" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M36.715,124.664C36.715,125.184 36.293,125.605 35.773,125.605C35.258,125.605 34.832,125.184 34.832,124.664C34.832,124.145 35.258,123.723 35.773,123.723C36.293,123.723 36.715,124.145 36.715,124.664" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M39.754,122.594C39.754,123.113 39.332,123.531 38.813,123.531C38.297,123.531 37.875,123.113 37.875,122.594C37.875,122.074 38.297,121.652 38.813,121.652C39.332,121.652 39.754,122.074 39.754,122.594" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M42.801,116.375C42.801,116.805 42.453,117.156 42.02,117.156C41.586,117.156 41.234,116.805 41.234,116.375C41.234,115.941 41.586,115.59 42.02,115.59C42.453,115.59 42.801,115.941 42.801,116.375" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M45.844,118.445C45.844,118.879 45.492,119.23 45.059,119.23C44.625,119.23 44.273,118.879 44.273,118.445C44.273,118.012 44.625,117.664 45.059,117.664C45.492,117.664 45.844,118.012 45.844,118.445" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M42.801,120.52C42.801,120.949 42.453,121.305 42.02,121.305C41.586,121.305 41.234,120.949 41.234,120.52C41.234,120.086 41.586,119.734 42.02,119.734C42.453,119.734 42.801,120.086 42.801,120.52" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M42.801,124.664C42.801,125.098 42.453,125.449 42.02,125.449C41.586,125.449 41.234,125.098 41.234,124.664C41.234,124.23 41.586,123.879 42.02,123.879C42.453,123.879 42.801,124.23 42.801,124.664" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M45.844,122.594C45.844,123.023 45.492,123.375 45.059,123.375C44.625,123.375 44.273,123.023 44.273,122.594C44.273,122.16 44.625,121.809 45.059,121.809C45.492,121.809 45.844,122.16 45.844,122.594" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M49.047,116.375C49.047,116.805 48.695,117.156 48.262,117.156C47.832,117.156 47.477,116.805 47.477,116.375C47.477,115.941 47.832,115.59 48.262,115.59C48.695,115.59 49.047,115.941 49.047,116.375" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M51.93,118.445C51.93,118.793 51.648,119.07 51.301,119.07C50.957,119.07 50.676,118.793 50.676,118.445C50.676,118.102 50.957,117.82 51.301,117.82C51.648,117.82 51.93,118.102 51.93,118.445" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M49.047,120.52C49.047,120.949 48.695,121.305 48.262,121.305C47.832,121.305 47.477,120.949 47.477,120.52C47.477,120.086 47.832,119.734 48.262,119.734C48.695,119.734 49.047,120.086 49.047,120.52" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M49.047,124.664C49.047,125.098 48.695,125.449 48.262,125.449C47.832,125.449 47.477,125.098 47.477,124.664C47.477,124.23 47.832,123.879 48.262,123.879C48.695,123.879 49.047,124.23 49.047,124.664" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M51.93,122.594C51.93,122.938 51.648,123.219 51.301,123.219C50.957,123.219 50.676,122.938 50.676,122.594C50.676,122.246 50.957,121.965 51.301,121.965C51.648,121.965 51.93,122.246 51.93,122.594" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M55.133,116.375C55.133,116.719 54.852,117 54.508,117C54.16,117 53.883,116.719 53.883,116.375C53.883,116.027 54.16,115.746 54.508,115.746C54.852,115.746 55.133,116.027 55.133,116.375" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M58.016,118.445C58.016,118.707 57.809,118.914 57.547,118.914C57.285,118.914 57.078,118.707 57.078,118.445C57.078,118.188 57.285,117.977 57.547,117.977C57.809,117.977 58.016,118.188 58.016,118.445" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M55.133,120.52C55.133,120.863 54.852,121.145 54.508,121.145C54.16,121.145 53.883,120.863 53.883,120.52C53.883,120.172 54.16,119.891 54.508,119.891C54.852,119.891 55.133,120.172 55.133,120.52" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M55.133,124.664C55.133,125.008 54.852,125.289 54.508,125.289C54.16,125.289 53.883,125.008 53.883,124.664C53.883,124.316 54.16,124.039 54.508,124.039C54.852,124.039 55.133,124.316 55.133,124.664" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M58.016,122.59C58.016,122.852 57.809,123.063 57.547,123.063C57.285,123.063 57.078,122.852 57.078,122.59C57.078,122.332 57.285,122.121 57.547,122.121C57.809,122.121 58.016,122.332 58.016,122.59" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M61.219,116.375C61.219,116.633 61.012,116.844 60.75,116.844C60.492,116.844 60.281,116.633 60.281,116.375C60.281,116.113 60.492,115.902 60.75,115.902C61.012,115.902 61.219,116.113 61.219,116.375" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M64.262,118.445C64.262,118.707 64.051,118.914 63.789,118.914C63.531,118.914 63.32,118.707 63.32,118.445C63.32,118.188 63.531,117.977 63.789,117.977C64.051,117.977 64.262,118.188 64.262,118.445" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M61.219,120.52C61.219,120.777 61.012,120.988 60.75,120.988C60.492,120.988 60.281,120.777 60.281,120.52C60.281,120.258 60.492,120.047 60.75,120.047C61.012,120.047 61.219,120.258 61.219,120.52" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M61.219,124.664C61.219,124.922 61.012,125.133 60.75,125.133C60.492,125.133 60.281,124.922 60.281,124.664C60.281,124.402 60.492,124.191 60.75,124.191C61.012,124.191 61.219,124.402 61.219,124.664" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M64.262,122.59C64.262,122.852 64.051,123.063 63.789,123.063C63.531,123.063 63.32,122.852 63.32,122.59C63.32,122.332 63.531,122.121 63.789,122.121C64.051,122.121 64.262,122.332 64.262,122.59" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M67.309,116.371C67.309,116.543 67.168,116.684 66.996,116.684C66.824,116.684 66.68,116.543 66.68,116.371C66.68,116.199 66.824,116.059 66.996,116.059C67.168,116.059 67.309,116.199 67.309,116.371" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M70.348,118.445C70.348,118.617 70.207,118.758 70.035,118.758C69.863,118.758 69.723,118.617 69.723,118.445C69.723,118.273 69.863,118.133 70.035,118.133C70.207,118.133 70.348,118.273 70.348,118.445" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M67.309,120.52C67.309,120.691 67.168,120.832 66.996,120.832C66.824,120.832 66.68,120.691 66.68,120.52C66.68,120.344 66.824,120.203 66.996,120.203C67.168,120.203 67.309,120.344 67.309,120.52" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M67.309,124.664C67.309,124.836 67.168,124.977 66.996,124.977C66.824,124.977 66.68,124.836 66.68,124.664C66.68,124.488 66.824,124.352 66.996,124.352C67.168,124.352 67.309,124.488 67.309,124.664" android:strokeColor="#00000000"/>
+    <path android:fillColor="#4C4948" android:fillType="nonZero"
+        android:pathData="M70.348,122.59C70.348,122.762 70.207,122.906 70.035,122.906C69.863,122.906 69.723,122.762 69.723,122.59C69.723,122.418 69.863,122.277 70.035,122.277C70.207,122.277 70.348,122.418 70.348,122.59" android:strokeColor="#00000000"/>
+    <path android:fillColor="#9FA0A1" android:fillType="nonZero"
+        android:pathData="M157.426,118.492L161.555,118.492C160.918,124.699 155.484,125.578 155.484,125.578C158.07,123.195 157.563,119.586 157.426,118.492" android:strokeColor="#00000000"/>
+    <path android:fillColor="#9FA0A1" android:fillType="nonZero"
+        android:pathData="M125.867,123.109C125.527,123.406 125.074,123.555 124.492,123.555L123.598,123.555L123.598,120.398L124.492,120.398C125.074,120.398 125.527,120.551 125.867,120.848C126.191,121.137 126.359,121.531 126.371,121.98C126.359,122.426 126.191,122.82 125.867,123.109M127.84,119.594C127.199,118.891 126.438,118.531 125.563,118.531L121.289,118.531L121.289,125.422L125.563,125.422C126.438,125.422 127.199,125.066 127.84,124.363C128.477,123.664 128.797,122.891 128.809,121.98C128.797,121.066 128.477,120.293 127.84,119.594" android:strokeColor="#00000000"/>
+    <path android:fillColor="#9FA0A1" android:fillType="nonZero"
+        android:pathData="M133.238,124.16C132.488,124.16 131.887,123.684 131.887,123.102C131.887,122.52 132.488,122.043 133.238,122.043C133.984,122.043 134.59,122.52 134.59,123.102C134.59,123.684 133.984,124.16 133.238,124.16M135.316,118.867C134.238,118.332 133.34,118.301 132.41,118.352C131.863,118.383 131.164,118.504 130.434,118.742C130.305,118.785 130.172,118.832 130.039,118.883C130.121,119.121 130.238,119.332 130.449,119.535L130.473,119.559C131.09,120.125 132.406,119.855 133.348,119.996C134.297,120.137 134.461,121.031 134.461,121.031C133.949,120.758 133.336,120.59 132.668,120.59C130.926,120.59 129.504,121.711 129.504,123.09C129.504,124.422 130.836,125.52 132.508,125.582C132.758,125.59 133.195,125.574 133.785,125.438C135.945,124.934 136.887,125.449 136.887,125.449L136.887,121.754C136.887,119.949 136.203,119.309 135.316,118.867" android:strokeColor="#00000000"/>
+    <path android:fillColor="#9FA0A1" android:fillType="nonZero"
+        android:pathData="M149.84,124.16C149.098,124.16 148.488,123.684 148.488,123.102C148.488,122.52 149.098,122.043 149.84,122.043C150.586,122.043 151.191,122.52 151.191,123.102C151.191,123.684 150.586,124.16 149.84,124.16M151.926,118.867C150.844,118.332 149.945,118.301 149.012,118.352C148.469,118.383 147.766,118.504 147.039,118.742C146.91,118.785 146.777,118.832 146.645,118.883C146.727,119.121 146.844,119.332 147.055,119.535L147.078,119.559C147.695,120.125 149.008,119.855 149.953,119.996C150.898,120.137 151.063,121.031 151.063,121.031C150.551,120.758 149.938,120.59 149.273,120.59C147.527,120.59 146.105,121.711 146.105,123.09C146.105,124.422 147.438,125.52 149.109,125.582C149.359,125.59 149.801,125.574 150.387,125.438C152.547,124.934 153.488,125.449 153.488,125.449L153.488,121.754C153.488,119.949 152.809,119.309 151.926,118.867" android:strokeColor="#00000000"/>
+    <path android:fillColor="#9FA0A1" android:fillType="nonZero"
+        android:pathData="M136.844,114.5L133.953,114.5C134.48,118.031 137.953,118.547 137.953,118.547C136.477,117.184 136.77,115.125 136.844,114.5" android:strokeColor="#00000000"/>
+    <path android:fillColor="#9FA0A1" android:fillType="nonZero"
+        android:pathData="M145.258,121.035C145.258,120.109 144.988,119.516 144.477,119.074C143.98,118.652 143.355,118.484 142.699,118.484C142.102,118.484 141.633,118.609 141.262,118.754C139.313,119.484 138.176,118.723 138.176,118.723L138.176,125.422L140.516,125.422L140.516,120.891C140.516,120.891 140.969,120.418 141.719,120.398C142.469,120.371 142.922,120.824 142.922,121.852L142.918,125.422L145.262,125.422" android:strokeColor="#00000000"/>
+    <path android:fillColor="#9FA0A1" android:fillType="nonZero"
+        android:pathData="M78.035,123.984L78.566,123.984L78.566,119.969L78.035,119.969ZM78.035,123.984" android:strokeColor="#00000000"/>
+    <path android:fillColor="#9FA0A1" android:fillType="nonZero"
+        android:pathData="M79.5,123.988L79.5,119.969L80.043,119.969L82.156,123.125L82.156,119.969L82.664,119.969L82.664,123.988L82.121,123.988L80.008,120.828L80.008,123.988" android:strokeColor="#00000000"/>
+    <path android:fillColor="#9FA0A1" android:fillType="nonZero"
+        android:pathData="M83.379,122.695L83.883,122.652C83.906,122.855 83.961,123.02 84.043,123.148C84.133,123.277 84.27,123.383 84.453,123.461C84.633,123.539 84.84,123.578 85.066,123.578C85.27,123.578 85.449,123.551 85.605,123.488C85.762,123.43 85.875,123.348 85.953,123.242C86.027,123.137 86.066,123.02 86.066,122.898C86.066,122.77 86.027,122.66 85.957,122.566C85.883,122.469 85.762,122.395 85.594,122.328C85.488,122.289 85.246,122.223 84.879,122.133C84.508,122.047 84.254,121.961 84.102,121.883C83.91,121.781 83.766,121.656 83.672,121.508C83.578,121.359 83.531,121.191 83.531,121.004C83.531,120.805 83.59,120.617 83.703,120.441C83.82,120.262 83.988,120.125 84.211,120.039C84.43,119.945 84.676,119.902 84.945,119.902C85.246,119.902 85.508,119.949 85.734,120.043C85.961,120.141 86.141,120.281 86.262,120.465C86.383,120.652 86.449,120.863 86.457,121.102L85.949,121.137C85.918,120.883 85.828,120.691 85.668,120.563C85.512,120.434 85.277,120.371 84.969,120.371C84.645,120.371 84.414,120.426 84.266,120.547C84.117,120.664 84.043,120.805 84.043,120.969C84.043,121.117 84.098,121.234 84.203,121.328C84.301,121.422 84.57,121.52 85.004,121.613C85.434,121.711 85.73,121.797 85.891,121.871C86.129,121.98 86.301,122.117 86.414,122.281C86.52,122.445 86.578,122.637 86.578,122.855C86.578,123.066 86.52,123.27 86.395,123.457C86.27,123.645 86.094,123.793 85.867,123.898C85.637,124.004 85.379,124.059 85.094,124.059C84.727,124.059 84.422,124.004 84.176,123.898C83.93,123.789 83.738,123.633 83.598,123.418C83.461,123.207 83.387,122.965 83.379,122.695" android:strokeColor="#00000000"/>
+    <path android:fillColor="#9FA0A1" android:fillType="nonZero"
+        android:pathData="M89.945,119.969L90.473,119.969L90.473,122.293C90.473,122.699 90.426,123.016 90.336,123.254C90.246,123.488 90.082,123.684 89.84,123.836C89.602,123.984 89.289,124.059 88.906,124.059C88.527,124.059 88.219,123.992 87.977,123.859C87.738,123.73 87.566,123.543 87.469,123.297C87.363,123.051 87.313,122.715 87.313,122.293L87.313,119.969L87.848,119.969L87.848,122.289C87.848,122.637 87.879,122.895 87.941,123.059C88.008,123.227 88.117,123.355 88.277,123.445C88.434,123.531 88.629,123.578 88.855,123.578C89.25,123.578 89.527,123.488 89.691,123.313C89.859,123.133 89.945,122.793 89.945,122.289" android:strokeColor="#00000000"/>
+    <path android:fillColor="#9FA0A1" android:fillType="nonZero"
+        android:pathData="M91.336,123.988L91.336,119.969L91.871,119.969L91.871,123.516L93.848,123.516L93.848,123.988" android:strokeColor="#00000000"/>
+    <path android:fillColor="#9FA0A1" android:fillType="nonZero"
+        android:pathData="M94.574,123.984L95.105,123.984L95.105,119.969L94.574,119.969ZM94.574,123.984" android:strokeColor="#00000000"/>
+    <path android:fillColor="#9FA0A1" android:fillType="nonZero"
+        android:pathData="M96.035,123.988L96.035,119.969L96.582,119.969L98.695,123.125L98.695,119.969L99.203,119.969L99.203,123.988L98.66,123.988L96.547,120.828L96.547,123.988" android:strokeColor="#00000000"/>
+    <path android:fillColor="#9FA0A1" android:fillType="nonZero"
+        android:pathData="M101.781,121.883L102.82,121.883C103.164,121.883 103.41,121.816 103.551,121.688C103.695,121.559 103.77,121.379 103.77,121.148C103.77,120.98 103.723,120.836 103.641,120.715C103.555,120.594 103.445,120.516 103.305,120.477C103.215,120.457 103.051,120.441 102.809,120.441L101.781,120.441ZM101.246,123.988L101.246,119.969L102.766,119.969C103.031,119.969 103.234,119.98 103.375,120.008C103.574,120.039 103.738,120.102 103.871,120.195C104.008,120.289 104.113,120.418 104.195,120.582C104.277,120.75 104.316,120.93 104.316,121.133C104.316,121.473 104.207,121.762 103.988,121.996C103.773,122.234 103.379,122.352 102.813,122.352L101.781,122.352L101.781,123.988" android:strokeColor="#00000000"/>
+    <path android:fillColor="#9FA0A1" android:fillType="nonZero"
+        android:pathData="M107.633,119.969L108.164,119.969L108.164,122.293C108.164,122.699 108.117,123.016 108.027,123.254C107.938,123.488 107.77,123.684 107.531,123.836C107.293,123.984 106.98,124.059 106.594,124.059C106.215,124.059 105.906,123.992 105.668,123.859C105.43,123.73 105.258,123.543 105.152,123.297C105.055,123.051 105.004,122.715 105.004,122.293L105.004,119.969L105.535,119.969L105.535,122.289C105.535,122.637 105.566,122.895 105.629,123.059C105.695,123.227 105.809,123.355 105.965,123.445C106.125,123.531 106.316,123.578 106.547,123.578C106.938,123.578 107.215,123.488 107.383,123.313C107.547,123.133 107.633,122.793 107.633,122.289" android:strokeColor="#00000000"/>
+    <path android:fillColor="#9FA0A1" android:fillType="nonZero"
+        android:pathData="M109.035,123.988L109.035,119.969L109.832,119.969L110.785,122.813C110.871,123.078 110.938,123.277 110.977,123.41C111.02,123.266 111.094,123.047 111.191,122.766L112.152,119.969L112.871,119.969L112.871,123.988L112.355,123.988L112.355,120.625L111.188,123.988L110.707,123.988L109.547,120.566L109.547,123.988" android:strokeColor="#00000000"/>
+    <path android:fillColor="#9FA0A1" android:fillType="nonZero"
+        android:pathData="M114.258,121.883L115.297,121.883C115.641,121.883 115.883,121.816 116.027,121.688C116.172,121.559 116.246,121.379 116.246,121.148C116.246,120.98 116.203,120.836 116.117,120.715C116.035,120.594 115.922,120.516 115.785,120.477C115.691,120.457 115.527,120.441 115.285,120.441L114.258,120.441ZM113.727,123.988L113.727,119.969L115.242,119.969C115.508,119.969 115.715,119.98 115.855,120.008C116.055,120.039 116.215,120.102 116.352,120.195C116.484,120.289 116.59,120.418 116.672,120.582C116.754,120.75 116.797,120.93 116.797,121.133C116.797,121.473 116.688,121.762 116.469,121.996C116.25,122.234 115.859,122.352 115.289,122.352L114.258,122.352L114.258,123.988" android:strokeColor="#00000000"/>
+    <path android:fillColor="#9FA0A1" android:fillType="nonZero"
+        android:pathData="M118.941,126.082C118.789,126.082 118.664,125.957 118.664,125.805L118.664,118.152C118.664,118 118.789,117.879 118.941,117.879C119.098,117.879 119.219,118 119.219,118.152L119.219,125.805C119.219,125.957 119.098,126.082 118.941,126.082" android:strokeColor="#00000000"/>
+    <path android:fillColor="#9FA0A1" android:fillType="nonZero"
+        android:pathData="M160.898,115.699C160.898,116.48 160.27,117.109 159.488,117.109C158.711,117.109 158.078,116.48 158.078,115.699C158.078,114.922 158.711,114.293 159.488,114.293C160.27,114.293 160.898,114.922 160.898,115.699" android:strokeColor="#00000000"/>
+    <path android:fillColor="#DD5643" android:fillType="nonZero"
+        android:pathData="M208.965,92.926C208.965,91.316 208.164,90.16 206.879,90.16C205.574,90.16 204.793,91.316 204.793,92.926C204.793,94.559 205.574,95.723 206.879,95.723C208.164,95.723 208.965,94.559 208.965,92.926M210.352,92.926C210.352,95.297 208.996,96.938 206.879,96.938C204.762,96.938 203.395,95.297 203.395,92.926C203.395,90.566 204.762,88.926 206.879,88.926C208.996,88.926 210.352,90.566 210.352,92.926" android:strokeColor="#00000000"/>
+    <path android:fillColor="#DD5643" android:fillType="nonZero"
+        android:pathData="M216.402,96.746L213.555,93.23C213.301,93.465 212.996,93.738 212.816,93.898L212.816,96.734L211.508,96.734L211.508,89.129L212.816,89.129L212.816,92.258C213.727,91.379 214.992,90.133 215.824,89.117L217.414,89.117C216.473,90.305 215.367,91.438 214.484,92.328L217.973,96.746" android:strokeColor="#00000000"/>
+    <path android:fillColor="#595757" android:fillType="nonZero"
+        android:pathData="M29.691,56.836C29.691,56.395 29.336,56.039 28.895,56.039C28.453,56.039 28.098,56.395 28.098,56.836L28.098,104.637C28.098,105.078 28.453,105.438 28.895,105.438C29.262,105.438 29.559,105.18 29.652,104.844L29.664,104.844L29.664,104.785C29.672,104.734 29.691,104.691 29.691,104.637" android:strokeColor="#00000000"/>
+    <path android:fillColor="#595757" android:fillType="nonZero"
+        android:pathData="M32.785,56.836C32.785,56.395 32.426,56.039 31.988,56.039C31.547,56.039 31.191,56.395 31.191,56.836L31.191,104.637C31.191,105.078 31.547,105.438 31.988,105.438C32.355,105.438 32.652,105.18 32.746,104.844L32.754,104.844L32.754,104.785C32.766,104.734 32.785,104.691 32.785,104.637" android:strokeColor="#00000000"/>
+    <path android:fillColor="#595757" android:fillType="nonZero"
+        android:pathData="M35.879,56.836C35.879,56.395 35.52,56.039 35.082,56.039C34.641,56.039 34.281,56.395 34.281,56.836L34.281,104.637C34.281,105.078 34.641,105.438 35.082,105.438C35.449,105.438 35.746,105.18 35.836,104.844L35.848,104.844L35.848,104.785C35.859,104.734 35.879,104.691 35.879,104.637" android:strokeColor="#00000000"/>
+    <path android:fillColor="#595757" android:fillType="nonZero"
+        android:pathData="M38.973,56.836C38.973,56.395 38.613,56.039 38.172,56.039C37.734,56.039 37.375,56.395 37.375,56.836L37.375,104.637C37.375,105.078 37.734,105.438 38.172,105.438C38.543,105.438 38.84,105.18 38.93,104.844L38.941,104.844L38.941,104.785C38.953,104.734 38.973,104.691 38.973,104.637" android:strokeColor="#00000000"/>
+    <path android:fillColor="#595757" android:fillType="nonZero"
+        android:pathData="M42.066,56.836C42.066,56.395 41.707,56.039 41.266,56.039C40.828,56.039 40.469,56.395 40.469,56.836L40.469,104.637C40.469,105.078 40.828,105.438 41.266,105.438C41.633,105.438 41.93,105.18 42.023,104.844L42.035,104.844L42.035,104.785C42.043,104.734 42.066,104.691 42.066,104.637" android:strokeColor="#00000000"/>
+    <path android:fillColor="#5B5A59" android:fillType="nonZero"
+        android:pathData="M11.285,36.223C11.504,35.707 11.766,35.215 12.055,34.738ZM25.199,129.113C21.324,129.113 17.934,127.484 16.051,124.699L16.012,124.664L15.984,124.605C15.375,123.68 14.922,122.637 14.68,121.477L14.676,121.465L14.676,121.445C14.543,120.801 14.469,120.121 14.469,119.41L14.469,43.41C14.469,37.496 19.281,33.703 25.199,33.703L26.02,33.703L26.02,28.746L21.742,28.746C15.211,28.746 9.898,34.059 9.898,40.586L9.898,122.234C9.898,128.762 15.211,134.074 21.742,134.074L26.02,134.074L26.02,129.113" android:strokeColor="#00000000"/>
+</vector>
diff --git a/dana/src/main/res/layout/danar_fragment.xml b/dana/src/main/res/layout/danar_fragment.xml
index d8d5f27158..eeb1a1f853 100644
--- a/dana/src/main/res/layout/danar_fragment.xml
+++ b/dana/src/main/res/layout/danar_fragment.xml
@@ -1,703 +1,20 @@
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:paddingTop="5dp"
-    tools:context="info.nightscout.androidaps.dana.DanaFragment">
+    tools:context="info.nightscout.androidaps.dana.DanaFragment"
+    android:orientation="vertical">
 
-
-    <RelativeLayout
+    <ScrollView
+        android:id="@+id/scrollview"
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <ScrollView
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_above="@+id/buttons"
-            android:fillViewport="true">
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical">
-
-                <LinearLayout
-                    android:id="@+id/dana_pumpstatuslayout"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:orientation="horizontal"
-                    android:paddingBottom="5dp"
-                    android:paddingTop="2dp"
-                    android:visibility="gone">
-
-                    <TextView
-                        android:id="@+id/dana_pumpstatus"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginLeft="5dp"
-                        android:layout_marginRight="5dp"
-                        android:gravity="center_vertical|center_horizontal"
-                        android:text="@string/initializing"
-                        android:textAppearance="?android:attr/textAppearanceSmall" />
-                </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"
-                        android:gravity="end"
-                        android:paddingRight="5dp"
-                        android:text="@string/serialnumber"
-                        android:textSize="14sp" />
-
-                    <TextView
-                        android:layout_width="5dp"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="0"
-                        android:gravity="center_horizontal"
-                        android:paddingEnd="2dp"
-                        android:paddingStart="2dp"
-                        android:text=":"
-                        android:textSize="14sp" />
-
-                    <TextView
-                        android:id="@+id/serial_number"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1"
-                        android:gravity="start"
-                        android:paddingLeft="5dp"
-                        android:textColor="@android:color/white"
-                        android:textSize="14sp" />
-
-
-                </LinearLayout>
-
-                <View
-                    android:layout_width="fill_parent"
-                    android:layout_height="2dip"
-                    android:layout_marginBottom="5dp"
-                    android:layout_marginLeft="20dp"
-                    android:layout_marginRight="20dp"
-                    android:layout_marginTop="5dp"
-                    android:background="@color/list_delimiter" />
-
-                <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"
-                        android:gravity="end"
-                        android:paddingRight="5dp"
-                        android:text="@string/danar_bluetooth_status"
-                        android:textSize="14sp" />
-
-                    <TextView
-                        android:layout_width="5dp"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="0"
-                        android:gravity="center_horizontal"
-                        android:paddingEnd="2dp"
-                        android:paddingStart="2dp"
-                        android:text=":"
-                        android:textSize="14sp" />
-
-                    <com.joanzapata.iconify.widget.IconTextView
-                        android:id="@+id/btconnection"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1"
-                        android:gravity="start"
-                        android:paddingLeft="5dp"
-                        android:text="{fa-bluetooth-b}"
-                        android:textColor="@android:color/white"
-                        android:textSize="20dp" />
-
-
-                </LinearLayout>
-
-                <TextView
-                    android:id="@+id/queue"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:text="content"
-                    android:textAlignment="center" />
-
-                <View
-                    android:layout_width="fill_parent"
-                    android:layout_height="2dip"
-                    android:layout_marginBottom="5dp"
-                    android:layout_marginLeft="20dp"
-                    android:layout_marginRight="20dp"
-                    android:layout_marginTop="5dp"
-                    android:background="@color/list_delimiter" />
-
-                <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"
-                        android:gravity="end"
-                        android:paddingRight="5dp"
-                        android:text="@string/battery_label"
-                        android:textSize="14sp" />
-
-                    <TextView
-                        android:layout_width="5dp"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="0"
-                        android:gravity="center_horizontal"
-                        android:paddingEnd="2dp"
-                        android:paddingStart="2dp"
-                        android:text=":"
-                        android:textSize="14sp" />
-
-                    <com.joanzapata.iconify.widget.IconTextView
-                        android:id="@+id/battery"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1"
-                        android:gravity="start"
-                        android:paddingLeft="5dp"
-                        android:textColor="@android:color/white"
-                        android:textSize="20dp" />
-
-
-                </LinearLayout>
-
-                <View
-                    android:layout_width="fill_parent"
-                    android:layout_height="2dip"
-                    android:layout_marginBottom="5dp"
-                    android:layout_marginLeft="20dp"
-                    android:layout_marginRight="20dp"
-                    android:layout_marginTop="5dp"
-                    android:background="@color/list_delimiter" />
-
-                <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"
-                        android:gravity="end"
-                        android:paddingRight="5dp"
-                        android:text="@string/lastconnection_label"
-                        android:textSize="14sp" />
-
-                    <TextView
-                        android:layout_width="5dp"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="0"
-                        android:gravity="center_horizontal"
-                        android:paddingEnd="2dp"
-                        android:paddingStart="2dp"
-                        android:text=":"
-                        android:textSize="14sp" />
-
-                    <TextView
-                        android:id="@+id/lastconnection"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1"
-                        android:gravity="start"
-                        android:paddingLeft="5dp"
-                        android:textColor="@android:color/white"
-                        android:textSize="14sp" />
-
-                </LinearLayout>
-
-                <View
-                    android:layout_width="fill_parent"
-                    android:layout_height="2dip"
-                    android:layout_marginBottom="5dp"
-                    android:layout_marginLeft="20dp"
-                    android:layout_marginRight="20dp"
-                    android:layout_marginTop="5dp"
-                    android:background="@color/list_delimiter" />
-
-                <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"
-                        android:gravity="end"
-                        android:paddingRight="5dp"
-                        android:text="@string/lastbolus_label"
-                        android:textSize="14sp" />
-
-                    <TextView
-                        android:layout_width="5dp"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="0"
-                        android:gravity="center_horizontal"
-                        android:paddingEnd="2dp"
-                        android:paddingStart="2dp"
-                        android:text=":"
-                        android:textSize="14sp" />
-
-                    <TextView
-                        android:id="@+id/lastbolus"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1"
-                        android:gravity="start"
-                        android:paddingLeft="5dp"
-                        android:textColor="@android:color/white"
-                        android:textSize="14sp" />
-
-                </LinearLayout>
-
-                <View
-                    android:layout_width="fill_parent"
-                    android:layout_height="2dip"
-                    android:layout_marginBottom="5dp"
-                    android:layout_marginLeft="20dp"
-                    android:layout_marginRight="20dp"
-                    android:layout_marginTop="5dp"
-                    android:background="@color/list_delimiter" />
-
-                <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"
-                        android:gravity="end"
-                        android:paddingRight="5dp"
-                        android:text="@string/dailyunits"
-                        android:textSize="14sp" />
-
-                    <TextView
-                        android:layout_width="5dp"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="0"
-                        android:gravity="center_horizontal"
-                        android:paddingEnd="2dp"
-                        android:paddingStart="2dp"
-                        android:text=":"
-                        android:textSize="14sp" />
-
-                    <TextView
-                        android:id="@+id/dailyunits"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1"
-                        android:gravity="start"
-                        android:paddingLeft="5dp"
-                        android:textColor="@android:color/white"
-                        android:textSize="14sp" />
-
-                </LinearLayout>
-
-                <View
-                    android:layout_width="fill_parent"
-                    android:layout_height="2dip"
-                    android:layout_marginBottom="5dp"
-                    android:layout_marginLeft="20dp"
-                    android:layout_marginRight="20dp"
-                    android:layout_marginTop="5dp"
-                    android:background="@color/list_delimiter" />
-
-                <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"
-                        android:gravity="end"
-                        android:paddingRight="5dp"
-                        android:text="@string/basebasalrate_label"
-                        android:textSize="14sp" />
-
-                    <TextView
-                        android:layout_width="5dp"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="0"
-                        android:gravity="center_horizontal"
-                        android:paddingEnd="2dp"
-                        android:paddingStart="2dp"
-                        android:text=":"
-                        android:textSize="14sp" />
-
-                    <TextView
-                        android:id="@+id/basabasalrate"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1"
-                        android:gravity="start"
-                        android:paddingLeft="5dp"
-                        android:textColor="@android:color/white"
-                        android:textSize="14sp" />
-
-                </LinearLayout>
-
-                <View
-                    android:layout_width="fill_parent"
-                    android:layout_height="2dip"
-                    android:layout_marginBottom="5dp"
-                    android:layout_marginLeft="20dp"
-                    android:layout_marginRight="20dp"
-                    android:layout_marginTop="5dp"
-                    android:background="@color/list_delimiter" />
-
-                <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"
-                        android:gravity="end"
-                        android:paddingRight="5dp"
-                        android:text="@string/tempbasal_label"
-                        android:textSize="14sp" />
-
-                    <TextView
-                        android:layout_width="5dp"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="0"
-                        android:gravity="center_horizontal"
-                        android:paddingEnd="2dp"
-                        android:paddingStart="2dp"
-                        android:text=":"
-                        android:textSize="14sp" />
-
-                    <TextView
-                        android:id="@+id/tempbasal"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1"
-                        android:gravity="start"
-                        android:paddingLeft="5dp"
-                        android:textColor="@android:color/white"
-                        android:textSize="14sp" />
-
-                </LinearLayout>
-
-                <View
-                    android:layout_width="fill_parent"
-                    android:layout_height="2dip"
-                    android:layout_marginBottom="5dp"
-                    android:layout_marginLeft="20dp"
-                    android:layout_marginRight="20dp"
-                    android:layout_marginTop="5dp"
-                    android:background="@color/list_delimiter" />
-
-                <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"
-                        android:gravity="end"
-                        android:paddingRight="5dp"
-                        android:text="@string/virtualpump_extendedbolus_label"
-                        android:textSize="14sp" />
-
-                    <TextView
-                        android:layout_width="5dp"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="0"
-                        android:gravity="center_horizontal"
-                        android:paddingEnd="2dp"
-                        android:paddingStart="2dp"
-                        android:text=":"
-                        android:textSize="14sp" />
-
-                    <TextView
-                        android:id="@+id/extendedbolus"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1"
-                        android:gravity="start"
-                        android:paddingLeft="5dp"
-                        android:textColor="@android:color/white"
-                        android:textSize="14sp" />
-
-                </LinearLayout>
-
-                <View
-                    android:layout_width="fill_parent"
-                    android:layout_height="2dip"
-                    android:layout_marginBottom="5dp"
-                    android:layout_marginLeft="20dp"
-                    android:layout_marginRight="20dp"
-                    android:layout_marginTop="5dp"
-                    android:background="@color/list_delimiter" />
-
-                <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"
-                        android:gravity="end"
-                        android:paddingRight="5dp"
-                        android:text="@string/reservoir_label"
-                        android:textSize="14sp" />
-
-                    <TextView
-                        android:layout_width="5dp"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="0"
-                        android:gravity="center_horizontal"
-                        android:paddingEnd="2dp"
-                        android:paddingStart="2dp"
-                        android:text=":"
-                        android:textSize="14sp" />
-
-                    <TextView
-                        android:id="@+id/reservoir"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1"
-                        android:gravity="start"
-                        android:paddingLeft="5dp"
-                        android:textColor="@android:color/white"
-                        android:textSize="14sp" />
-
-                </LinearLayout>
-
-                <View
-                    android:layout_width="fill_parent"
-                    android:layout_height="2dip"
-                    android:layout_marginBottom="5dp"
-                    android:layout_marginLeft="20dp"
-                    android:layout_marginRight="20dp"
-                    android:layout_marginTop="5dp"
-                    android:background="@color/list_delimiter" />
-
-                <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"
-                        android:gravity="end"
-                        android:paddingRight="5dp"
-                        android:text="@string/danar_iob_label"
-                        android:textSize="14sp" />
-
-                    <TextView
-                        android:layout_width="5dp"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="0"
-                        android:gravity="center_horizontal"
-                        android:paddingEnd="2dp"
-                        android:paddingStart="2dp"
-                        android:text=":"
-                        android:textSize="14sp" />
-
-                    <TextView
-                        android:id="@+id/iob"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1"
-                        android:gravity="start"
-                        android:paddingLeft="5dp"
-                        android:textColor="@android:color/white"
-                        android:textSize="14sp" />
-
-                </LinearLayout>
-
-                <View
-                    android:layout_width="fill_parent"
-                    android:layout_height="2dip"
-                    android:layout_marginBottom="5dp"
-                    android:layout_marginLeft="20dp"
-                    android:layout_marginRight="20dp"
-                    android:layout_marginTop="5dp"
-                    android:background="@color/list_delimiter" />
-
-                <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"
-                        android:gravity="end"
-                        android:paddingRight="5dp"
-                        android:text="@string/basal_step"
-                        android:textSize="14sp" />
-
-                    <TextView
-                        android:layout_width="5dp"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="0"
-                        android:gravity="center_horizontal"
-                        android:paddingEnd="2dp"
-                        android:paddingStart="2dp"
-                        android:text=":"
-                        android:textSize="14sp" />
-
-                    <TextView
-                        android:id="@+id/basalstep"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1"
-                        android:gravity="start"
-                        android:paddingLeft="5dp"
-                        android:textColor="@android:color/white"
-                        android:textSize="14sp" />
-
-                </LinearLayout>
-
-                <View
-                    android:layout_width="fill_parent"
-                    android:layout_height="2dip"
-                    android:layout_marginBottom="5dp"
-                    android:layout_marginLeft="20dp"
-                    android:layout_marginRight="20dp"
-                    android:layout_marginTop="5dp"
-                    android:background="@color/list_delimiter" />
-
-                <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"
-                        android:gravity="end"
-                        android:paddingRight="5dp"
-                        android:text="@string/bolus_step"
-                        android:textSize="14sp" />
-
-                    <TextView
-                        android:layout_width="5dp"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="0"
-                        android:gravity="center_horizontal"
-                        android:paddingEnd="2dp"
-                        android:paddingStart="2dp"
-                        android:text=":"
-                        android:textSize="14sp" />
-
-                    <TextView
-                        android:id="@+id/bolusstep"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1"
-                        android:gravity="start"
-                        android:paddingLeft="5dp"
-                        android:textColor="@android:color/white"
-                        android:textSize="14sp" />
-
-                </LinearLayout>
-
-                <View
-                    android:layout_width="fill_parent"
-                    android:layout_height="2dip"
-                    android:layout_marginBottom="5dp"
-                    android:layout_marginLeft="20dp"
-                    android:layout_marginRight="20dp"
-                    android:layout_marginTop="5dp"
-                    android:background="@color/list_delimiter" />
-
-                <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"
-                        android:gravity="end"
-                        android:paddingRight="5dp"
-                        android:text="@string/virtualpump_firmware_label"
-                        android:textSize="14sp" />
-
-                    <TextView
-                        android:layout_width="5dp"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="0"
-                        android:gravity="center_horizontal"
-                        android:paddingEnd="2dp"
-                        android:paddingStart="2dp"
-                        android:text=":"
-                        android:textSize="14sp" />
-
-                    <TextView
-                        android:id="@+id/firmware"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1"
-                        android:gravity="start"
-                        android:paddingLeft="5dp"
-                        android:textColor="@android:color/white"
-                        android:textSize="14sp" />
-
-                </LinearLayout>
-
-                <View
-                    android:layout_width="fill_parent"
-                    android:layout_height="2dip"
-                    android:layout_marginBottom="5dp"
-                    android:layout_marginLeft="20dp"
-                    android:layout_marginRight="20dp"
-                    android:layout_marginTop="5dp"
-                    android:background="@color/list_delimiter" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center"
-                    android:drawableTop="@drawable/ic_danars"
-                    android:paddingTop="10dp" />
-
-            </LinearLayout>
-
-        </ScrollView>
+        android:layout_height="0dp"
+        android:paddingTop="5dp"
+        android:layout_weight="1">
 
         <LinearLayout
-            android:id="@+id/buttons"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_alignParentBottom="true"
             android:orientation="vertical">
 
             <LinearLayout
@@ -705,55 +22,690 @@
                 android:layout_height="wrap_content"
                 android:orientation="horizontal">
 
-                <Button
-                    android:id="@+id/viewprofile"
-                    style="@style/ButtonSmallFontStyle"
+                <TextView
                     android:layout_width="match_parent"
-                    android:layout_height="match_parent"
+                    android:layout_height="wrap_content"
                     android:layout_weight="1"
-                    android:drawableTop="@drawable/ic_danarprofile"
-                    android:paddingLeft="0dp"
-                    android:paddingRight="0dp"
-                    android:text="@string/viewprofile" />
+                    android:gravity="end"
+                    android:paddingEnd="5dp"
+                    android:text="@string/serialnumber"
+                    android:textSize="14sp"
+                    tools:ignore="RtlSymmetry" />
 
+                <TextView
+                    android:layout_width="5dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="0"
+                    android:gravity="center_horizontal"
+                    android:paddingEnd="2dp"
+                    android:paddingStart="2dp"
+                    android:text=":"
+                    android:textSize="14sp"
+                    tools:ignore="HardcodedText" />
 
-                <Button
-                    android:id="@+id/history"
-                    style="@style/ButtonSmallFontStyle"
+                <TextView
+                    android:id="@+id/serial_number"
                     android:layout_width="match_parent"
-                    android:layout_height="match_parent"
+                    android:layout_height="wrap_content"
                     android:layout_weight="1"
-                    android:drawableTop="@drawable/ic_danarhistory"
-                    android:paddingLeft="0dp"
-                    android:paddingRight="0dp"
-                    android:text="@string/pumphistory" />
+                    android:gravity="start"
+                    android:paddingStart="5dp"
+                    android:textColor="@android:color/white"
+                    android:textSize="14sp"
+                    tools:ignore="RtlSymmetry" />
 
-                <Button
-                    android:id="@+id/stats"
-                    style="@style/ButtonSmallFontStyle"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_weight="1"
-                    android:drawableTop="@drawable/ic_danarstats"
-                    android:paddingLeft="0dp"
-                    android:paddingRight="0dp"
-                    android:text="@string/stats" />
-
-                <Button
-                    android:id="@+id/user_options"
-                    style="@style/ButtonSmallFontStyle"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_weight="1"
-                    android:drawableTop="@drawable/ic_danar_useropt"
-                    android:paddingLeft="0dp"
-                    android:paddingRight="0dp"
-                    android:text="@string/danar_useroptions" />
 
             </LinearLayout>
 
+            <View
+                android:layout_width="fill_parent"
+                android:layout_height="2dip"
+                android:layout_marginBottom="5dp"
+                android:layout_marginLeft="20dp"
+                android:layout_marginRight="20dp"
+                android:layout_marginTop="5dp"
+                android:background="@color/list_delimiter" />
+
+            <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"
+                    android:gravity="end"
+                    android:paddingEnd="5dp"
+                    android:text="@string/danar_bluetooth_status"
+                    android:textSize="14sp"
+                    tools:ignore="RtlSymmetry" />
+
+                <TextView
+                    android:layout_width="5dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="0"
+                    android:gravity="center_horizontal"
+                    android:paddingEnd="2dp"
+                    android:paddingStart="2dp"
+                    android:text=":"
+                    android:textSize="14sp"
+                    tools:ignore="HardcodedText" />
+
+                <com.joanzapata.iconify.widget.IconTextView
+                    android:id="@+id/btconnection"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:gravity="start"
+                    android:paddingStart="5dp"
+                    android:text="{fa-bluetooth-b}"
+                    android:textColor="@android:color/white"
+                    android:textSize="14sp"
+                    tools:ignore="HardcodedText,RtlSymmetry" />
+
+
+            </LinearLayout>
+
+            <View
+                android:layout_width="fill_parent"
+                android:layout_height="2dip"
+                android:layout_marginBottom="5dp"
+                android:layout_marginLeft="20dp"
+                android:layout_marginRight="20dp"
+                android:layout_marginTop="5dp"
+                android:background="@color/list_delimiter" />
+
+            <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"
+                    android:gravity="end"
+                    android:paddingEnd="5dp"
+                    android:text="@string/battery_label"
+                    android:textSize="14sp"
+                    tools:ignore="RtlSymmetry" />
+
+                <TextView
+                    android:layout_width="5dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="0"
+                    android:gravity="center_horizontal"
+                    android:paddingEnd="2dp"
+                    android:paddingStart="2dp"
+                    android:text=":"
+                    android:textSize="14sp"
+                    tools:ignore="HardcodedText" />
+
+                <com.joanzapata.iconify.widget.IconTextView
+                    android:id="@+id/battery"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:gravity="start"
+                    android:paddingStart="5dp"
+                    android:textColor="@android:color/white"
+                    android:textSize="14sp"
+                    tools:ignore="RtlSymmetry" />
+
+
+            </LinearLayout>
+
+            <View
+                android:layout_width="fill_parent"
+                android:layout_height="2dip"
+                android:layout_marginBottom="5dp"
+                android:layout_marginLeft="20dp"
+                android:layout_marginRight="20dp"
+                android:layout_marginTop="5dp"
+                android:background="@color/list_delimiter" />
+
+            <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"
+                    android:gravity="end"
+                    android:paddingEnd="5dp"
+                    android:text="@string/lastconnection_label"
+                    android:textSize="14sp"
+                    tools:ignore="RtlSymmetry" />
+
+                <TextView
+                    android:layout_width="5dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="0"
+                    android:gravity="center_horizontal"
+                    android:paddingEnd="2dp"
+                    android:paddingStart="2dp"
+                    android:text=":"
+                    android:textSize="14sp"
+                    tools:ignore="HardcodedText" />
+
+                <TextView
+                    android:id="@+id/lastconnection"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:gravity="start"
+                    android:paddingStart="5dp"
+                    android:textColor="@android:color/white"
+                    android:textSize="14sp"
+                    tools:ignore="RtlSymmetry" />
+
+            </LinearLayout>
+
+            <View
+                android:layout_width="fill_parent"
+                android:layout_height="2dip"
+                android:layout_marginBottom="5dp"
+                android:layout_marginLeft="20dp"
+                android:layout_marginRight="20dp"
+                android:layout_marginTop="5dp"
+                android:background="@color/list_delimiter" />
+
+            <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"
+                    android:gravity="end"
+                    android:paddingEnd="5dp"
+                    android:text="@string/lastbolus_label"
+                    android:textSize="14sp"
+                    tools:ignore="RtlSymmetry" />
+
+                <TextView
+                    android:layout_width="5dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="0"
+                    android:gravity="center_horizontal"
+                    android:paddingEnd="2dp"
+                    android:paddingStart="2dp"
+                    android:text=":"
+                    android:textSize="14sp"
+                    tools:ignore="HardcodedText" />
+
+                <TextView
+                    android:id="@+id/lastbolus"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:gravity="start"
+                    android:paddingStart="5dp"
+                    android:textColor="@android:color/white"
+                    android:textSize="14sp"
+                    tools:ignore="RtlSymmetry" />
+
+            </LinearLayout>
+
+            <View
+                android:layout_width="fill_parent"
+                android:layout_height="2dip"
+                android:layout_marginBottom="5dp"
+                android:layout_marginLeft="20dp"
+                android:layout_marginRight="20dp"
+                android:layout_marginTop="5dp"
+                android:background="@color/list_delimiter" />
+
+            <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"
+                    android:gravity="end"
+                    android:paddingEnd="5dp"
+                    android:text="@string/dailyunits"
+                    android:textSize="14sp"
+                    tools:ignore="RtlSymmetry" />
+
+                <TextView
+                    android:layout_width="5dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="0"
+                    android:gravity="center_horizontal"
+                    android:paddingEnd="2dp"
+                    android:paddingStart="2dp"
+                    android:text=":"
+                    android:textSize="14sp"
+                    tools:ignore="HardcodedText" />
+
+                <TextView
+                    android:id="@+id/dailyunits"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:gravity="start"
+                    android:paddingStart="5dp"
+                    android:textColor="@android:color/white"
+                    android:textSize="14sp"
+                    tools:ignore="RtlSymmetry" />
+
+            </LinearLayout>
+
+            <View
+                android:layout_width="fill_parent"
+                android:layout_height="2dip"
+                android:layout_marginBottom="5dp"
+                android:layout_marginLeft="20dp"
+                android:layout_marginRight="20dp"
+                android:layout_marginTop="5dp"
+                android:background="@color/list_delimiter" />
+
+            <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"
+                    android:gravity="end"
+                    android:paddingRight="5dp"
+                    android:text="@string/basebasalrate_label"
+                    android:textSize="14sp"
+                    tools:ignore="RtlHardcoded,RtlSymmetry" />
+
+                <TextView
+                    android:layout_width="5dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="0"
+                    android:gravity="center_horizontal"
+                    android:paddingEnd="2dp"
+                    android:paddingStart="2dp"
+                    android:text=":"
+                    android:textSize="14sp"
+                    tools:ignore="HardcodedText" />
+
+                <TextView
+                    android:id="@+id/basabasalrate"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:gravity="start"
+                    android:paddingStart="5dp"
+                    android:textColor="@android:color/white"
+                    android:textSize="14sp"
+                    tools:ignore="RtlSymmetry" />
+
+            </LinearLayout>
+
+            <View
+                android:layout_width="fill_parent"
+                android:layout_height="2dip"
+                android:layout_marginBottom="5dp"
+                android:layout_marginLeft="20dp"
+                android:layout_marginRight="20dp"
+                android:layout_marginTop="5dp"
+                android:background="@color/list_delimiter" />
+
+            <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"
+                    android:gravity="end"
+                    android:paddingEnd="5dp"
+                    android:text="@string/tempbasal_label"
+                    android:textSize="14sp"
+                    tools:ignore="RtlSymmetry" />
+
+                <TextView
+                    android:layout_width="5dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="0"
+                    android:gravity="center_horizontal"
+                    android:paddingEnd="2dp"
+                    android:paddingStart="2dp"
+                    android:text=":"
+                    android:textSize="14sp"
+                    tools:ignore="HardcodedText" />
+
+                <TextView
+                    android:id="@+id/tempbasal"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:gravity="start"
+                    android:paddingStart="5dp"
+                    android:textColor="@android:color/white"
+                    android:textSize="14sp"
+                    tools:ignore="RtlSymmetry" />
+
+            </LinearLayout>
+
+            <View
+                android:layout_width="fill_parent"
+                android:layout_height="2dip"
+                android:layout_marginBottom="5dp"
+                android:layout_marginLeft="20dp"
+                android:layout_marginRight="20dp"
+                android:layout_marginTop="5dp"
+                android:background="@color/list_delimiter" />
+
+            <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"
+                    android:gravity="end"
+                    android:paddingEnd="5dp"
+                    android:text="@string/virtualpump_extendedbolus_label"
+                    android:textSize="14sp"
+                    tools:ignore="RtlSymmetry" />
+
+                <TextView
+                    android:layout_width="5dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="0"
+                    android:gravity="center_horizontal"
+                    android:paddingEnd="2dp"
+                    android:paddingStart="2dp"
+                    android:text=":"
+                    android:textSize="14sp"
+                    tools:ignore="HardcodedText" />
+
+                <TextView
+                    android:id="@+id/extendedbolus"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:gravity="start"
+                    android:paddingStart="5dp"
+                    android:textColor="@android:color/white"
+                    android:textSize="14sp"
+                    tools:ignore="RtlSymmetry" />
+
+            </LinearLayout>
+
+            <View
+                android:layout_width="fill_parent"
+                android:layout_height="2dip"
+                android:layout_marginBottom="5dp"
+                android:layout_marginLeft="20dp"
+                android:layout_marginRight="20dp"
+                android:layout_marginTop="5dp"
+                android:background="@color/list_delimiter" />
+
+            <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"
+                    android:gravity="end"
+                    android:paddingEnd="5dp"
+                    android:text="@string/reservoir_label"
+                    android:textSize="14sp"
+                    tools:ignore="RtlSymmetry" />
+
+                <TextView
+                    android:layout_width="5dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="0"
+                    android:gravity="center_horizontal"
+                    android:paddingEnd="2dp"
+                    android:paddingStart="2dp"
+                    android:text=":"
+                    android:textSize="14sp"
+                    tools:ignore="HardcodedText" />
+
+                <TextView
+                    android:id="@+id/reservoir"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:gravity="start"
+                    android:paddingStart="5dp"
+                    android:textColor="@android:color/white"
+                    android:textSize="14sp"
+                    tools:ignore="RtlSymmetry" />
+
+            </LinearLayout>
+
+            <View
+                android:layout_width="fill_parent"
+                android:layout_height="2dip"
+                android:layout_marginBottom="5dp"
+                android:layout_marginLeft="20dp"
+                android:layout_marginRight="20dp"
+                android:layout_marginTop="5dp"
+                android:background="@color/list_delimiter" />
+
+            <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"
+                    android:gravity="end"
+                    android:paddingEnd="5dp"
+                    android:text="@string/basal_bolus_step"
+                    android:textSize="14sp"
+                    tools:ignore="RtlSymmetry" />
+
+                <TextView
+                    android:layout_width="5dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="0"
+                    android:gravity="center_horizontal"
+                    android:paddingEnd="2dp"
+                    android:paddingStart="2dp"
+                    android:text=":"
+                    android:textSize="14sp"
+                    tools:ignore="HardcodedText" />
+
+                <TextView
+                    android:id="@+id/basal_bolus_step"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:gravity="start"
+                    android:paddingStart="5dp"
+                    android:textColor="@android:color/white"
+                    android:textSize="14sp"
+                    tools:ignore="RtlSymmetry" />
+
+            </LinearLayout>
+
+            <View
+                android:layout_width="fill_parent"
+                android:layout_height="2dip"
+                android:layout_marginBottom="5dp"
+                android:layout_marginLeft="20dp"
+                android:layout_marginRight="20dp"
+                android:layout_marginTop="5dp"
+                android:background="@color/list_delimiter" />
+
+            <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"
+                    android:gravity="end"
+                    android:paddingEnd="5dp"
+                    android:text="@string/virtualpump_firmware_label"
+                    android:textSize="14sp"
+                    tools:ignore="RtlSymmetry" />
+
+                <TextView
+                    android:layout_width="5dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="0"
+                    android:gravity="center_horizontal"
+                    android:paddingEnd="2dp"
+                    android:paddingStart="2dp"
+                    android:text=":"
+                    android:textSize="14sp"
+                    tools:ignore="HardcodedText" />
+
+                <TextView
+                    android:id="@+id/firmware"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:gravity="start"
+                    android:paddingStart="5dp"
+                    android:textColor="@android:color/white"
+                    android:textSize="14sp"
+                    tools:ignore="RtlSymmetry" />
+
+            </LinearLayout>
+
+            <View
+                android:layout_width="fill_parent"
+                android:layout_height="2dip"
+                android:layout_marginBottom="5dp"
+                android:layout_marginLeft="20dp"
+                android:layout_marginRight="20dp"
+                android:layout_marginTop="5dp"
+                android:background="@color/list_delimiter" />
+
+            <ImageView
+                android:id="@+id/dana_icon"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:drawableTop="@drawable/ic_dana_rs"
+                android:paddingTop="10dp"
+                android:contentDescription="@string/pump_icon" />
+
         </LinearLayout>
 
-    </RelativeLayout>
+    </ScrollView>
 
-</FrameLayout>
+    <LinearLayout
+        android:id="@+id/pump_status_layout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:paddingTop="2dp"
+        android:paddingBottom="2dp"
+        android:visibility="visible">
+
+        <TextView
+            android:id="@+id/pump_status"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingTop="6dp"
+            android:paddingBottom="6dp"
+            android:layout_marginLeft="5dp"
+            android:layout_marginRight="5dp"
+            android:background="@color/pumpStatusBackground"
+            android:gravity="center_vertical|center_horizontal"
+            android:textAppearance="?android:attr/textAppearanceSmall" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/queue_status_layout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:paddingTop="2dp"
+        android:paddingBottom="2dp"
+        android:visibility="visible">
+
+        <TextView
+            android:id="@+id/queue"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingTop="6dp"
+            android:paddingBottom="6dp"
+            android:layout_marginLeft="5dp"
+            android:layout_marginRight="5dp"
+            android:background="@color/pumpStatusBackground"
+            android:gravity="center_vertical|center_horizontal"
+            android:textAppearance="?android:attr/textAppearanceSmall" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/buttons"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal">
+
+        <Button
+            android:id="@+id/view_profile"
+            style="@style/ButtonSmallFontStyle"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_weight="1"
+            android:drawableTop="@drawable/ic_danarprofile"
+            android:paddingLeft="0dp"
+            android:paddingRight="0dp"
+            android:text="@string/viewprofile" />
+
+
+        <Button
+            android:id="@+id/history"
+            style="@style/ButtonSmallFontStyle"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_weight="1"
+            android:drawableTop="@drawable/ic_pump_history"
+            android:paddingLeft="0dp"
+            android:paddingRight="0dp"
+            android:text="@string/pumphistory"
+            tools:ignore="TooManyViews" />
+
+        <Button
+            android:id="@+id/stats"
+            style="@style/ButtonSmallFontStyle"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_weight="1"
+            android:drawableTop="@drawable/ic_danarstats"
+            android:paddingLeft="0dp"
+            android:paddingRight="0dp"
+            android:text="@string/stats" />
+
+        <Button
+            android:id="@+id/user_options"
+            style="@style/ButtonSmallFontStyle"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_weight="1"
+            android:drawableTop="@drawable/ic_danar_useropt"
+            android:paddingLeft="0dp"
+            android:paddingRight="0dp"
+            android:text="@string/danar_useroptions" />
+
+    </LinearLayout>
+
+</LinearLayout>
diff --git a/dana/src/main/res/layout/danar_history_activity.xml b/dana/src/main/res/layout/danar_history_activity.xml
index f49c841bb9..4ba5e3c7d1 100644
--- a/dana/src/main/res/layout/danar_history_activity.xml
+++ b/dana/src/main/res/layout/danar_history_activity.xml
@@ -28,7 +28,7 @@
             android:contentDescription="@string/pumphistory"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
-            app:srcCompat="@drawable/ic_danarhistory" />
+            app:srcCompat="@drawable/ic_pump_history" />
 
         <TextView
             android:id="@+id/textView2"
diff --git a/dana/src/main/res/values-bg-rBG/strings.xml b/dana/src/main/res/values-bg-rBG/strings.xml
index 1ceaefd2d5..a596f0301f 100644
--- a/dana/src/main/res/values-bg-rBG/strings.xml
+++ b/dana/src/main/res/values-bg-rBG/strings.xml
@@ -5,9 +5,7 @@
     <string name="danars_pairingok">Сдвояване - ОК</string>
     <string name="danars_pairingtimedout">Времето за сдвояване изтече</string>
     <string name="danars_waitingforpairing">Очаква сдвояване с помпа</string>
-    <string name="danarspump">DanaRS</string>
     <string name="danarspump_shortname">Dana</string>
-    <string name="description_pump_dana_rs">Поддръжка за Dana Diabecare RS помпи</string>
     <string name="maxbolusviolation">Превишавате макс болус</string>
     <string name="commanderror">Грешка при команда</string>
     <string name="speederror">Скорост грешка</string>
diff --git a/dana/src/main/res/values-cs-rCZ/strings.xml b/dana/src/main/res/values-cs-rCZ/strings.xml
index 361e3481e3..db9f8376e1 100644
--- a/dana/src/main/res/values-cs-rCZ/strings.xml
+++ b/dana/src/main/res/values-cs-rCZ/strings.xml
@@ -5,9 +5,9 @@
     <string name="danars_pairingok">Spárováno</string>
     <string name="danars_pairingtimedout">Vypršel časový limit pro párování</string>
     <string name="danars_waitingforpairing">Čekání na spárování na pumpě</string>
-    <string name="danarspump">DanaRS</string>
+    <string name="danarspump">Dana-i/RS</string>
     <string name="danarspump_shortname">Dana</string>
-    <string name="description_pump_dana_rs">Ovladač pumpy pro DanaRS</string>
+    <string name="description_pump_dana_rs">Integrace pumpy pro pumpy DANA Diabecare RS a Dana-i</string>
     <string name="maxbolusviolation">Překročen maximální bolus</string>
     <string name="commanderror">Chyba příkazu</string>
     <string name="speederror">Chyba rychlosti</string>
diff --git a/dana/src/main/res/values-de-rDE/strings.xml b/dana/src/main/res/values-de-rDE/strings.xml
index c5e08393d1..07b1afd24a 100644
--- a/dana/src/main/res/values-de-rDE/strings.xml
+++ b/dana/src/main/res/values-de-rDE/strings.xml
@@ -5,9 +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">DanaRS</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 Pumpen</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/dana/src/main/res/values-es-rES/strings.xml b/dana/src/main/res/values-es-rES/strings.xml
index 339163c3af..4fb7cb20b5 100644
--- a/dana/src/main/res/values-es-rES/strings.xml
+++ b/dana/src/main/res/values-es-rES/strings.xml
@@ -5,9 +5,7 @@
     <string name="danars_pairingok">Conexión OK</string>
     <string name="danars_pairingtimedout">Tiempo de Vinculación agotado</string>
     <string name="danars_waitingforpairing">Esperando para conectar con bomba</string>
-    <string name="danarspump">DanaRS</string>
     <string name="danarspump_shortname">Dana</string>
-    <string name="description_pump_dana_rs">Integración de bombas de insulina de DANA Diabecare RS</string>
     <string name="maxbolusviolation">Violación de bolo Max</string>
     <string name="commanderror">Error de comando</string>
     <string name="speederror">Error de velocidad</string>
diff --git a/dana/src/main/res/values-fr-rFR/strings.xml b/dana/src/main/res/values-fr-rFR/strings.xml
index 594074b7a3..32225ac81d 100644
--- a/dana/src/main/res/values-fr-rFR/strings.xml
+++ b/dana/src/main/res/values-fr-rFR/strings.xml
@@ -5,9 +5,9 @@
     <string name="danars_pairingok">Appairage OK</string>
     <string name="danars_pairingtimedout">Délai d\'appairage expiré</string>
     <string name="danars_waitingforpairing">Attente appairage pompe</string>
-    <string name="danarspump">DanaRS</string>
+    <string name="danarspump">Dana-i/RS</string>
     <string name="danarspump_shortname">Dana</string>
-    <string name="description_pump_dana_rs">Intégration des pompes Diabecare DANA RS</string>
+    <string name="description_pump_dana_rs">Intégration des pompes DANA Diabecare RS et Dana-i</string>
     <string name="maxbolusviolation">Violation bolus Max</string>
     <string name="commanderror">Erreur de commande</string>
     <string name="speederror">Erreur de vitesse</string>
@@ -43,7 +43,7 @@
     <string name="gettingpumpsettings">Obtenir les paramètres pompe</string>
     <string name="gettingpumptime">Obtenir l\'heure de la pompe</string>
     <string name="largetimedifftitle">Différence horaire importante</string>
-    <string name="largetimediff">Différence horaire importante:\nL\'heure de la pompe est en écart de plus d\'une heure et demi.\nMerci d\'ajuster manuellement l\'heure de la pompe et assurez-vous que la lecture de l\'historique de la pompe ne cause pas de dysfonctionnements.\nSi possible, effacez l\'historique de la pompe avant de modifier l\'heure ou désactivez la Boucle Fermée pour une DAI après la dernière entrée erronée de l\'historique et au minimum une DAI à partir de maintenant.</string>
+    <string name="largetimediff">Différence horaire importante:\nL\'heure de la pompe est en écart de plus d\'une heure et demi.\nVeuillez ajuster manuellement l\'heure de la pompe et assurez-vous que la lecture de l\'historique de la pompe ne cause pas de dysfonctionnements.\nSi possible, effacez l\'historique de la pompe avant de modifier l\'heure ou désactivez la Boucle Fermée pour une DAI après la dernière entrée erronée de l\'historique et au minimum une DAI à partir de maintenant.</string>
     <string name="pairfirst">Veuillez appairer votre pompe avec votre téléphone !</string>
     <string name="approachingdailylimit">Limite quotidienne d\'insuline proche</string>
     <string name="startingbolus">Injection du bolus démarrée</string>
diff --git a/dana/src/main/res/values-ga-rIE/strings.xml b/dana/src/main/res/values-ga-rIE/strings.xml
index ce947313a9..f0b71ab591 100644
--- a/dana/src/main/res/values-ga-rIE/strings.xml
+++ b/dana/src/main/res/values-ga-rIE/strings.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="danarspump">DanaRS</string>
     <string name="danarspump_shortname">Dana</string>
     <string name="overview_bolusprogress_delivered">Seachadta</string>
     <string name="overview_bolusprogress_stoped">Stopadh</string>
diff --git a/dana/src/main/res/values-it-rIT/strings.xml b/dana/src/main/res/values-it-rIT/strings.xml
index 5b05608057..391ef93c0b 100644
--- a/dana/src/main/res/values-it-rIT/strings.xml
+++ b/dana/src/main/res/values-it-rIT/strings.xml
@@ -5,9 +5,9 @@
     <string name="danars_pairingok">Associazione OK</string>
     <string name="danars_pairingtimedout">Time out associazione</string>
     <string name="danars_waitingforpairing">In attesa di associare il micro</string>
-    <string name="danarspump">DanaRS</string>
+    <string name="danarspump">Dana-i/RS</string>
     <string name="danarspump_shortname">Dana</string>
-    <string name="description_pump_dana_rs">Integrazione del microinfusore DANA Diabecare RS</string>
+    <string name="description_pump_dana_rs">Integrazione del microinfusore DANA Diabecare RS / Dana-i</string>
     <string name="maxbolusviolation">Violazione bolo massimo</string>
     <string name="commanderror">Errore comando</string>
     <string name="speederror">Errore velocità</string>
diff --git a/dana/src/main/res/values-iw-rIL/strings.xml b/dana/src/main/res/values-iw-rIL/strings.xml
index 7b8eec8d21..b88fd60ebd 100644
--- a/dana/src/main/res/values-iw-rIL/strings.xml
+++ b/dana/src/main/res/values-iw-rIL/strings.xml
@@ -5,9 +5,9 @@
     <string name="danars_pairingok">הצימוד הצליח</string>
     <string name="danars_pairingtimedout">הצימוד חרג ממגבלת הזמן</string>
     <string name="danars_waitingforpairing">מחכה לצימוד עם משאבה</string>
-    <string name="danarspump">DanaRS</string>
+    <string name="danarspump">Dana-i / RS</string>
     <string name="danarspump_shortname">Dana</string>
-    <string name="description_pump_dana_rs">חיבור משאבת DANA Diabecare RS</string>
+    <string name="description_pump_dana_rs">חיבור משאבות DANA RS/i</string>
     <string name="maxbolusviolation">בולוס גבוה מדי</string>
     <string name="commanderror">שגיאת פקודה</string>
     <string name="speederror">שגיאת מהירות</string>
diff --git a/dana/src/main/res/values-ko-rKR/strings.xml b/dana/src/main/res/values-ko-rKR/strings.xml
index 3ea04e700d..fe2f46276b 100644
--- a/dana/src/main/res/values-ko-rKR/strings.xml
+++ b/dana/src/main/res/values-ko-rKR/strings.xml
@@ -1,2 +1,118 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
+<resources>
+    <string name="danars_pairing">동기화</string>
+    <string name="danars_nodeviceavailable">현재까지 발견된 기기가 없습니다.</string>
+    <string name="danars_pairingok">연동완료</string>
+    <string name="danars_pairingtimedout">연동시간초과</string>
+    <string name="danars_waitingforpairing">펌프연동 대기중</string>
+    <string name="danarspump_shortname">Dana</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="danar_valuenotsetproperly">값이 제대로 설정되지 않았습니다</string>
+    <string name="danar_setbasalstep001">Basal 단위를 0.01 U/h로 설정하세요</string>
+    <string name="resetpairing">페어링 정보를 다시 설정하시겠습니까?</string>
+    <string name="dana_model">%1$s\n모델: %2$02X\n 프로토콜: %3$02X\n 코드: %4$02X</string>
+    <string name="processinghistory">이벤트 처리중</string>
+    <string name="danar_enableextendedbolus">펌프에서 확장Bolus를 활성화 하세요</string>
+    <string name="overview_bolusprogress_delivered">주입됨</string>
+    <string name="overview_bolusprogress_stoped">정지됨</string>
+    <string name="unsupportedfirmware">지원되지 않는 펌프 펌웨어</string>
+    <string name="pumperror">펌프 에러</string>
+    <string name="lowbattery">배터리 부족</string>
+    <string name="basalcompare">사전 설정된 Basal양보다 적게 주입</string>
+    <string name="pumpshutdown">펌프 종료</string>
+    <string name="batterydischarged">펌프배터리 방전</string>
+    <string name="occlusion">막힘</string>
+    <string name="emptyreservoir">빈 주사기</string>
+    <string name="checkshaft">샤프트를 확인하세요.</string>
+    <string name="basalmax">최대 Basal</string>
+    <string name="dailymax">일일 최대</string>
+    <string name="bloodsugarmeasurementalert">혈당측정알람</string>
+    <string name="remaininsulinalert">남은 인슐린 양</string>
+    <string name="missedbolus">놓친 Bolus</string>
+    <string name="invalidpairing">잘못된 페어링 정보입니다. 새로운 페어링을 요청합니다.</string>
+    <string name="gettingpumpstatus">펌프 상태 가져오는중</string>
+    <string name="gettingextendedbolusstatus">확장Bolus 상태 가져오는중</string>
+    <string name="gettingbolusstatus">Bolus 상태 가져오는중</string>
+    <string name="gettingtempbasalstatus">임시Basal 상태 가져오는중</string>
+    <string name="gettingpumpsettings">펌프설정 가져오는중</string>
+    <string name="gettingpumptime">펌프시간 가져오는중</string>
+    <string name="largetimedifftitle">큰 시간 차이</string>
+    <string name="largetimediff">큰 시간 차이:\n펌프의 시간과 1.5시간 이상 차이가 납니다.\n펌프의 이력에서 잘못된 시간을 읽어들임으로써 예상치 못한 행동이 발생하지 않도록 펌프의 시간을 수동으로 변경하세요.\n가능하면 시간을 변경하기 전에 펌프의 이력을 삭제하거나, 설정된 DIA 시간동안 Closed Loop를 비활성화 하세요.</string>
+    <string name="pairfirst">펌프를 폰과 동기화 하십시오</string>
+    <string name="approachingdailylimit">인슐린 일 허용량에 근접중</string>
+    <string name="startingbolus">Bolus 주입을 시작합니다.</string>
+    <string name="waitingforestimatedbolusend">Bolus 종료를 기다리고 있습니다. %d초 남았습니다.</string>
+    <string name="stoppingtempbasal">임시Basal 취소중</string>
+    <string name="settingextendedbolus">확장Bolus 설정중</string>
+    <string name="stoppingextendedbolus">확장Bolus 취소중</string>
+    <string name="updatingbasalrates">Basal양 업데이트중</string>
+    <string name="settingtempbasal">임시Basal 설정중</string>
+    <string name="waitingfortimesynchronization">시간 동기화 대기중 (%1$d 초)</string>
+    <string name="wrongpumppassword">펌프 비밀번호가 잘못되었습니다!</string>
+    <string name="danar_history_alarm">알람</string>
+    <string name="danar_history_basalhours">Basal 시간</string>
+    <string name="danar_history_bolus">Boluses</string>
+    <string name="danar_history_carbohydrates">탄수화물</string>
+    <string name="danar_history_dailyinsulin">일일 인슐린</string>
+    <string name="danar_history_errors">에러</string>
+    <string name="danar_history_glucose">혈당</string>
+    <string name="danar_history_refill">교체</string>
+    <string name="danar_history_syspend">중지</string>
+    <string name="danar_history_prime">교체</string>
+    <string name="danar_useroptions">사용자 옵션</string>
+    <string name="danar_timedisplay">시간형식</string>
+    <string name="danar_buttonscroll">버튼 스크롤</string>
+    <string name="danar_beep">버튼 누르면 소리가 납니다.</string>
+    <string name="danar_pumpalarm">알람</string>
+    <string name="danar_pumpalarm_sound">소리</string>
+    <string name="danar_pumpalarm_vibrate">진동</string>
+    <string name="danar_pumpalarm_both">모두</string>
+    <string name="danar_screentimeout">LCD 시간 [seconds]</string>
+    <string name="danar_backlight">화면조명 시간 [seconds]</string>
+    <string name="danar_glucoseunits">혈당 단위</string>
+    <string name="danar_shutdown">종료 [hours]</string>
+    <string name="danar_lowreservoir">낮은 주사기량 [Units]</string>
+    <string name="danar_saveuseroptions">펌프로 옵션 저장</string>
+    <string name="description_pump_dana_r">다나R 펌프와 연동(다나 RN)</string>
+    <string name="description_pump_dana_r_korean">내수용 다나R 펌프와 연동(다나 R)</string>
+    <string name="description_pump_dana_r_v2">업그레이드 펌웨어가 설치된 다나R 펌프와 연동</string>
+    <string name="danarpump_shortname">DANA</string>
+    <string name="nobtadapter">블루투스 어댑터를 찾지 못했습니다</string>
+    <string name="devicenotfound">선택된 기기를 찾지 못했습니다</string>
+    <string name="danar_switchtouhmode">펌프에서 U/d에서 U/h로 모드를 변경하세요</string>
+    <string name="danarkoreanpump">다나R 한글</string>
+    <string name="danarpump">다나R</string>
+    <string name="pumpdrivercorrected">펌프 드라이버가 수정되었습니다.</string>
+    <string name="danarv2pump">다나R v2</string>
+    <string name="danar_disableeasymode">펌프에서 이지모드(EasyUI)를 해제하세요</string>
+    <string name="profile_set_failed">Basal 프로파일 설정이 실패하였습니다</string>
+    <string name="danar_bluetooth_status">블루투스 상태</string>
+    <string name="danar_iob_label">펌프 IOB</string>
+    <string name="basal_step">Basal 단위</string>
+    <string name="bolus_step">Bolus 단위</string>
+    <string name="virtualpump_firmware_label">펌웨어</string>
+    <string name="danar_pump_settings">다나 펌프 설정</string>
+    <string name="timeformat12h">12h</string>
+    <string name="timeformat24h">24h</string>
+    <string name="option_on">켜짐</string>
+    <string name="option_off">꺼짐</string>
+    <string name="danar_bt_name_title">다나R 블루투스</string>
+    <string name="danars_password_title">펌프 비밀번호 (v1 전용)</string>
+    <string name="danar_password_title">펌프 비밀번호</string>
+    <string name="danar_useextended_title">200%%이상 주입 위해 확장 Bolus 사용</string>
+    <string name="bolusspeed">Bolus 속도</string>
+    <string name="selectedpump">선택된 펌프</string>
+    <string name="rs_loginsulinchange_title">주사기 교체 기록</string>
+    <string name="rs_loginsulinchange_summary">히스토리에서 발견될 때 \"인슐린 교체\"를 실행에서 입력</string>
+    <string name="rs_logcanulachange_title">Canula 변경 기록</string>
+    <string name="rs_logcanulachange_summary">히스토리에서 발견될 때 \"인슐린 교체\"를 실행에서 입력</string>
+    <string name="pin1">PIN1</string>
+    <string name="pin2">PIN2</string>
+    <string name="press_ok_on_the_pump">펌프\n에 있는 OK을 누르고 2개의 표시된 번호\n를 입력하는 동안 빼기 버튼을 눌러 화면이 꺼지지 않게 합니다.</string>
+    <string name="num1pin">1: (12자리)</string>
+    <string name="num2pin">2: (8자리)</string>
+</resources>
diff --git a/dana/src/main/res/values-lt-rLT/strings.xml b/dana/src/main/res/values-lt-rLT/strings.xml
index 7b7cff4c36..bba0bf0739 100644
--- a/dana/src/main/res/values-lt-rLT/strings.xml
+++ b/dana/src/main/res/values-lt-rLT/strings.xml
@@ -5,9 +5,7 @@
     <string name="danars_pairingok">Sujungta</string>
     <string name="danars_pairingtimedout">Sujungimui skirtas laikas baigėsi</string>
     <string name="danars_waitingforpairing">Laukiama ryšio su pompa</string>
-    <string name="danarspump">DanaRS</string>
     <string name="danarspump_shortname">Dana</string>
-    <string name="description_pump_dana_rs">DANA Diabecare RS pompos integracija</string>
     <string name="maxbolusviolation">Pažeistas maks boluso limitas</string>
     <string name="commanderror">Komandos klaida</string>
     <string name="speederror">Greičio klaida</string>
diff --git a/dana/src/main/res/values-nl-rNL/strings.xml b/dana/src/main/res/values-nl-rNL/strings.xml
index df2929c3be..569c798f32 100644
--- a/dana/src/main/res/values-nl-rNL/strings.xml
+++ b/dana/src/main/res/values-nl-rNL/strings.xml
@@ -5,9 +5,7 @@
     <string name="danars_pairingok">Koppeling geslaagd</string>
     <string name="danars_pairingtimedout">Koppeling verlopen</string>
     <string name="danars_waitingforpairing">Wachten op koppelen van de pomp</string>
-    <string name="danarspump">DanaRS</string>
     <string name="danarspump_shortname">Dana</string>
-    <string name="description_pump_dana_rs">Pomp integratie voor DANA Diabecare RS pompen</string>
     <string name="maxbolusviolation">Max bolus overschrijding</string>
     <string name="commanderror">Opdracht fout</string>
     <string name="speederror">Snelheid fout</string>
diff --git a/dana/src/main/res/values-no-rNO/strings.xml b/dana/src/main/res/values-no-rNO/strings.xml
index 68eae498e7..890601835f 100644
--- a/dana/src/main/res/values-no-rNO/strings.xml
+++ b/dana/src/main/res/values-no-rNO/strings.xml
@@ -5,9 +5,9 @@
     <string name="danars_pairingok">Sammenkobling OK</string>
     <string name="danars_pairingtimedout">Sammenkobling ble tidsavbrutt</string>
     <string name="danars_waitingforpairing">Venter på sammenkobling med pumpen</string>
-    <string name="danarspump">DanaRS</string>
+    <string name="danarspump">Dana-i/RS</string>
     <string name="danarspump_shortname">Dana</string>
-    <string name="description_pump_dana_rs">Pumpeintegrasjon for DANA Diabecare RS-pumper</string>
+    <string name="description_pump_dana_rs">Pumpeintegrasjon for DANA Diabecare RS og Dana-i-pumper</string>
     <string name="maxbolusviolation">Max bolus nådd</string>
     <string name="commanderror">Kommando feil</string>
     <string name="speederror">Hastighetsfeil</string>
diff --git a/dana/src/main/res/values-pl-rPL/strings.xml b/dana/src/main/res/values-pl-rPL/strings.xml
index ed482281aa..5707c254bc 100644
--- a/dana/src/main/res/values-pl-rPL/strings.xml
+++ b/dana/src/main/res/values-pl-rPL/strings.xml
@@ -5,9 +5,7 @@
     <string name="danars_pairingok">Parowanie OK</string>
     <string name="danars_pairingtimedout">Przekroczono limit czasu parowania</string>
     <string name="danars_waitingforpairing">Oczekiwanie na pompę na sparowanie</string>
-    <string name="danarspump">DanaRS</string>
     <string name="danarspump_shortname">Dana</string>
-    <string name="description_pump_dana_rs">Integracja z pompą DANA RS Diabecare</string>
     <string name="maxbolusviolation">Przekroczenie ograniczenia maks. bolusa</string>
     <string name="commanderror">Błąd polecenia</string>
     <string name="speederror">Błąd prędkości</string>
diff --git a/dana/src/main/res/values-pt-rBR/strings.xml b/dana/src/main/res/values-pt-rBR/strings.xml
index b04ab3927e..c724f54764 100644
--- a/dana/src/main/res/values-pt-rBR/strings.xml
+++ b/dana/src/main/res/values-pt-rBR/strings.xml
@@ -5,9 +5,7 @@
     <string name="danars_pairingok">Emparelhamento OK</string>
     <string name="danars_pairingtimedout">Tempo emparelhamento excedido</string>
     <string name="danars_waitingforpairing">Aguardando emparelhamento na bomba</string>
-    <string name="danarspump">DanaRS</string>
     <string name="danarspump_shortname">Dana</string>
-    <string name="description_pump_dana_rs">Integração para bombas DANA Diabecare RS</string>
     <string name="maxbolusviolation">Transgressão Bólus máx</string>
     <string name="commanderror">Erro no comando</string>
     <string name="speederror">Erro velocidade</string>
diff --git a/dana/src/main/res/values-pt-rPT/strings.xml b/dana/src/main/res/values-pt-rPT/strings.xml
index 2a81cb1aaa..d2d57ec978 100644
--- a/dana/src/main/res/values-pt-rPT/strings.xml
+++ b/dana/src/main/res/values-pt-rPT/strings.xml
@@ -5,9 +5,7 @@
     <string name="danars_pairingok">Emparelhamento OK</string>
     <string name="danars_pairingtimedout">Tempo emparelhamento excedido</string>
     <string name="danars_waitingforpairing">Aguardando emparelhamento na bomba</string>
-    <string name="danarspump">DanaRS</string>
     <string name="danarspump_shortname">Dana</string>
-    <string name="description_pump_dana_rs">Integração para bombas DANA Diabecare RS</string>
     <string name="maxbolusviolation">Transgressão Bólus máx</string>
     <string name="commanderror">Erro no comando</string>
     <string name="speederror">Erro velocidade</string>
diff --git a/dana/src/main/res/values-ro-rRO/strings.xml b/dana/src/main/res/values-ro-rRO/strings.xml
index 5eff31516d..b046a04a58 100644
--- a/dana/src/main/res/values-ro-rRO/strings.xml
+++ b/dana/src/main/res/values-ro-rRO/strings.xml
@@ -5,9 +5,7 @@
     <string name="danars_pairingok">Conectare OK</string>
     <string name="danars_pairingtimedout">Conectare nereușită</string>
     <string name="danars_waitingforpairing">Se așteaptă conectarea la pompă</string>
-    <string name="danarspump">DanaRS</string>
     <string name="danarspump_shortname">Dana</string>
-    <string name="description_pump_dana_rs">Integrare cu pompele DANA Diabcare RS</string>
     <string name="maxbolusviolation">Încălcare a valorii maxime a bolusului</string>
     <string name="commanderror">Eroare de comandă</string>
     <string name="speederror">Eroare de viteză</string>
diff --git a/dana/src/main/res/values-ru-rRU/strings.xml b/dana/src/main/res/values-ru-rRU/strings.xml
index 088b022f44..4cc37c7318 100644
--- a/dana/src/main/res/values-ru-rRU/strings.xml
+++ b/dana/src/main/res/values-ru-rRU/strings.xml
@@ -5,9 +5,9 @@
     <string name="danars_pairingok">Соединение OK</string>
     <string name="danars_pairingtimedout">Истекло время ожидания соединения</string>
     <string name="danars_waitingforpairing">Ожидание соединения на помпе</string>
-    <string name="danarspump">DanaRS</string>
+    <string name="danarspump">Dana-i/RS</string>
     <string name="danarspump_shortname">Dana</string>
-    <string name="description_pump_dana_rs">Интеграция с помпой DANA Diabetcare RS</string>
+    <string name="description_pump_dana_rs">Интеграция с помпами DANA Diabecare RS и Dana-i</string>
     <string name="maxbolusviolation">Нарушение макс болюса</string>
     <string name="commanderror">Ошибка в команде</string>
     <string name="speederror">Ошибка в скорости</string>
diff --git a/dana/src/main/res/values-sk-rSK/strings.xml b/dana/src/main/res/values-sk-rSK/strings.xml
index 63358e908d..953e931dcc 100644
--- a/dana/src/main/res/values-sk-rSK/strings.xml
+++ b/dana/src/main/res/values-sk-rSK/strings.xml
@@ -5,9 +5,9 @@
     <string name="danars_pairingok">Spárované</string>
     <string name="danars_pairingtimedout">Vypršal časový limit pre párovanie</string>
     <string name="danars_waitingforpairing">Čakanie na párovanie na pumpe</string>
-    <string name="danarspump">DanaRS</string>
+    <string name="danarspump">Dana-i/RS</string>
     <string name="danarspump_shortname">Dana</string>
-    <string name="description_pump_dana_rs">Ovládač pumpy pre Dana Diabecare RS</string>
+    <string name="description_pump_dana_rs">Integrácia pumpy pre pumpy DANA Diabecare RS a Dana-i</string>
     <string name="maxbolusviolation">Prekročený maximálny bolus</string>
     <string name="commanderror">Chyba príkazu</string>
     <string name="speederror">Chyba rýchlosti</string>
diff --git a/dana/src/main/res/values-sv-rSE/strings.xml b/dana/src/main/res/values-sv-rSE/strings.xml
index efd385d39e..7780b8b1b3 100644
--- a/dana/src/main/res/values-sv-rSE/strings.xml
+++ b/dana/src/main/res/values-sv-rSE/strings.xml
@@ -5,9 +5,9 @@
     <string name="danars_pairingok">Parkopplingen klar</string>
     <string name="danars_pairingtimedout">Parkopplingen tog för lång tid</string>
     <string name="danars_waitingforpairing">Väntar på parkoppling med pump</string>
-    <string name="danarspump">Dana RS</string>
+    <string name="danarspump">Dana-i/RS</string>
     <string name="danarspump_shortname">Dana</string>
-    <string name="description_pump_dana_rs">Pumpintegration för DANA Diabecare RS</string>
+    <string name="description_pump_dana_rs">Pumpintegration för DANA Diabecare RS och Dana-i-pumpar</string>
     <string name="maxbolusviolation">Max bolus nådd</string>
     <string name="commanderror">Kommandofel</string>
     <string name="speederror">Felaktig hastighet</string>
diff --git a/dana/src/main/res/values/strings.xml b/dana/src/main/res/values/strings.xml
index 131e23c744..da88761671 100644
--- a/dana/src/main/res/values/strings.xml
+++ b/dana/src/main/res/values/strings.xml
@@ -19,9 +19,9 @@
     <string name="danars_pairingok">Pairing OK</string>
     <string name="danars_pairingtimedout">Pairing timed out</string>
     <string name="danars_waitingforpairing">Waiting for pairing on pump</string>
-    <string name="danarspump">DanaRS</string>
+    <string name="danarspump">Dana-i/RS</string>
     <string name="danarspump_shortname">Dana</string>
-    <string name="description_pump_dana_rs">Pump integration for DANA Diabecare RS pumps</string>
+    <string name="description_pump_dana_rs">Pump integration for DANA Diabecare RS and Dana-i pumps</string>
     <string name="maxbolusviolation">Max bolus violation</string>
     <string name="commanderror">Command error</string>
     <string name="speederror">Speed error</string>
@@ -108,8 +108,6 @@
     <string name="profile_set_failed">Setting of basal profile failed</string>
     <string name="danar_bluetooth_status">Bluetooth status</string>
     <string name="danar_iob_label">Pump IOB</string>
-    <string name="basal_step">Basal Step</string>
-    <string name="bolus_step">Bolus Step</string>
     <string name="virtualpump_firmware_label">Firmware</string>
     <string name="danar_pump_settings">Dana pump settings</string>
     <string name="timeformat12h">12h</string>
@@ -131,5 +129,6 @@
     <string name="press_ok_on_the_pump">Press OK on the pump\nand enter 2 displayed numbers\nKeep display on pump ON by pressing minus button until you finish entering code.</string>
     <string name="num1pin">1: (12 digits)</string>
     <string name="num2pin">2: (8 digits)</string>
+    <string name="basal_bolus_step">Basal/bolus step</string>
 
 </resources>
diff --git a/dana/src/test/java/info/nightscout/androidaps/TestBaseWithProfile.kt b/dana/src/test/java/info/nightscout/androidaps/TestBaseWithProfile.kt
index 8b145c52a4..bd213d3c8e 100644
--- a/dana/src/test/java/info/nightscout/androidaps/TestBaseWithProfile.kt
+++ b/dana/src/test/java/info/nightscout/androidaps/TestBaseWithProfile.kt
@@ -4,7 +4,11 @@ import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.data.ProfileSealed
 import info.nightscout.androidaps.extensions.pureProfileFromJson
-import info.nightscout.androidaps.interfaces.*
+import info.nightscout.androidaps.interfaces.ActivePlugin
+import info.nightscout.androidaps.interfaces.Config
+import info.nightscout.androidaps.interfaces.Profile
+import info.nightscout.androidaps.interfaces.ProfileFunction
+import info.nightscout.androidaps.interfaces.ProfileStore
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.utils.DefaultValueHelper
@@ -13,15 +17,12 @@ import info.nightscout.androidaps.utils.resources.ResourceHelper
 import org.json.JSONObject
 import org.junit.Before
 import org.mockito.Mock
-import org.powermock.core.classloader.annotations.PrepareForTest
 
 @Suppress("SpellCheckingInspection")
-@PrepareForTest(FabricPrivacy::class)
 open class TestBaseWithProfile : TestBase() {
 
     @Mock lateinit var activePluginProvider: ActivePlugin
     @Mock lateinit var resourceHelper: ResourceHelper
-    @Mock lateinit var treatmentsInterface: TreatmentsInterface
     @Mock lateinit var fabricPrivacy: FabricPrivacy
     @Mock lateinit var profileFunction: ProfileFunction
     @Mock lateinit var defaultValueHelper: DefaultValueHelper
diff --git a/dana/src/test/java/info/nightscout/androidaps/dana/DanaPumpTest.kt b/dana/src/test/java/info/nightscout/androidaps/dana/DanaPumpTest.kt
index fe5e5e61df..290c626fac 100644
--- a/dana/src/test/java/info/nightscout/androidaps/dana/DanaPumpTest.kt
+++ b/dana/src/test/java/info/nightscout/androidaps/dana/DanaPumpTest.kt
@@ -5,11 +5,8 @@ import info.nightscout.androidaps.utils.sharedPreferences.SP
 import org.junit.Assert
 import org.junit.Before
 import org.junit.Test
-import org.junit.runner.RunWith
 import org.mockito.Mock
-import org.powermock.modules.junit4.PowerMockRunner
 
-@RunWith(PowerMockRunner::class)
 class DanaPumpTest : TestBaseWithProfile() {
 
     @Mock lateinit var sp: SP
diff --git a/danar/build.gradle b/danar/build.gradle
index 09899f5540..1e7087736e 100644
--- a/danar/build.gradle
+++ b/danar/build.gradle
@@ -1,18 +1,13 @@
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-kapt'
+apply plugin: 'kotlin-allopen'
 apply plugin: 'com.hiya.jacoco-android'
 
 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"
-
-android {
-    defaultConfig {
-        versionCode 1
-        versionName "1.0"
-    }
-}
+apply from: "${project.rootDir}/gradle/jacoco_global.gradle"
 
 dependencies {
     implementation project(':core')
diff --git a/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgCheckValue_k.kt b/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgCheckValue_k.kt
index 362240338c..58f9037697 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgCheckValue_k.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgCheckValue_k.kt
@@ -1,6 +1,7 @@
 package info.nightscout.androidaps.danaRKorean.comm
 
 import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.dana.DanaPump
 import info.nightscout.androidaps.danar.comm.MessageBase
 import info.nightscout.androidaps.logging.LTag
 
@@ -19,7 +20,7 @@ class MsgCheckValue_k(
         danaPump.hwModel = intFromBuff(bytes, 0, 1)
         danaPump.protocol = intFromBuff(bytes, 1, 1)
         danaPump.productCode = intFromBuff(bytes, 2, 1)
-        if (danaPump.hwModel != info.nightscout.androidaps.dana.DanaPump.DOMESTIC_MODEL) {
+        if (danaPump.hwModel != DanaPump.DOMESTIC_MODEL) {
             danaRKoreanPlugin.disconnect("Wrong Model")
             aapsLogger.debug(LTag.PUMPCOMM, "Wrong model selected")
         }
diff --git a/danar/src/main/java/info/nightscout/androidaps/danaRKorean/services/DanaRKoreanExecutionService.java b/danar/src/main/java/info/nightscout/androidaps/danaRKorean/services/DanaRKoreanExecutionService.java
index b3417e0080..2295373d35 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danaRKorean/services/DanaRKoreanExecutionService.java
+++ b/danar/src/main/java/info/nightscout/androidaps/danaRKorean/services/DanaRKoreanExecutionService.java
@@ -184,7 +184,7 @@ public class DanaRKoreanExecutionService extends AbstractDanaRExecutionService {
                 if (Math.abs(timeDiff) > 10) {
                     waitForWholeMinute(); // Dana can set only whole minute
                     // add 10sec to be sure we are over minute (will be cut off anyway)
-                    mSerialIOThread.sendMessage(new MsgSetTime(injector, dateUtil.now() + T.secs(10).msecs()));
+                    mSerialIOThread.sendMessage(new MsgSetTime(injector, dateUtil.now() + T.Companion.secs(10).msecs()));
                     mSerialIOThread.sendMessage(new MsgSettingPumpTime(injector));
                     timeDiff = (danaPump.getPumpTime() - System.currentTimeMillis()) / 1000L;
                     aapsLogger.debug(LTag.PUMP, "Pump time difference: " + timeDiff + " seconds");
@@ -258,7 +258,7 @@ public class DanaRKoreanExecutionService extends AbstractDanaRExecutionService {
 
     public boolean bolus(double amount, int carbs, long carbTimeStamp, final EventOverviewBolusProgress.Treatment t) {
         if (!isConnected()) return false;
-        if (BolusProgressDialog.stopPressed) return false;
+        if (BolusProgressDialog.Companion.getStopPressed()) return false;
 
         danaPump.setBolusingTreatment(t);
         danaPump.setBolusDone(false);
diff --git a/danar/src/main/java/info/nightscout/androidaps/danaRv2/DanaRv2Plugin.java b/danar/src/main/java/info/nightscout/androidaps/danaRv2/DanaRv2Plugin.java
index 578eb28537..22f9c9a069 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danaRv2/DanaRv2Plugin.java
+++ b/danar/src/main/java/info/nightscout/androidaps/danaRv2/DanaRv2Plugin.java
@@ -181,7 +181,7 @@ public class DanaRv2Plugin extends AbstractDanaRPlugin {
             double carbs = detailedBolusInfo.carbs;
             detailedBolusInfo.carbs = 0;
             long carbTimeStamp = detailedBolusInfo.getCarbsTimestamp() != null ? detailedBolusInfo.getCarbsTimestamp() : detailedBolusInfo.timestamp;
-            if (carbTimeStamp == detailedBolusInfo.timestamp) carbTimeStamp -= T.mins(1).msecs(); // better set 1 min back to prevents clash with insulin
+            if (carbTimeStamp == detailedBolusInfo.timestamp) carbTimeStamp -= T.Companion.mins(1).msecs(); // better set 1 min back to prevents clash with insulin
 
             detailedBolusInfoStorage.add(detailedBolusInfo); // will be picked up on reading history
 
@@ -259,7 +259,7 @@ public class DanaRv2Plugin extends AbstractDanaRPlugin {
                     }
                 }
             }
-            temporaryBasalStorage.add(new PumpSync.PumpState.TemporaryBasal(dateUtil.now(), T.mins(durationInMinutes).msecs(), percentRate, false, tbrType, 0L, 0L));
+            temporaryBasalStorage.add(new PumpSync.PumpState.TemporaryBasal(dateUtil.now(), T.Companion.mins(durationInMinutes).msecs(), percentRate, false, tbrType, 0L, 0L));
             // Convert duration from minutes to hours
             aapsLogger.debug(LTag.PUMP, "setTempBasalAbsolute: Setting temp basal " + percentRate + "% for " + durationInMinutes + " minutes (doLowTemp || doHighTemp)");
             if (percentRate == 0 && durationInMinutes > 30) {
@@ -298,7 +298,7 @@ public class DanaRv2Plugin extends AbstractDanaRPlugin {
             aapsLogger.debug(LTag.PUMP, "setTempBasalPercent: Correct value already set");
             return result;
         }
-        temporaryBasalStorage.add(new PumpSync.PumpState.TemporaryBasal(dateUtil.now(), T.mins(durationInMinutes).msecs(), percent, false, tbrType, 0L, 0L));
+        temporaryBasalStorage.add(new PumpSync.PumpState.TemporaryBasal(dateUtil.now(), T.Companion.mins(durationInMinutes).msecs(), percent, false, tbrType, 0L, 0L));
         boolean connectionOK;
         if (durationInMinutes == 15 || durationInMinutes == 30) {
             connectionOK = sExecutionService.tempBasalShortDuration(percent, durationInMinutes);
diff --git a/danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MsgHistoryEvents_v2.kt b/danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MsgHistoryEvents_v2.kt
index 0cd213a56a..cff117939c 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MsgHistoryEvents_v2.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MsgHistoryEvents_v2.kt
@@ -1,6 +1,7 @@
 package info.nightscout.androidaps.danaRv2.comm
 
 import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.dana.DanaPump
 import info.nightscout.androidaps.danar.R
 import info.nightscout.androidaps.danar.comm.MessageBase
 import info.nightscout.androidaps.events.EventPumpStatusChanged
@@ -69,7 +70,7 @@ class MsgHistoryEvents_v2 constructor(
         val param2 = intFromBuff(bytes, 9, 2)
         val status: String
         when (recordCode.toInt()) {
-            info.nightscout.androidaps.dana.DanaPump.TEMPSTART         -> {
+            DanaPump.TEMPSTART         -> {
                 aapsLogger.debug(LTag.PUMPBTCOMM, "EVENT TEMPSTART (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Ratio: " + param1 + "% Duration: " + param2 + "min")
                 val temporaryBasalInfo = temporaryBasalStorage.findTemporaryBasal(datetime, param1.toDouble())
                 pumpSync.syncTemporaryBasalWithPumpId(
@@ -84,7 +85,7 @@ class MsgHistoryEvents_v2 constructor(
                 status = "TEMPSTART " + dateUtil.timeString(datetime)
             }
 
-            info.nightscout.androidaps.dana.DanaPump.TEMPSTOP          -> {
+            DanaPump.TEMPSTOP -> {
                 aapsLogger.debug(LTag.PUMPBTCOMM, "EVENT TEMPSTOP (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime))
                 pumpSync.syncStopTemporaryBasalWithPumpId(
                     timestamp = datetime,
@@ -94,7 +95,7 @@ class MsgHistoryEvents_v2 constructor(
                 status = "TEMPSTOP " + dateUtil.timeString(datetime)
             }
 
-            info.nightscout.androidaps.dana.DanaPump.EXTENDEDSTART     -> {
+            DanaPump.EXTENDEDSTART     -> {
                 val newRecord = pumpSync.syncExtendedBolusWithPumpId(
                     timestamp = datetime,
                     amount = param1 / 100.0,
@@ -107,7 +108,7 @@ class MsgHistoryEvents_v2 constructor(
                 status = "EXTENDEDSTART " + dateUtil.timeString(datetime)
             }
 
-            info.nightscout.androidaps.dana.DanaPump.EXTENDEDSTOP      -> {
+            DanaPump.EXTENDEDSTOP      -> {
                 val newRecord = pumpSync.syncStopExtendedBolusWithPumpId(
                     timestamp = datetime,
                     endPumpId = datetime,
@@ -117,7 +118,7 @@ class MsgHistoryEvents_v2 constructor(
                 status = "EXTENDEDSTOP " + dateUtil.timeString(datetime)
             }
 
-            info.nightscout.androidaps.dana.DanaPump.BOLUS             -> {
+            DanaPump.BOLUS             -> {
                 val detailedBolusInfo = detailedBolusInfoStorage.findDetailedBolusInfo(datetime, param1 / 100.0)
                 val newRecord = pumpSync.syncBolusWithPumpId(
                     timestamp = datetime,
@@ -130,7 +131,7 @@ class MsgHistoryEvents_v2 constructor(
                 status = "BOLUS " + dateUtil.timeString(datetime)
             }
 
-            info.nightscout.androidaps.dana.DanaPump.DUALBOLUS         -> {
+            DanaPump.DUALBOLUS         -> {
                 val detailedBolusInfo = detailedBolusInfoStorage.findDetailedBolusInfo(datetime, param1 / 100.0)
                 val newRecord = pumpSync.syncBolusWithPumpId(
                     timestamp = datetime,
@@ -143,7 +144,7 @@ class MsgHistoryEvents_v2 constructor(
                 status = "DUALBOLUS " + dateUtil.timeString(datetime)
             }
 
-            info.nightscout.androidaps.dana.DanaPump.DUALEXTENDEDSTART -> {
+            DanaPump.DUALEXTENDEDSTART -> {
                 val newRecord = pumpSync.syncExtendedBolusWithPumpId(
                     timestamp = datetime,
                     amount = param1 / 100.0,
@@ -156,7 +157,7 @@ class MsgHistoryEvents_v2 constructor(
                 status = "DUALEXTENDEDSTART " + dateUtil.timeString(datetime)
             }
 
-            info.nightscout.androidaps.dana.DanaPump.DUALEXTENDEDSTOP  -> {
+            DanaPump.DUALEXTENDEDSTOP  -> {
                 val newRecord = pumpSync.syncStopExtendedBolusWithPumpId(
                     timestamp = datetime,
                     endPumpId = datetime,
@@ -166,32 +167,32 @@ class MsgHistoryEvents_v2 constructor(
                 status = "DUALEXTENDEDSTOP " + dateUtil.timeString(datetime)
             }
 
-            info.nightscout.androidaps.dana.DanaPump.SUSPENDON         -> {
+            DanaPump.SUSPENDON         -> {
                 aapsLogger.debug(LTag.PUMPBTCOMM, "EVENT SUSPENDON (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")")
                 status = "SUSPENDON " + dateUtil.timeString(datetime)
             }
 
-            info.nightscout.androidaps.dana.DanaPump.SUSPENDOFF        -> {
+            DanaPump.SUSPENDOFF        -> {
                 aapsLogger.debug(LTag.PUMPBTCOMM, "EVENT SUSPENDOFF (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")")
                 status = "SUSPENDOFF " + dateUtil.timeString(datetime)
             }
 
-            info.nightscout.androidaps.dana.DanaPump.REFILL            -> {
+            DanaPump.REFILL            -> {
                 aapsLogger.debug(LTag.PUMPBTCOMM, "EVENT REFILL (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Amount: " + param1 / 100.0 + "U")
                 status = "REFILL " + dateUtil.timeString(datetime)
             }
 
-            info.nightscout.androidaps.dana.DanaPump.PRIME             -> {
+            DanaPump.PRIME             -> {
                 aapsLogger.debug(LTag.PUMPBTCOMM, "EVENT PRIME (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Amount: " + param1 / 100.0 + "U")
                 status = "PRIME " + dateUtil.timeString(datetime)
             }
 
-            info.nightscout.androidaps.dana.DanaPump.PROFILECHANGE     -> {
+            DanaPump.PROFILECHANGE     -> {
                 aapsLogger.debug(LTag.PUMPBTCOMM, "EVENT PROFILECHANGE (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " No: " + param1 + " CurrentRate: " + param2 / 100.0 + "U/h")
                 status = "PROFILECHANGE " + dateUtil.timeString(datetime)
             }
 
-            info.nightscout.androidaps.dana.DanaPump.CARBS             -> {
+            DanaPump.CARBS             -> {
                 val newRecord = pumpSync.syncCarbsWithTimestamp(
                     timestamp = datetime,
                     amount = param1.toDouble(),
diff --git a/danar/src/main/java/info/nightscout/androidaps/danaRv2/services/DanaRv2ExecutionService.java b/danar/src/main/java/info/nightscout/androidaps/danaRv2/services/DanaRv2ExecutionService.java
index 1d93f7b70f..c393bdef2a 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danaRv2/services/DanaRv2ExecutionService.java
+++ b/danar/src/main/java/info/nightscout/androidaps/danaRv2/services/DanaRv2ExecutionService.java
@@ -203,7 +203,7 @@ public class DanaRv2ExecutionService extends AbstractDanaRExecutionService {
                 } else {
                     waitForWholeMinute(); // Dana can set only whole minute
                     // add 10sec to be sure we are over minute (will be cutted off anyway)
-                    mSerialIOThread.sendMessage(new MsgSetTime(injector, dateUtil.now() + T.secs(10).msecs()));
+                    mSerialIOThread.sendMessage(new MsgSetTime(injector, dateUtil.now() + T.Companion.secs(10).msecs()));
                     mSerialIOThread.sendMessage(new MsgSettingPumpTime(injector));
                     timeDiff = (danaPump.getPumpTime() - System.currentTimeMillis()) / 1000L;
                     aapsLogger.debug(LTag.PUMP, "Pump time difference: " + timeDiff + " seconds");
@@ -327,7 +327,7 @@ public class DanaRv2ExecutionService extends AbstractDanaRExecutionService {
 
     public boolean bolus(final double amount, int carbs, long carbtime, final EventOverviewBolusProgress.Treatment t) {
         if (!isConnected()) return false;
-        if (BolusProgressDialog.stopPressed) return false;
+        if (BolusProgressDialog.Companion.getStopPressed()) return false;
 
         rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.startingbolus)));
         danaPump.setBolusingTreatment(t);
@@ -346,7 +346,7 @@ public class DanaRv2ExecutionService extends AbstractDanaRExecutionService {
             mSerialIOThread.sendMessage(msg);
             MsgSetHistoryEntry_v2 msgSetHistoryEntry_v2 = new MsgSetHistoryEntry_v2(injector, DanaPump.CARBS, carbtime, carbs, 0);
             mSerialIOThread.sendMessage(msgSetHistoryEntry_v2);
-            danaPump.lastHistoryFetched = Math.min(danaPump.lastHistoryFetched, carbtime - T.mins(1).msecs());
+            danaPump.lastHistoryFetched = Math.min(danaPump.lastHistoryFetched, carbtime - T.Companion.mins(1).msecs());
         }
 
         final long bolusStart = System.currentTimeMillis();
@@ -415,7 +415,7 @@ public class DanaRv2ExecutionService extends AbstractDanaRExecutionService {
         mSerialIOThread.sendMessage(msg);
         MsgSetHistoryEntry_v2 msgSetHistoryEntry_v2 = new MsgSetHistoryEntry_v2(injector, DanaPump.CARBS, time, amount, 0);
         mSerialIOThread.sendMessage(msgSetHistoryEntry_v2);
-        danaPump.lastHistoryFetched = Math.min(danaPump.lastHistoryFetched, time - T.mins(1).msecs());
+        danaPump.lastHistoryFetched = Math.min(danaPump.lastHistoryFetched, time - T.Companion.mins(1).msecs());
         return true;
     }
 
@@ -439,7 +439,7 @@ public class DanaRv2ExecutionService extends AbstractDanaRExecutionService {
         }
         SystemClock.sleep(200);
         if (danaRv2Plugin.lastEventTimeLoaded != 0)
-            danaPump.lastHistoryFetched = danaRv2Plugin.lastEventTimeLoaded - T.mins(1).msecs();
+            danaPump.lastHistoryFetched = danaRv2Plugin.lastEventTimeLoaded - T.Companion.mins(1).msecs();
         else
             danaPump.lastHistoryFetched = 0;
         danaPump.setLastConnection(System.currentTimeMillis());
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MessageBase.java b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MessageBase.java
index 9fc1d98ccd..f79d4d083e 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MessageBase.java
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MessageBase.java
@@ -21,7 +21,6 @@ import info.nightscout.androidaps.danar.DanaRPlugin;
 import info.nightscout.androidaps.interfaces.ActivePlugin;
 import info.nightscout.androidaps.interfaces.CommandQueueProvider;
 import info.nightscout.androidaps.interfaces.ConfigBuilder;
-import info.nightscout.androidaps.interfaces.DatabaseHelperInterface;
 import info.nightscout.androidaps.interfaces.PumpSync;
 import info.nightscout.androidaps.logging.AAPSLogger;
 import info.nightscout.androidaps.logging.LTag;
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingUserOptions.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingUserOptions.kt
index 2d7d703994..9f15346bb3 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingUserOptions.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingUserOptions.kt
@@ -2,7 +2,6 @@ package info.nightscout.androidaps.danar.comm
 
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
-import java.util.*
 
 class MsgSettingUserOptions(
     injector: HasAndroidInjector
@@ -16,7 +15,7 @@ class MsgSettingUserOptions(
 
     override fun handleMessage(packet: ByteArray) {
         val bytes = getDataBytes(packet, packet.size - 10)
-        danaPump.userOptionsFrompump = Arrays.copyOf(bytes, bytes!!.size) // saving pumpDataBytes to use it in MsgSetUserOptions
+        danaPump.userOptionsFrompump = bytes.copyOf(bytes.size) // saving pumpDataBytes to use it in MsgSetUserOptions
         for (pos in bytes.indices) {
             aapsLogger.debug(LTag.PUMPCOMM, "[" + pos + "]" + bytes[pos])
         }
@@ -46,10 +45,7 @@ class MsgSettingUserOptions(
         aapsLogger.debug(LTag.PUMPCOMM, "Low reservoir: " + danaPump.lowReservoirRate)
     }
 
-    private fun getDataBytes(bytes: ByteArray?, len: Int): ByteArray? {
-        if (bytes == null) {
-            return null
-        }
+    private fun getDataBytes(bytes: ByteArray, len: Int): ByteArray {
         val ret = ByteArray(len)
         System.arraycopy(bytes, 6, ret, 0, len)
         return ret
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgStatusBolusExtended.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgStatusBolusExtended.kt
index 6795b472ef..49b813c87d 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgStatusBolusExtended.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgStatusBolusExtended.kt
@@ -52,6 +52,6 @@ class MsgStatusBolusExtended(
         return (floor(System.currentTimeMillis() / 1000.0) - tempBasalAgoSecs).toLong() * 1000
     }
 
-    // because there is no fixed timestamp of start allow update of tbr only if tbr start differs more
-    private fun isWithin3Sec(newStart: Long) = abs(newStart - danaPump.tempBasalStart) < 3000
+    // because there is no fixed timestamp of start allow update of eb only if tbr start differs more
+    private fun isWithin3Sec(newStart: Long) = abs(newStart - danaPump.extendedBolusStart) < 3000
 }
\ No newline at end of file
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/services/DanaRExecutionService.java b/danar/src/main/java/info/nightscout/androidaps/danar/services/DanaRExecutionService.java
index 3bff7e49e9..0f4eb0f0e8 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/services/DanaRExecutionService.java
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/services/DanaRExecutionService.java
@@ -264,7 +264,7 @@ public class DanaRExecutionService extends AbstractDanaRExecutionService {
 
     public boolean bolus(double amount, int carbs, long carbTimeStamp, final EventOverviewBolusProgress.Treatment t) {
         if (!isConnected()) return false;
-        if (BolusProgressDialog.stopPressed) return false;
+        if (BolusProgressDialog.Companion.getStopPressed()) return false;
 
         danaPump.setBolusingTreatment(t);
         danaPump.setBolusDone(false);
diff --git a/danar/src/test/java/info/nightscout/androidaps/TestBaseWithProfile.kt b/danar/src/test/java/info/nightscout/androidaps/TestBaseWithProfile.kt
index 8b145c52a4..bd213d3c8e 100644
--- a/danar/src/test/java/info/nightscout/androidaps/TestBaseWithProfile.kt
+++ b/danar/src/test/java/info/nightscout/androidaps/TestBaseWithProfile.kt
@@ -4,7 +4,11 @@ import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.data.ProfileSealed
 import info.nightscout.androidaps.extensions.pureProfileFromJson
-import info.nightscout.androidaps.interfaces.*
+import info.nightscout.androidaps.interfaces.ActivePlugin
+import info.nightscout.androidaps.interfaces.Config
+import info.nightscout.androidaps.interfaces.Profile
+import info.nightscout.androidaps.interfaces.ProfileFunction
+import info.nightscout.androidaps.interfaces.ProfileStore
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.utils.DefaultValueHelper
@@ -13,15 +17,12 @@ import info.nightscout.androidaps.utils.resources.ResourceHelper
 import org.json.JSONObject
 import org.junit.Before
 import org.mockito.Mock
-import org.powermock.core.classloader.annotations.PrepareForTest
 
 @Suppress("SpellCheckingInspection")
-@PrepareForTest(FabricPrivacy::class)
 open class TestBaseWithProfile : TestBase() {
 
     @Mock lateinit var activePluginProvider: ActivePlugin
     @Mock lateinit var resourceHelper: ResourceHelper
-    @Mock lateinit var treatmentsInterface: TreatmentsInterface
     @Mock lateinit var fabricPrivacy: FabricPrivacy
     @Mock lateinit var profileFunction: ProfileFunction
     @Mock lateinit var defaultValueHelper: DefaultValueHelper
diff --git a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/DanaRPluginTest.kt b/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/DanaRPluginTest.kt
index 6bbadd14e9..395716449f 100644
--- a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/DanaRPluginTest.kt
+++ b/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/DanaRPluginTest.kt
@@ -17,14 +17,9 @@ import info.nightscout.androidaps.utils.sharedPreferences.SP
 import org.junit.Assert
 import org.junit.Before
 import org.junit.Test
-import org.junit.runner.RunWith
 import org.mockito.Mock
 import org.mockito.Mockito.`when`
-import org.powermock.core.classloader.annotations.PrepareForTest
-import org.powermock.modules.junit4.PowerMockRunner
 
-@RunWith(PowerMockRunner::class)
-@PrepareForTest(SP::class, ConstraintChecker::class)
 class DanaRPluginTest : TestBaseWithProfile() {
 
     @Mock lateinit var context: Context
diff --git a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/DanaRTestBase.kt b/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/DanaRTestBase.kt
index 5b24a3b8b7..e2847894bb 100644
--- a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/DanaRTestBase.kt
+++ b/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/DanaRTestBase.kt
@@ -27,9 +27,7 @@ import org.mockito.Mock
 import org.mockito.Mockito.`when`
 import org.mockito.Mockito.anyBoolean
 import org.mockito.Mockito.doNothing
-import org.powermock.core.classloader.annotations.PrepareForTest
 
-@PrepareForTest(DetailedBolusInfoStorage::class, ConstraintChecker::class, DanaRKoreanPlugin::class, DanaRPlugin::class)
 open class DanaRTestBase : TestBase() {
 
     @Mock lateinit var sp: SP
diff --git a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MessageHashTableRTest.kt b/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MessageHashTableRTest.kt
index 3c382e7a8e..1a080a0d10 100644
--- a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MessageHashTableRTest.kt
+++ b/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MessageHashTableRTest.kt
@@ -4,11 +4,8 @@ import info.nightscout.androidaps.danar.comm.MessageHashTableR
 import info.nightscout.androidaps.interfaces.Constraint
 import org.junit.Assert
 import org.junit.Test
-import org.junit.runner.RunWith
 import org.mockito.Mockito
-import org.powermock.modules.junit4.PowerMockRunner
 
-@RunWith(PowerMockRunner::class)
 class MessageHashTableRTest : DanaRTestBase() {
 
     @Test fun runTest() {
diff --git a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusProgressTest.kt b/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusProgressTest.kt
index a7c470008b..02c197f625 100644
--- a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusProgressTest.kt
+++ b/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusProgressTest.kt
@@ -5,12 +5,9 @@ import info.nightscout.androidaps.danar.comm.MsgBolusProgress
 import info.nightscout.androidaps.plugins.general.overview.events.EventOverviewBolusProgress
 import org.junit.Assert
 import org.junit.Test
-import org.junit.runner.RunWith
 import org.mockito.ArgumentMatchers
 import org.mockito.Mockito.`when`
-import org.powermock.modules.junit4.PowerMockRunner
 
-@RunWith(PowerMockRunner::class)
 class MsgBolusProgressTest : DanaRTestBase() {
 
     @Test fun runTest() {
diff --git a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusStartTest.kt b/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusStartTest.kt
index ce02b1fe6f..2b00d74b25 100644
--- a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusStartTest.kt
+++ b/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusStartTest.kt
@@ -2,16 +2,10 @@ package info.nightscout.androidaps.plugins.pump.danaR.comm
 
 import info.nightscout.androidaps.danar.comm.MsgBolusStart
 import info.nightscout.androidaps.interfaces.Constraint
-import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
 import org.junit.Assert
 import org.junit.Test
-import org.junit.runner.RunWith
 import org.mockito.Mockito.`when`
-import org.powermock.core.classloader.annotations.PrepareForTest
-import org.powermock.modules.junit4.PowerMockRunner
 
-@RunWith(PowerMockRunner::class)
-@PrepareForTest(ConstraintChecker::class)
 class MsgBolusStartTest : DanaRTestBase() {
 
     @Test fun runTest() {
diff --git a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusStartWithSpeedTest.kt b/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusStartWithSpeedTest.kt
index 6048350c87..0421e408b9 100644
--- a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusStartWithSpeedTest.kt
+++ b/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusStartWithSpeedTest.kt
@@ -2,16 +2,10 @@ package info.nightscout.androidaps.plugins.pump.danaR.comm
 
 import info.nightscout.androidaps.danar.comm.MsgBolusStartWithSpeed
 import info.nightscout.androidaps.interfaces.Constraint
-import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
 import org.junit.Assert
 import org.junit.Test
-import org.junit.runner.RunWith
 import org.mockito.Mockito
-import org.powermock.core.classloader.annotations.PrepareForTest
-import org.powermock.modules.junit4.PowerMockRunner
 
-@RunWith(PowerMockRunner::class)
-@PrepareForTest(ConstraintChecker::class)
 class MsgBolusStartWithSpeedTest : DanaRTestBase() {
 
     @Test fun runTest() {
diff --git a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusStopTest.kt b/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusStopTest.kt
index 46b901ec60..76390f7404 100644
--- a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusStopTest.kt
+++ b/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusStopTest.kt
@@ -5,11 +5,8 @@ import info.nightscout.androidaps.danar.comm.MsgBolusStop
 import info.nightscout.androidaps.plugins.general.overview.events.EventOverviewBolusProgress
 import org.junit.Assert
 import org.junit.Test
-import org.junit.runner.RunWith
 import org.mockito.Mockito.`when`
-import org.powermock.modules.junit4.PowerMockRunner
 
-@RunWith(PowerMockRunner::class)
 class MsgBolusStopTest : DanaRTestBase() {
 
     @Test fun runTest() {
diff --git a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgCheckValueTest.kt b/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgCheckValueTest.kt
index be0165938f..f44be2f968 100644
--- a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgCheckValueTest.kt
+++ b/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgCheckValueTest.kt
@@ -4,10 +4,7 @@ import info.nightscout.androidaps.dana.DanaPump
 import info.nightscout.androidaps.danar.comm.MsgCheckValue
 import org.junit.Assert
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.powermock.modules.junit4.PowerMockRunner
 
-@RunWith(PowerMockRunner::class)
 class MsgCheckValueTest : DanaRTestBase() {
 
     @Test fun runTest() {
diff --git a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgErrorTest.kt b/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgErrorTest.kt
index 39798547c4..ec678cda21 100644
--- a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgErrorTest.kt
+++ b/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgErrorTest.kt
@@ -3,10 +3,7 @@ package info.nightscout.androidaps.plugins.pump.danaR.comm
 import info.nightscout.androidaps.danar.comm.MsgError
 import org.junit.Assert
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.powermock.modules.junit4.PowerMockRunner
 
-@RunWith(PowerMockRunner::class)
 class MsgErrorTest : DanaRTestBase() {
 
     @Test fun runTest() {
diff --git a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryAlarmTest.kt b/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryAlarmTest.kt
index 400320eba5..baac96b341 100644
--- a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryAlarmTest.kt
+++ b/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryAlarmTest.kt
@@ -2,10 +2,7 @@ package info.nightscout.androidaps.plugins.pump.danaR.comm
 
 import info.nightscout.androidaps.danar.comm.MsgHistoryAlarm
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.powermock.modules.junit4.PowerMockRunner
 
-@RunWith(PowerMockRunner::class)
 class MsgHistoryAlarmTest : DanaRTestBase() {
 
     @Test fun runTest() {
diff --git a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryAllDoneTest.kt b/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryAllDoneTest.kt
index 0e45e40cc6..9177446e61 100644
--- a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryAllDoneTest.kt
+++ b/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryAllDoneTest.kt
@@ -3,10 +3,7 @@ package info.nightscout.androidaps.plugins.pump.danaR.comm
 import info.nightscout.androidaps.danar.comm.MsgHistoryAllDone
 import org.junit.Assert
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.powermock.modules.junit4.PowerMockRunner
 
-@RunWith(PowerMockRunner::class)
 class MsgHistoryAllDoneTest : DanaRTestBase() {
 
     @Test fun runTest() {
diff --git a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryAllTest.kt b/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryAllTest.kt
index 4d61b03288..a10127dd38 100644
--- a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryAllTest.kt
+++ b/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryAllTest.kt
@@ -3,10 +3,7 @@ package info.nightscout.androidaps.plugins.pump.danaR.comm
 import info.nightscout.androidaps.danar.comm.MsgHistoryAll
 import org.junit.Assert
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.powermock.modules.junit4.PowerMockRunner
 
-@RunWith(PowerMockRunner::class)
 class MsgHistoryAllTest : DanaRTestBase() {
 
     @Test fun runTest() {
diff --git a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryBasalHourTest.kt b/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryBasalHourTest.kt
index 67cf3ebcc2..4d53cff893 100644
--- a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryBasalHourTest.kt
+++ b/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryBasalHourTest.kt
@@ -2,10 +2,7 @@ package info.nightscout.androidaps.plugins.pump.danaR.comm
 
 import info.nightscout.androidaps.danar.comm.MsgHistoryBasalHour
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.powermock.modules.junit4.PowerMockRunner
 
-@RunWith(PowerMockRunner::class)
 class MsgHistoryBasalHourTest : DanaRTestBase() {
 
     @Test fun runTest() {
diff --git a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryBolusTest.kt b/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryBolusTest.kt
index b1748562ce..0e43c3fd94 100644
--- a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryBolusTest.kt
+++ b/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryBolusTest.kt
@@ -2,10 +2,7 @@ package info.nightscout.androidaps.plugins.pump.danaR.comm
 
 import info.nightscout.androidaps.danar.comm.MsgHistoryBolus
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.powermock.modules.junit4.PowerMockRunner
 
-@RunWith(PowerMockRunner::class)
 class MsgHistoryBolusTest : DanaRTestBase() {
 
     @Test fun runTest() {
diff --git a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryCarboTest.kt b/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryCarboTest.kt
index 1bf3cf77a6..61e543b1e2 100644
--- a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryCarboTest.kt
+++ b/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryCarboTest.kt
@@ -2,10 +2,7 @@ package info.nightscout.androidaps.plugins.pump.danaR.comm
 
 import info.nightscout.androidaps.danar.comm.MsgHistoryCarbo
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.powermock.modules.junit4.PowerMockRunner
 
-@RunWith(PowerMockRunner::class)
 class MsgHistoryCarboTest : DanaRTestBase() {
 
     @Test fun runTest() {
diff --git a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryDailyInsulinTest.kt b/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryDailyInsulinTest.kt
index dd2274f669..a860b309c3 100644
--- a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryDailyInsulinTest.kt
+++ b/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryDailyInsulinTest.kt
@@ -2,10 +2,7 @@ package info.nightscout.androidaps.plugins.pump.danaR.comm
 
 import info.nightscout.androidaps.danar.comm.MsgHistoryDailyInsulin
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.powermock.modules.junit4.PowerMockRunner
 
-@RunWith(PowerMockRunner::class)
 class MsgHistoryDailyInsulinTest : DanaRTestBase() {
 
     @Test fun runTest() {
diff --git a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryDoneTest.kt b/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryDoneTest.kt
index 320e34529d..cb7c30f9fc 100644
--- a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryDoneTest.kt
+++ b/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryDoneTest.kt
@@ -2,10 +2,7 @@ package info.nightscout.androidaps.plugins.pump.danaR.comm
 
 import info.nightscout.androidaps.danar.comm.MsgHistoryDone
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.powermock.modules.junit4.PowerMockRunner
 
-@RunWith(PowerMockRunner::class)
 class MsgHistoryDoneTest : DanaRTestBase() {
 
     @Test fun runTest() {
diff --git a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryErrorTest.kt b/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryErrorTest.kt
index 1f0babb908..dd1ec5f59a 100644
--- a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryErrorTest.kt
+++ b/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryErrorTest.kt
@@ -2,10 +2,7 @@ package info.nightscout.androidaps.plugins.pump.danaR.comm
 
 import info.nightscout.androidaps.danar.comm.MsgHistoryError
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.powermock.modules.junit4.PowerMockRunner
 
-@RunWith(PowerMockRunner::class)
 class MsgHistoryErrorTest : DanaRTestBase() {
 
     @Test fun runTest() {
diff --git a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryGlucoseTest.kt b/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryGlucoseTest.kt
index 113c11dddd..e3a3ad3ddb 100644
--- a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryGlucoseTest.kt
+++ b/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryGlucoseTest.kt
@@ -2,10 +2,7 @@ package info.nightscout.androidaps.plugins.pump.danaR.comm
 
 import info.nightscout.androidaps.danar.comm.MsgHistoryGlucose
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.powermock.modules.junit4.PowerMockRunner
 
-@RunWith(PowerMockRunner::class)
 class MsgHistoryGlucoseTest : DanaRTestBase() {
 
     @Test fun runTest() {
diff --git a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryNewDoneTest.kt b/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryNewDoneTest.kt
index 321bd0f036..5c8c4da006 100644
--- a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryNewDoneTest.kt
+++ b/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryNewDoneTest.kt
@@ -2,10 +2,7 @@ package info.nightscout.androidaps.plugins.pump.danaR.comm
 
 import info.nightscout.androidaps.danar.comm.MsgHistoryNewDone
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.powermock.modules.junit4.PowerMockRunner
 
-@RunWith(PowerMockRunner::class)
 class MsgHistoryNewDoneTest : DanaRTestBase() {
 
     @Test fun runTest() {
diff --git a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryNewTest.kt b/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryNewTest.kt
index 5144a672a1..1bc690ffdf 100644
--- a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryNewTest.kt
+++ b/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryNewTest.kt
@@ -2,10 +2,7 @@ package info.nightscout.androidaps.plugins.pump.danaR.comm
 
 import info.nightscout.androidaps.danar.comm.MsgHistoryNew
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.powermock.modules.junit4.PowerMockRunner
 
-@RunWith(PowerMockRunner::class)
 class MsgHistoryNewTest : DanaRTestBase() {
 
     @Test fun runTest() {
diff --git a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryRefillTest.kt b/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryRefillTest.kt
index f4162adfb3..a8fa3704c0 100644
--- a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryRefillTest.kt
+++ b/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryRefillTest.kt
@@ -2,10 +2,7 @@ package info.nightscout.androidaps.plugins.pump.danaR.comm
 
 import info.nightscout.androidaps.danar.comm.MsgHistoryRefill
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.powermock.modules.junit4.PowerMockRunner
 
-@RunWith(PowerMockRunner::class)
 class MsgHistoryRefillTest : DanaRTestBase() {
 
     @Test fun runTest() {
diff --git a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistorySuspendTest.kt b/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistorySuspendTest.kt
index 59f8d6a181..b3b5774cd9 100644
--- a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistorySuspendTest.kt
+++ b/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistorySuspendTest.kt
@@ -2,10 +2,7 @@ package info.nightscout.androidaps.plugins.pump.danaR.comm
 
 import info.nightscout.androidaps.danar.comm.MsgHistorySuspend
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.powermock.modules.junit4.PowerMockRunner
 
-@RunWith(PowerMockRunner::class)
 class MsgHistorySuspendTest : DanaRTestBase() {
 
     @Test fun runTest() {
diff --git a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusBasicTest.kt b/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusBasicTest.kt
index dac1589cac..cc6a16da3f 100644
--- a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusBasicTest.kt
+++ b/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusBasicTest.kt
@@ -3,10 +3,7 @@ package info.nightscout.androidaps.plugins.pump.danaR.comm
 import info.nightscout.androidaps.danar.comm.MsgInitConnStatusBasic
 import org.junit.Assert
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.powermock.modules.junit4.PowerMockRunner
 
-@RunWith(PowerMockRunner::class)
 class MsgInitConnStatusBasicTest : DanaRTestBase() {
 
     @Test fun runTest() {
diff --git a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusBolusTest.kt b/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusBolusTest.kt
index 96c3ead153..2171701f7d 100644
--- a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusBolusTest.kt
+++ b/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusBolusTest.kt
@@ -3,10 +3,7 @@ package info.nightscout.androidaps.plugins.pump.danaR.comm
 import info.nightscout.androidaps.danar.comm.MsgInitConnStatusBolus
 import org.junit.Assert
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.powermock.modules.junit4.PowerMockRunner
 
-@RunWith(PowerMockRunner::class)
 class MsgInitConnStatusBolusTest : DanaRTestBase() {
 
     @Test fun runTest() {
diff --git a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusOptionTest.kt b/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusOptionTest.kt
index 33ab2005dc..2ce904bfa4 100644
--- a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusOptionTest.kt
+++ b/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusOptionTest.kt
@@ -3,10 +3,7 @@ package info.nightscout.androidaps.plugins.pump.danaR.comm
 import info.nightscout.androidaps.danar.comm.MsgInitConnStatusOption
 import org.junit.Assert
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.powermock.modules.junit4.PowerMockRunner
 
-@RunWith(PowerMockRunner::class)
 class MsgInitConnStatusOptionTest : DanaRTestBase() {
 
     @Test fun runTest() {
diff --git a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusTimeTest.kt b/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusTimeTest.kt
index 9a850c7cd5..b518d8ae92 100644
--- a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusTimeTest.kt
+++ b/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusTimeTest.kt
@@ -3,10 +3,7 @@ package info.nightscout.androidaps.plugins.pump.danaR.comm
 import info.nightscout.androidaps.danar.comm.MsgInitConnStatusTime
 import org.junit.Assert
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.powermock.modules.junit4.PowerMockRunner
 
-@RunWith(PowerMockRunner::class)
 class MsgInitConnStatusTimeTest : DanaRTestBase() {
 
     @Test fun runTest() {
diff --git a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgPCCommStartTest.kt b/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgPCCommStartTest.kt
index 426086e1b7..9f51769c58 100644
--- a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgPCCommStartTest.kt
+++ b/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgPCCommStartTest.kt
@@ -2,10 +2,7 @@ package info.nightscout.androidaps.plugins.pump.danaR.comm
 
 import info.nightscout.androidaps.danar.comm.MsgPCCommStart
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.powermock.modules.junit4.PowerMockRunner
 
-@RunWith(PowerMockRunner::class)
 class MsgPCCommStartTest : DanaRTestBase() {
 
     @Test fun runTest() {
diff --git a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgPCCommStopTest.kt b/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgPCCommStopTest.kt
index 75b60f6686..ef1f6555c2 100644
--- a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgPCCommStopTest.kt
+++ b/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgPCCommStopTest.kt
@@ -2,10 +2,7 @@ package info.nightscout.androidaps.plugins.pump.danaR.comm
 
 import info.nightscout.androidaps.danar.comm.MsgPCCommStop
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.powermock.modules.junit4.PowerMockRunner
 
-@RunWith(PowerMockRunner::class)
 class MsgPCCommStopTest : DanaRTestBase() {
 
     @Test fun runTest() {
diff --git a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetActivateBasalProfileTest.kt b/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetActivateBasalProfileTest.kt
index bafa3b3376..30835645f2 100644
--- a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetActivateBasalProfileTest.kt
+++ b/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetActivateBasalProfileTest.kt
@@ -3,10 +3,7 @@ package info.nightscout.androidaps.plugins.pump.danaR.comm
 import info.nightscout.androidaps.danar.comm.MsgSetActivateBasalProfile
 import org.junit.Assert
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.powermock.modules.junit4.PowerMockRunner
 
-@RunWith(PowerMockRunner::class)
 class MsgSetActivateBasalProfileTest : DanaRTestBase() {
 
     @Test fun runTest() {
diff --git a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetBasalProfileTest.kt b/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetBasalProfileTest.kt
index 56c2c51d0e..be82e6eb37 100644
--- a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetBasalProfileTest.kt
+++ b/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetBasalProfileTest.kt
@@ -3,10 +3,7 @@ package info.nightscout.androidaps.plugins.pump.danaR.comm
 import info.nightscout.androidaps.danar.comm.MsgSetBasalProfile
 import org.junit.Assert
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.powermock.modules.junit4.PowerMockRunner
 
-@RunWith(PowerMockRunner::class)
 class MsgSetBasalProfileTest : DanaRTestBase() {
 
     @Test fun runTest() {
diff --git a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetCarbsEntryTest.kt b/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetCarbsEntryTest.kt
index 9a0ba905ee..9b508b0514 100644
--- a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetCarbsEntryTest.kt
+++ b/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetCarbsEntryTest.kt
@@ -3,10 +3,7 @@ package info.nightscout.androidaps.plugins.pump.danaR.comm
 import info.nightscout.androidaps.danar.comm.MsgSetCarbsEntry
 import org.junit.Assert
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.powermock.modules.junit4.PowerMockRunner
 
-@RunWith(PowerMockRunner::class)
 class MsgSetCarbsEntryTest : DanaRTestBase() {
 
     @Test fun runTest() {
diff --git a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetExtendedBolusStartTest.kt b/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetExtendedBolusStartTest.kt
index 967fed825b..8d0ff919d7 100644
--- a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetExtendedBolusStartTest.kt
+++ b/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetExtendedBolusStartTest.kt
@@ -2,16 +2,10 @@ package info.nightscout.androidaps.plugins.pump.danaR.comm
 
 import info.nightscout.androidaps.danar.comm.MsgSetExtendedBolusStart
 import info.nightscout.androidaps.interfaces.Constraint
-import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
 import org.junit.Assert
 import org.junit.Test
-import org.junit.runner.RunWith
 import org.mockito.Mockito.`when`
-import org.powermock.core.classloader.annotations.PrepareForTest
-import org.powermock.modules.junit4.PowerMockRunner
 
-@RunWith(PowerMockRunner::class)
-@PrepareForTest(ConstraintChecker::class)
 class MsgSetExtendedBolusStartTest : DanaRTestBase() {
 
     @Test fun runTest() {
diff --git a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetExtendedBolusStopTest.kt b/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetExtendedBolusStopTest.kt
index dfac8cbfd3..af3b58f2ea 100644
--- a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetExtendedBolusStopTest.kt
+++ b/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetExtendedBolusStopTest.kt
@@ -3,10 +3,7 @@ package info.nightscout.androidaps.plugins.pump.danaR.comm
 import info.nightscout.androidaps.danar.comm.MsgSetExtendedBolusStop
 import org.junit.Assert
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.powermock.modules.junit4.PowerMockRunner
 
-@RunWith(PowerMockRunner::class)
 class MsgSetExtendedBolusStopTest : DanaRTestBase() {
 
     @Test fun runTest() {
diff --git a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetSingleBasalProfileTest.kt b/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetSingleBasalProfileTest.kt
index 79e43acd7e..b959f2b9f9 100644
--- a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetSingleBasalProfileTest.kt
+++ b/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetSingleBasalProfileTest.kt
@@ -3,10 +3,7 @@ package info.nightscout.androidaps.plugins.pump.danaR.comm
 import info.nightscout.androidaps.danar.comm.MsgSetSingleBasalProfile
 import org.junit.Assert
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.powermock.modules.junit4.PowerMockRunner
 
-@RunWith(PowerMockRunner::class)
 class MsgSetSingleBasalProfileTest : DanaRTestBase() {
 
     @Test fun runTest() {
diff --git a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetTempBasalStartTest.kt b/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetTempBasalStartTest.kt
index 715a491779..8d532863c6 100644
--- a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetTempBasalStartTest.kt
+++ b/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetTempBasalStartTest.kt
@@ -3,10 +3,7 @@ package info.nightscout.androidaps.plugins.pump.danaR.comm
 import info.nightscout.androidaps.danar.comm.MsgSetTempBasalStart
 import org.junit.Assert
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.powermock.modules.junit4.PowerMockRunner
 
-@RunWith(PowerMockRunner::class)
 class MsgSetTempBasalStartTest : DanaRTestBase() {
 
     @Test fun runTest() {
diff --git a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetTimeTest.kt b/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetTimeTest.kt
index 44a1c64ddb..088469ab64 100644
--- a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetTimeTest.kt
+++ b/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetTimeTest.kt
@@ -3,10 +3,7 @@ package info.nightscout.androidaps.plugins.pump.danaR.comm
 import info.nightscout.androidaps.danar.comm.MsgSetTime
 import org.junit.Assert
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.powermock.modules.junit4.PowerMockRunner
 
-@RunWith(PowerMockRunner::class)
 class MsgSetTimeTest : DanaRTestBase() {
 
     @Test fun runTest() {
diff --git a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetUserOptionsTest.kt b/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetUserOptionsTest.kt
index 14c70f4a04..fe325d8aa3 100644
--- a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetUserOptionsTest.kt
+++ b/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetUserOptionsTest.kt
@@ -3,10 +3,7 @@ package info.nightscout.androidaps.plugins.pump.danaR.comm
 import info.nightscout.androidaps.danar.comm.MsgSetUserOptions
 import org.junit.Assert
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.powermock.modules.junit4.PowerMockRunner
 
-@RunWith(PowerMockRunner::class)
 class MsgSetUserOptionsTest : DanaRTestBase() {
 
     @Test fun runTest() {
diff --git a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingActiveProfileTest.kt b/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingActiveProfileTest.kt
index 532d6e0c7b..b19085f7f3 100644
--- a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingActiveProfileTest.kt
+++ b/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingActiveProfileTest.kt
@@ -3,10 +3,7 @@ package info.nightscout.androidaps.plugins.pump.danaR.comm
 import info.nightscout.androidaps.danar.comm.MsgSettingActiveProfile
 import org.junit.Assert
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.powermock.modules.junit4.PowerMockRunner
 
-@RunWith(PowerMockRunner::class)
 class MsgSettingActiveProfileTest : DanaRTestBase() {
 
     @Test fun runTest() {
diff --git a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingBasalProfileAllTest.kt b/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingBasalProfileAllTest.kt
index cf172d5f50..746a0b197f 100644
--- a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingBasalProfileAllTest.kt
+++ b/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingBasalProfileAllTest.kt
@@ -2,10 +2,7 @@ package info.nightscout.androidaps.plugins.pump.danaR.comm
 
 import info.nightscout.androidaps.danar.comm.MsgSettingBasalProfileAll
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.powermock.modules.junit4.PowerMockRunner
 
-@RunWith(PowerMockRunner::class)
 class MsgSettingBasalProfileAllTest : DanaRTestBase() {
 
     @Test fun runTest() {
diff --git a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingBasalTest.kt b/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingBasalTest.kt
index 4915e79dec..b4380177cb 100644
--- a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingBasalTest.kt
+++ b/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingBasalTest.kt
@@ -4,13 +4,8 @@ import info.nightscout.androidaps.danar.comm.MsgSettingBasal
 import info.nightscout.androidaps.interfaces.PumpDescription
 import org.junit.Assert
 import org.junit.Test
-import org.junit.runner.RunWith
 import org.mockito.Mockito.`when`
-import org.powermock.core.classloader.annotations.PrepareForTest
-import org.powermock.modules.junit4.PowerMockRunner
 
-@RunWith(PowerMockRunner::class)
-@PrepareForTest(info.nightscout.androidaps.danar.DanaRPlugin::class)
 class MsgSettingBasalTest : DanaRTestBase() {
 
     @Test fun runTest() {
diff --git a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingGlucoseTest.kt b/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingGlucoseTest.kt
index 5a779d70b6..7939e5a26b 100644
--- a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingGlucoseTest.kt
+++ b/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingGlucoseTest.kt
@@ -3,10 +3,7 @@ package info.nightscout.androidaps.plugins.pump.danaR.comm
 import info.nightscout.androidaps.danar.comm.MsgSettingGlucose
 import org.junit.Assert
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.powermock.modules.junit4.PowerMockRunner
 
-@RunWith(PowerMockRunner::class)
 class MsgSettingGlucoseTest : DanaRTestBase() {
 
     @Test fun runTest() {
diff --git a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingMaxValuesTest.kt b/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingMaxValuesTest.kt
index 95152aed97..206e578bea 100644
--- a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingMaxValuesTest.kt
+++ b/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingMaxValuesTest.kt
@@ -3,10 +3,7 @@ package info.nightscout.androidaps.plugins.pump.danaR.comm
 import info.nightscout.androidaps.danar.comm.MsgSettingMaxValues
 import org.junit.Assert
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.powermock.modules.junit4.PowerMockRunner
 
-@RunWith(PowerMockRunner::class)
 class MsgSettingMaxValuesTest : DanaRTestBase() {
 
     @Test fun runTest() {
diff --git a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingMealTest.kt b/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingMealTest.kt
index 1c7126485b..ac21cfe082 100644
--- a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingMealTest.kt
+++ b/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingMealTest.kt
@@ -1,16 +1,9 @@
 package info.nightscout.androidaps.plugins.pump.danaR.comm
 
-import info.nightscout.androidaps.danaRKorean.DanaRKoreanPlugin
-import info.nightscout.androidaps.danar.DanaRPlugin
 import info.nightscout.androidaps.danar.comm.MsgSettingMeal
 import org.junit.Assert
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.powermock.core.classloader.annotations.PrepareForTest
-import org.powermock.modules.junit4.PowerMockRunner
 
-@RunWith(PowerMockRunner::class)
-@PrepareForTest(DanaRPlugin::class, DanaRKoreanPlugin::class)
 class MsgSettingMealTest : DanaRTestBase() {
 
     @Test fun runTest() {
diff --git a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingProfileRatiosAllTest.kt b/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingProfileRatiosAllTest.kt
index d04e4dcfcb..fb0a54b21f 100644
--- a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingProfileRatiosAllTest.kt
+++ b/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingProfileRatiosAllTest.kt
@@ -4,10 +4,7 @@ import info.nightscout.androidaps.dana.DanaPump
 import info.nightscout.androidaps.danar.comm.MsgSettingProfileRatiosAll
 import org.junit.Assert
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.powermock.modules.junit4.PowerMockRunner
 
-@RunWith(PowerMockRunner::class)
 class MsgSettingProfileRatiosAllTest : DanaRTestBase() {
 
     @Test fun runTest() {
diff --git a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingProfileRatiosTest.kt b/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingProfileRatiosTest.kt
index 2cc012862c..7bffd88b0c 100644
--- a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingProfileRatiosTest.kt
+++ b/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingProfileRatiosTest.kt
@@ -4,10 +4,7 @@ import info.nightscout.androidaps.dana.DanaPump
 import info.nightscout.androidaps.danar.comm.MsgSettingProfileRatios
 import org.junit.Assert
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.powermock.modules.junit4.PowerMockRunner
 
-@RunWith(PowerMockRunner::class)
 class MsgSettingProfileRatiosTest : DanaRTestBase() {
 
     @Test fun runTest() {
diff --git a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingPumpTimeTest.kt b/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingPumpTimeTest.kt
index 4bed4e080e..6c8358e203 100644
--- a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingPumpTimeTest.kt
+++ b/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingPumpTimeTest.kt
@@ -5,10 +5,7 @@ import info.nightscout.androidaps.danar.comm.MsgSettingPumpTime
 import org.joda.time.DateTime
 import org.junit.Assert
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.powermock.modules.junit4.PowerMockRunner
 
-@RunWith(PowerMockRunner::class)
 class MsgSettingPumpTimeTest : DanaRTestBase() {
 
     @Test fun runTest() {
diff --git a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingShippingInfoTest.kt b/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingShippingInfoTest.kt
index f75ed71ba7..ae55b85b15 100644
--- a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingShippingInfoTest.kt
+++ b/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingShippingInfoTest.kt
@@ -5,10 +5,7 @@ import info.nightscout.androidaps.danar.comm.MessageBase
 import info.nightscout.androidaps.danar.comm.MsgSettingShippingInfo
 import org.junit.Assert
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.powermock.modules.junit4.PowerMockRunner
 
-@RunWith(PowerMockRunner::class)
 class MsgSettingShippingInfoTest : DanaRTestBase() {
 
     @Test fun runTest() {
diff --git a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingUserOptionsTest.kt b/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingUserOptionsTest.kt
index c9c300081d..518814623e 100644
--- a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingUserOptionsTest.kt
+++ b/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingUserOptionsTest.kt
@@ -4,10 +4,7 @@ import info.nightscout.androidaps.dana.DanaPump
 import info.nightscout.androidaps.danar.comm.MsgSettingUserOptions
 import org.junit.Assert
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.powermock.modules.junit4.PowerMockRunner
 
-@RunWith(PowerMockRunner::class)
 class MsgSettingUserOptionsTest : DanaRTestBase() {
 
     @Test fun runTest() {
diff --git a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusBasicTest.kt b/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusBasicTest.kt
index 910e84830f..939eb466f7 100644
--- a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusBasicTest.kt
+++ b/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusBasicTest.kt
@@ -3,10 +3,7 @@ package info.nightscout.androidaps.plugins.pump.danaR.comm
 import info.nightscout.androidaps.danar.comm.MsgStatusBasic
 import org.junit.Assert
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.powermock.modules.junit4.PowerMockRunner
 
-@RunWith(PowerMockRunner::class)
 class MsgStatusBasicTest : DanaRTestBase() {
 
     @Test fun runTest() {
diff --git a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusBolusExtendedTest.kt b/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusBolusExtendedTest.kt
index fb2687ff6a..9f2390dc56 100644
--- a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusBolusExtendedTest.kt
+++ b/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusBolusExtendedTest.kt
@@ -4,10 +4,7 @@ import info.nightscout.androidaps.danar.comm.MsgStatusBolusExtended
 import info.nightscout.androidaps.utils.T
 import org.junit.Assert
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.powermock.modules.junit4.PowerMockRunner
 
-@RunWith(PowerMockRunner::class)
 class MsgStatusBolusExtendedTest : DanaRTestBase() {
 
     @Test
diff --git a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusProfileTest.kt b/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusProfileTest.kt
index 3872536d6e..2e467936f9 100644
--- a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusProfileTest.kt
+++ b/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusProfileTest.kt
@@ -4,10 +4,7 @@ import info.nightscout.androidaps.dana.DanaPump
 import info.nightscout.androidaps.danar.comm.MsgStatusProfile
 import org.junit.Assert
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.powermock.modules.junit4.PowerMockRunner
 
-@RunWith(PowerMockRunner::class)
 class MsgStatusProfileTest : DanaRTestBase() {
 
     @Test fun runTest() {
diff --git a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusTempBasalTest.kt b/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusTempBasalTest.kt
index f2a63b72ac..06cd1c5863 100644
--- a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusTempBasalTest.kt
+++ b/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusTempBasalTest.kt
@@ -3,10 +3,7 @@ package info.nightscout.androidaps.plugins.pump.danaR.comm
 import info.nightscout.androidaps.danar.comm.MsgStatusTempBasal
 import org.junit.Assert
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.powermock.modules.junit4.PowerMockRunner
 
-@RunWith(PowerMockRunner::class)
 class MsgStatusTempBasalTest : DanaRTestBase() {
 
     @Test fun runTest() {
diff --git a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusTest.kt b/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusTest.kt
index ad8ef6a2d1..f8161b507d 100644
--- a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusTest.kt
+++ b/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusTest.kt
@@ -3,10 +3,7 @@ package info.nightscout.androidaps.plugins.pump.danaR.comm
 import info.nightscout.androidaps.danar.comm.MsgStatus
 import org.junit.Assert
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.powermock.modules.junit4.PowerMockRunner
 
-@RunWith(PowerMockRunner::class)
 class MsgStatusTest : DanaRTestBase() {
 
     @Test fun runTest() {
diff --git a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaRKorean/DanaRKoreanPluginTest.kt b/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaRKorean/DanaRKoreanPluginTest.kt
index e1762ddc6d..b118854394 100644
--- a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaRKorean/DanaRKoreanPluginTest.kt
+++ b/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaRKorean/DanaRKoreanPluginTest.kt
@@ -17,14 +17,9 @@ import info.nightscout.androidaps.utils.sharedPreferences.SP
 import org.junit.Assert
 import org.junit.Before
 import org.junit.Test
-import org.junit.runner.RunWith
 import org.mockito.Mock
 import org.mockito.Mockito.`when`
-import org.powermock.core.classloader.annotations.PrepareForTest
-import org.powermock.modules.junit4.PowerMockRunner
 
-@RunWith(PowerMockRunner::class)
-@PrepareForTest(SP::class, ConstraintChecker::class)
 class DanaRKoreanPluginTest : TestBaseWithProfile() {
 
     @Mock lateinit var context: Context
diff --git a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MessageHashTableRKoreanTest.kt b/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MessageHashTableRKoreanTest.kt
index 2b8bcc6ae1..3d23027a0e 100644
--- a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MessageHashTableRKoreanTest.kt
+++ b/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MessageHashTableRKoreanTest.kt
@@ -5,11 +5,8 @@ import info.nightscout.androidaps.interfaces.Constraint
 import info.nightscout.androidaps.plugins.pump.danaR.comm.DanaRTestBase
 import org.junit.Assert
 import org.junit.Test
-import org.junit.runner.RunWith
 import org.mockito.Mockito
-import org.powermock.modules.junit4.PowerMockRunner
 
-@RunWith(PowerMockRunner::class)
 class MessageHashTableRKoreanTest : DanaRTestBase() {
 
     @Test fun runTest() {
diff --git a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/DanaRv2PluginTest.kt b/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/DanaRv2PluginTest.kt
index bbdaececa1..674b82943d 100644
--- a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/DanaRv2PluginTest.kt
+++ b/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/DanaRv2PluginTest.kt
@@ -18,14 +18,9 @@ import info.nightscout.androidaps.plugins.pump.common.bolusInfo.TemporaryBasalSt
 import info.nightscout.androidaps.utils.sharedPreferences.SP
 import org.junit.Before
 import org.junit.Test
-import org.junit.runner.RunWith
 import org.mockito.Mock
 import org.mockito.Mockito.`when`
-import org.powermock.core.classloader.annotations.PrepareForTest
-import org.powermock.modules.junit4.PowerMockRunner
 
-@RunWith(PowerMockRunner::class)
-@PrepareForTest(ConstraintChecker::class, DetailedBolusInfoStorage::class, TemporaryBasalStorage::class)
 class DanaRv2PluginTest : TestBaseWithProfile() {
 
     @Mock lateinit var context: Context
diff --git a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MessageHashTableRv2Test.kt b/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MessageHashTableRv2Test.kt
index 328b698dd8..8fc5853a0c 100644
--- a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MessageHashTableRv2Test.kt
+++ b/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MessageHashTableRv2Test.kt
@@ -7,11 +7,8 @@ import info.nightscout.androidaps.interfaces.Constraint
 import info.nightscout.androidaps.plugins.pump.danaR.comm.DanaRTestBase
 import org.junit.Assert
 import org.junit.Test
-import org.junit.runner.RunWith
 import org.mockito.Mockito.`when`
-import org.powermock.modules.junit4.PowerMockRunner
 
-@RunWith(PowerMockRunner::class)
 class MessageHashTableRv2Test : DanaRTestBase() {
 
     @Test
diff --git a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgCheckValueRv2Test.kt b/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgCheckValueRv2Test.kt
index 9a85644f8a..2b8abf85b7 100644
--- a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgCheckValueRv2Test.kt
+++ b/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgCheckValueRv2Test.kt
@@ -5,10 +5,7 @@ import info.nightscout.androidaps.danaRv2.comm.MsgCheckValue_v2
 import info.nightscout.androidaps.plugins.pump.danaR.comm.DanaRTestBase
 import org.junit.Assert
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.powermock.modules.junit4.PowerMockRunner
 
-@RunWith(PowerMockRunner::class)
 class MsgCheckValueRv2Test : DanaRTestBase() {
 
     @Test
diff --git a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgHistoryEventsRv2Test.kt b/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgHistoryEventsRv2Test.kt
index e76e29fa6e..90f0def7df 100644
--- a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgHistoryEventsRv2Test.kt
+++ b/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgHistoryEventsRv2Test.kt
@@ -1,19 +1,13 @@
 package info.nightscout.androidaps.plugins.pump.danaRv2.comm
 
 import info.nightscout.androidaps.danaRv2.comm.MsgHistoryEvents_v2
-import info.nightscout.androidaps.plugins.pump.common.bolusInfo.DetailedBolusInfoStorage
 import info.nightscout.androidaps.plugins.pump.danaR.comm.DanaRTestBase
 import org.junit.Assert
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.powermock.core.classloader.annotations.PrepareForTest
-import org.powermock.modules.junit4.PowerMockRunner
 
-@RunWith(PowerMockRunner::class)
-@PrepareForTest(DetailedBolusInfoStorage::class)
 class MsgHistoryEventsRv2Test : DanaRTestBase() {
 
-    @Test @Throws(Exception::class) fun runTest() {
+    @Test fun runTest() {
         val packet = MsgHistoryEvents_v2(injector, 0)
 
         // test message decoding
diff --git a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgSetAPSTempBasalStartRv2Test.kt b/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgSetAPSTempBasalStartRv2Test.kt
index 53a52638a7..d55fb9ddb5 100644
--- a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgSetAPSTempBasalStartRv2Test.kt
+++ b/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgSetAPSTempBasalStartRv2Test.kt
@@ -4,10 +4,7 @@ import info.nightscout.androidaps.danaRv2.comm.MsgSetAPSTempBasalStart_v2
 import info.nightscout.androidaps.plugins.pump.danaR.comm.DanaRTestBase
 import org.junit.Assert
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.powermock.modules.junit4.PowerMockRunner
 
-@RunWith(PowerMockRunner::class)
 class MsgSetAPSTempBasalStartRv2Test : DanaRTestBase() {
 
     @Test fun runTest() {
diff --git a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgSetHistoryEntryRv2Test.kt b/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgSetHistoryEntryRv2Test.kt
index acc24a0fea..5f33449601 100644
--- a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgSetHistoryEntryRv2Test.kt
+++ b/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgSetHistoryEntryRv2Test.kt
@@ -4,10 +4,7 @@ import info.nightscout.androidaps.danaRv2.comm.MsgSetHistoryEntry_v2
 import info.nightscout.androidaps.plugins.pump.danaR.comm.DanaRTestBase
 import org.junit.Assert
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.powermock.modules.junit4.PowerMockRunner
 
-@RunWith(PowerMockRunner::class)
 class MsgSetHistoryEntryRv2Test : DanaRTestBase() {
 
     @Test fun runTest() {
diff --git a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgStatusAPSRv2Test.kt b/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgStatusAPSRv2Test.kt
index ed0d4edb65..ce8c4bf93e 100644
--- a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgStatusAPSRv2Test.kt
+++ b/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgStatusAPSRv2Test.kt
@@ -4,10 +4,7 @@ import info.nightscout.androidaps.danaRv2.comm.MsgStatusAPS_v2
 import info.nightscout.androidaps.plugins.pump.danaR.comm.DanaRTestBase
 import org.junit.Assert
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.powermock.modules.junit4.PowerMockRunner
 
-@RunWith(PowerMockRunner::class)
 class MsgStatusAPSRv2Test : DanaRTestBase() {
 
     @Test
diff --git a/danars/build.gradle b/danars/build.gradle
index 9ac3aa3f9a..a754c4b87e 100644
--- a/danars/build.gradle
+++ b/danars/build.gradle
@@ -1,18 +1,18 @@
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-kapt'
+apply plugin: 'kotlin-allopen'
 apply plugin: 'com.hiya.jacoco-android'
 
 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"
 
 android {
     ndkVersion "21.1.6352462"
 
     defaultConfig {
-        versionCode 1
-        versionName "1.0"
 
         ndk {
             moduleName "BleCommandUtil"
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 fdd97c7a4a..896f456d68 100644
--- a/danars/src/main/java/info/nightscout/androidaps/danars/DanaRSPlugin.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/DanaRSPlugin.kt
@@ -8,14 +8,17 @@ import android.os.IBinder
 import android.text.format.DateFormat
 import androidx.preference.Preference
 import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.dana.DanaFragment
 import info.nightscout.androidaps.dana.DanaPump
+import info.nightscout.androidaps.dana.comm.RecordTypes
 import info.nightscout.androidaps.danars.events.EventDanaRSDeviceChange
 import info.nightscout.androidaps.danars.services.DanaRSService
 import info.nightscout.androidaps.data.DetailedBolusInfo
-import info.nightscout.androidaps.interfaces.Profile
 import info.nightscout.androidaps.data.PumpEnactResult
 import info.nightscout.androidaps.events.EventAppExit
 import info.nightscout.androidaps.events.EventConfigBuilderChange
+import info.nightscout.androidaps.extensions.convertedToAbsolute
+import info.nightscout.androidaps.extensions.plannedRemainingMinutes
 import info.nightscout.androidaps.interfaces.*
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
@@ -30,13 +33,12 @@ import info.nightscout.androidaps.plugins.pump.common.bolusInfo.DetailedBolusInf
 import info.nightscout.androidaps.plugins.pump.common.bolusInfo.TemporaryBasalStorage
 import info.nightscout.androidaps.plugins.pump.common.defs.PumpType
 import info.nightscout.androidaps.utils.*
-import info.nightscout.androidaps.utils.T.Companion.mins
-import info.nightscout.androidaps.extensions.convertedToAbsolute
-import info.nightscout.androidaps.extensions.plannedRemainingMinutes
+import info.nightscout.androidaps.utils.T
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import info.nightscout.androidaps.utils.rx.AapsSchedulers
 import info.nightscout.androidaps.utils.sharedPreferences.SP
 import io.reactivex.disposables.CompositeDisposable
+import io.reactivex.rxkotlin.plusAssign
 import org.json.JSONException
 import org.json.JSONObject
 import javax.inject.Inject
@@ -62,14 +64,16 @@ class DanaRSPlugin @Inject constructor(
     private val temporaryBasalStorage: TemporaryBasalStorage,
     private val fabricPrivacy: FabricPrivacy,
     private val dateUtil: DateUtil
-) : PumpPluginBase(PluginDescription()
-    .mainType(PluginType.PUMP)
-    .fragmentClass(info.nightscout.androidaps.dana.DanaFragment::class.java.name)
-    .pluginIcon(R.drawable.ic_danars_128)
-    .pluginName(R.string.danarspump)
-    .shortName(R.string.danarspump_shortname)
-    .preferencesId(R.xml.pref_danars)
-    .description(R.string.description_pump_dana_rs),
+) : PumpPluginBase(
+    PluginDescription()
+        .mainType(PluginType.PUMP)
+        .fragmentClass(DanaFragment::class.java.name)
+        .pluginIcon(R.drawable.ic_danai_128)
+        .pluginIcon2(R.drawable.ic_danars_128)
+        .pluginName(R.string.danarspump)
+        .shortName(R.string.danarspump_shortname)
+        .preferencesId(R.xml.pref_danars)
+        .description(R.string.description_pump_dana_rs),
     injector, aapsLogger, resourceHelper, commandQueue
 ), Pump, Dana, Constraints {
 
@@ -93,25 +97,21 @@ class DanaRSPlugin @Inject constructor(
         super.onStart()
         val intent = Intent(context, DanaRSService::class.java)
         context.bindService(intent, mConnection, Context.BIND_AUTO_CREATE)
-        disposable.add(rxBus
+        disposable += rxBus
             .toObservable(EventAppExit::class.java)
             .observeOn(aapsSchedulers.io)
             .subscribe({ context.unbindService(mConnection) }, fabricPrivacy::logException)
-        )
-        disposable.add(rxBus
+        disposable += rxBus
             .toObservable(EventConfigBuilderChange::class.java)
             .observeOn(aapsSchedulers.io)
             .subscribe { danaPump.reset() }
-        )
-        disposable.add(rxBus
+        disposable += rxBus
             .toObservable(EventDanaRSDeviceChange::class.java)
             .observeOn(aapsSchedulers.io)
             .subscribe({
                 pumpSync.connectNewPump()
                 changePump()
-
             }, fabricPrivacy::logException)
-        )
         changePump() // load device name
     }
 
@@ -141,7 +141,6 @@ class DanaRSPlugin @Inject constructor(
         commandQueue.readStatus("DeviceChanged", null)
     }
 
-    @kotlin.ExperimentalStdlibApi
     override fun connect(reason: String) {
         aapsLogger.debug(LTag.PUMP, "RS connect from: $reason")
         if (danaRSService != null && mDeviceAddress != "" && mDeviceName != "") {
@@ -371,7 +370,7 @@ class DanaRSPlugin @Inject constructor(
                     }
                 }
             }
-            temporaryBasalStorage.add(PumpSync.PumpState.TemporaryBasal(dateUtil.now(), mins(durationInMinutes.toLong()).msecs(), percentRate.toDouble(), false, tbrType, 0L, 0L))
+            temporaryBasalStorage.add(PumpSync.PumpState.TemporaryBasal(dateUtil.now(), T.mins(durationInMinutes.toLong()).msecs(), percentRate.toDouble(), false, tbrType, 0L, 0L))
             // Convert duration from minutes to hours
             aapsLogger.debug(LTag.PUMP, "setTempBasalAbsolute: Setting temp basal $percentRate% for $durationInMinutes minutes (doLowTemp || doHighTemp)")
             result = if (percentRate == 0 && durationInMinutes > 30) {
@@ -418,7 +417,7 @@ class DanaRSPlugin @Inject constructor(
             aapsLogger.debug(LTag.PUMP, "setTempBasalPercent: Correct value already set")
             return result
         }
-        temporaryBasalStorage.add(PumpSync.PumpState.TemporaryBasal(dateUtil.now(), mins(durationInMinutes.toLong()).msecs(), percent.toDouble(), false, tbrType, 0L, 0L))
+        temporaryBasalStorage.add(PumpSync.PumpState.TemporaryBasal(dateUtil.now(), T.mins(durationInMinutes.toLong()).msecs(), percent.toDouble(), false, tbrType, 0L, 0L))
         val connectionOK: Boolean = if (durationInMinutes == 15 || durationInMinutes == 30) {
             danaRSService?.tempBasalShortDuration(percentAfterConstraint, durationInMinutes)
                 ?: false
@@ -440,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
     }
 
@@ -584,17 +583,9 @@ class DanaRSPlugin @Inject constructor(
         return pumpJson
     }
 
-    override fun manufacturer(): ManufacturerType {
-        return ManufacturerType.Sooil
-    }
-
-    override fun model(): PumpType {
-        return PumpType.DANA_RS
-    }
-
-    override fun serialNumber(): String {
-        return danaPump.serialNumber
-    }
+    override fun manufacturer(): ManufacturerType = ManufacturerType.Sooil
+    override fun model(): PumpType = danaPump.pumpType()
+    override fun serialNumber(): String = danaPump.serialNumber
 
     @Suppress("SpellCheckingInspection")
     override fun shortStatus(veryShort: Boolean): String {
@@ -622,7 +613,7 @@ class DanaRSPlugin @Inject constructor(
     }
 
     override val isFakingTempsByExtendedBoluses: Boolean = false
-    override fun loadTDDs(): PumpEnactResult = loadHistory(info.nightscout.androidaps.dana.comm.RecordTypes.RECORD_TYPE_DAILY)
+    override fun loadTDDs(): PumpEnactResult = loadHistory(RecordTypes.RECORD_TYPE_DAILY)
     override fun canHandleDST(): Boolean = false
     override fun clearPairing() {
         sp.remove(resourceHelper.gs(R.string.key_danars_pairingkey) + mDeviceName)
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/activities/BLEScanActivity.kt b/danars/src/main/java/info/nightscout/androidaps/danars/activities/BLEScanActivity.kt
index 0ed1dbc90a..283ae139e8 100644
--- a/danars/src/main/java/info/nightscout/androidaps/danars/activities/BLEScanActivity.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/activities/BLEScanActivity.kt
@@ -9,6 +9,7 @@ import android.bluetooth.le.ScanResult
 import android.content.pm.ActivityInfo
 import android.os.Bundle
 import android.os.Handler
+import android.os.Looper
 import android.view.View
 import android.view.ViewGroup
 import android.widget.BaseAdapter
@@ -87,7 +88,7 @@ class BLEScanActivity : NoSplashAppCompatActivity() {
             return
         }
         devices.add(item)
-        Handler().post { listAdapter!!.notifyDataSetChanged() }
+        Handler(Looper.getMainLooper()).post { listAdapter?.notifyDataSetChanged() }
     }
 
     private val mBleScanCallback: ScanCallback = object : ScanCallback() {
@@ -172,7 +173,7 @@ class BLEScanActivity : NoSplashAppCompatActivity() {
         override fun hashCode(): Int = device.hashCode()
     }
 
-    private fun isSNCheck(sn: String?): Boolean {
+    private fun isSNCheck(sn: String): Boolean {
         val regex = "^([a-zA-Z]{3})([0-9]{5})([a-zA-Z]{2})$"
         val p = Pattern.compile(regex)
         val m = p.matcher(sn)
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/activities/EnterPinActivity.kt b/danars/src/main/java/info/nightscout/androidaps/danars/activities/EnterPinActivity.kt
index 33268cb1e2..7161850604 100644
--- a/danars/src/main/java/info/nightscout/androidaps/danars/activities/EnterPinActivity.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/activities/EnterPinActivity.kt
@@ -33,7 +33,6 @@ class EnterPinActivity : NoSplashAppCompatActivity() {
 
     private lateinit var binding: DanarsEnterPinActivityBinding
 
-    @kotlin.ExperimentalStdlibApi
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         binding = DanarsEnterPinActivityBinding.inflate(layoutInflater)
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSMessageHashTable.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSMessageHashTable.kt
index 7c7466d9e6..4c7eb50294 100644
--- a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSMessageHashTable.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSMessageHashTable.kt
@@ -10,89 +10,73 @@ class DanaRSMessageHashTable @Inject constructor(
     val injector: HasAndroidInjector
 ) {
 
-    var messages: HashMap<Int, DanaRS_Packet> = HashMap()
+    var messages: HashMap<Int, DanaRSPacket> = HashMap()
 
-    fun put(message: DanaRS_Packet) {
+    fun put(message: DanaRSPacket) {
         messages[message.command] = message
     }
 
-    fun findMessage(command: Int): DanaRS_Packet {
-        return messages[command] ?: DanaRS_Packet(injector)
+    fun findMessage(command: Int): DanaRSPacket {
+        return messages[command] ?: DanaRSPacket(injector)
     }
 
     init {
-        put(DanaRS_Packet_Basal_Set_Cancel_Temporary_Basal(injector))
-        put(DanaRS_Packet_Basal_Get_Basal_Rate(injector))
-        put(DanaRS_Packet_Basal_Get_Profile_Basal_Rate(injector))
-        put(DanaRS_Packet_Basal_Get_Profile_Number(injector))
-        put(DanaRS_Packet_Basal_Set_Basal_Rate(injector, arrayOf()))
-        put(DanaRS_Packet_Basal_Set_Profile_Basal_Rate(injector, 0, arrayOf()))
-        put(DanaRS_Packet_Basal_Set_Profile_Number(injector))
-        put(DanaRS_Packet_Basal_Set_Suspend_Off(injector))
-        put(DanaRS_Packet_Basal_Set_Suspend_On(injector))
-        put(DanaRS_Packet_Basal_Set_Temporary_Basal(injector))
-        put(DanaRS_Packet_Basal_Get_Temporary_Basal_State(injector))
-        put(DanaRS_Packet_Bolus_Get_Bolus_Option(injector))
-        put(DanaRS_Packet_Bolus_Get_Initial_Bolus(injector))
-        put(DanaRS_Packet_Bolus_Get_Calculation_Information(injector))
-        put(DanaRS_Packet_Bolus_Get_Carbohydrate_Calculation_Information(injector))
-        put(DanaRS_Packet_Bolus_Get_CIR_CF_Array(injector))
-        put(DanaRS_Packet_Bolus_Get_24_CIR_CF_Array(injector))
-        put(DanaRS_Packet_Bolus_Get_Dual_Bolus(injector))
-        put(DanaRS_Packet_Bolus_Get_Extended_Bolus(injector))
-        put(DanaRS_Packet_Bolus_Get_Extended_Bolus_State(injector))
-        put(DanaRS_Packet_Bolus_Get_Extended_Menu_Option_State(injector))
-        put(DanaRS_Packet_Bolus_Get_Step_Bolus_Information(injector))
-        put(DanaRS_Packet_Bolus_Set_Bolus_Option(injector))
-        put(DanaRS_Packet_Bolus_Set_Initial_Bolus(injector))
-        put(DanaRS_Packet_Bolus_Set_CIR_CF_Array(injector))
-        put(DanaRS_Packet_Bolus_Set_24_CIR_CF_Array(injector, null))
-        put(DanaRS_Packet_Bolus_Set_Dual_Bolus(injector))
-        put(DanaRS_Packet_Bolus_Set_Extended_Bolus(injector))
-        put(DanaRS_Packet_Bolus_Set_Extended_Bolus_Cancel(injector))
-        put(DanaRS_Packet_Bolus_Set_Step_Bolus_Start(injector))
-        put(DanaRS_Packet_Bolus_Set_Step_Bolus_Stop(injector))
-        put(DanaRS_Packet_Etc_Keep_Connection(injector))
-        put(DanaRS_Packet_Etc_Set_History_Save(injector))
-        put(DanaRS_Packet_General_Delivery_Status(injector))
-        put(DanaRS_Packet_General_Get_Password(injector))
-        put(DanaRS_Packet_General_Initial_Screen_Information(injector))
-        put(DanaRS_Packet_Notify_Alarm(injector))
-        put(DanaRS_Packet_Notify_Delivery_Complete(injector))
-        put(DanaRS_Packet_Notify_Delivery_Rate_Display(injector))
-        put(DanaRS_Packet_Notify_Missed_Bolus_Alarm(injector))
-        put(DanaRS_Packet_Option_Get_Pump_Time(injector))
-        put(DanaRS_Packet_Option_Get_Pump_UTC_And_TimeZone(injector))
-        put(DanaRS_Packet_Option_Get_User_Option(injector))
-        put(DanaRS_Packet_Option_Set_Pump_Time(injector))
-        put(DanaRS_Packet_Option_Set_Pump_UTC_And_TimeZone(injector))
-        put(DanaRS_Packet_Option_Set_User_Option(injector))
+        put(DanaRSPacketBasalSetCancelTemporaryBasal(injector))
+        put(DanaRSPacketBasalGetBasalRate(injector))
+        put(DanaRSPacketBasalGetProfileNumber(injector))
+        put(DanaRSPacketBasalSetProfileBasalRate(injector, 0, arrayOf()))
+        put(DanaRSPacketBasalSetProfileNumber(injector))
+        put(DanaRSPacketBasalSetSuspendOff(injector))
+        put(DanaRSPacketBasalSetSuspendOn(injector))
+        put(DanaRSPacketBasalSetTemporaryBasal(injector))
+        put(DanaRSPacketBolusGetBolusOption(injector))
+        put(DanaRSPacketBolusGetCalculationInformation(injector))
+        put(DanaRSPacketBolusGetCIRCFArray(injector))
+        put(DanaRSPacketBolusGetStepBolusInformation(injector))
+        put(DanaRSPacketBolusSetBolusOption(injector))
+        put(DanaRSPacketBolusSet24CIRCFArray(injector, null))
+        put(DanaRSPacketBolusGet24CIRCFArray(injector))
+        put(DanaRSPacketBolusSetExtendedBolus(injector))
+        put(DanaRSPacketBolusSetExtendedBolusCancel(injector))
+        put(DanaRSPacketBolusSetStepBolusStart(injector))
+        put(DanaRSPacketBolusSetStepBolusStop(injector))
+        put(DanaRSPacketEtcKeepConnection(injector))
+        put(DanaRSPacketEtcSetHistorySave(injector))
+        put(DanaRSPacketGeneralInitialScreenInformation(injector))
+        put(DanaRSPacketNotifyAlarm(injector))
+        put(DanaRSPacketNotifyDeliveryComplete(injector))
+        put(DanaRSPacketNotifyDeliveryRateDisplay(injector))
+        put(DanaRSPacketNotifyMissedBolusAlarm(injector))
+        put(DanaRSPacketOptionGetPumpTime(injector))
+        put(DanaRSPacketOptionGetPumpUTCAndTimeZone(injector))
+        put(DanaRSPacketOptionGetUserOption(injector))
+        put(DanaRSPacketOptionSetPumpTime(injector))
+        put(DanaRSPacketOptionSetPumpUTCAndTimeZone(injector))
+        put(DanaRSPacketOptionSetUserOption(injector))
         //put(new DanaRS_Packet_History_(injector));
-        put(DanaRS_Packet_History_Alarm(injector))
-        put(DanaRS_Packet_History_All_History(injector))
-        put(DanaRS_Packet_History_Basal(injector))
-        put(DanaRS_Packet_History_Blood_Glucose(injector))
-        put(DanaRS_Packet_History_Bolus(injector))
-        put(DanaRS_Packet_Review_Bolus_Avg(injector))
-        put(DanaRS_Packet_History_Carbohydrate(injector))
-        put(DanaRS_Packet_History_Daily(injector))
-        put(DanaRS_Packet_General_Get_More_Information(injector))
-        put(DanaRS_Packet_General_Get_Pump_Check(injector))
-        put(DanaRS_Packet_General_Get_Shipping_Information(injector))
-        put(DanaRS_Packet_General_Get_Today_Delivery_Total(injector))
-        put(DanaRS_Packet_General_Get_User_Time_Change_Flag(injector))
-        put(DanaRS_Packet_History_Prime(injector))
-        put(DanaRS_Packet_History_Refill(injector))
-        put(DanaRS_Packet_General_Set_History_Upload_Mode(injector))
-        put(DanaRS_Packet_General_Set_User_Time_Change_Flag_Clear(injector))
-        put(DanaRS_Packet_History_Suspend(injector))
-        put(DanaRS_Packet_History_Temporary(injector))
+        put(DanaRSPacketHistoryAlarm(injector))
+        put(DanaRSPacketHistoryAllHistory(injector))
+        put(DanaRSPacketHistoryBasal(injector))
+        put(DanaRSPacketHistoryBloodGlucose(injector))
+        put(DanaRSPacketHistoryBolus(injector))
+        put(DanaRSPacketReviewBolusAvg(injector))
+        put(DanaRSPacketHistoryCarbohydrate(injector))
+        put(DanaRSPacketHistoryDaily(injector))
+        put(DanaRSPacketHistoryPrime(injector))
+        put(DanaRSPacketHistoryRefill(injector))
+        put(DanaRSPacketHistorySuspend(injector))
+        put(DanaRSPacketHistoryTemporary(injector))
+        put(DanaRSPacketGeneralGetPumpCheck(injector))
+        put(DanaRSPacketGeneralGetShippingInformation(injector))
+        put(DanaRSPacketGeneralGetUserTimeChangeFlag(injector))
+        put(DanaRSPacketGeneralSetHistoryUploadMode(injector))
+        put(DanaRSPacketGeneralSetUserTimeChangeFlagClear(injector))
         // APS
-        put(DanaRS_Packet_APS_Basal_Set_Temporary_Basal(injector, 0))
-        put(DanaRS_Packet_APS_History_Events(injector, 0))
-        put(DanaRS_Packet_APS_Set_Event_History(injector, 0, 0, 0, 0))
+        put(DanaRSPacketAPSBasalSetTemporaryBasal(injector, 0))
+        put(DanaRSPacketAPSHistoryEvents(injector, 0))
+        put(DanaRSPacketAPSSetEventHistory(injector, 0, 0, 0, 0))
         // v3
-        put(DanaRS_Packet_General_Get_Shipping_Version(injector))
-        put(DanaRS_Packet_Review_Get_Pump_Dec_Ratio(injector))
+        put(DanaRSPacketGeneralGetShippingVersion(injector))
+        put(DanaRSPacketReviewGetPumpDecRatio(injector))
     }
 }
\ No newline at end of file
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacket.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacket.kt
new file mode 100644
index 0000000000..918bb78207
--- /dev/null
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacket.kt
@@ -0,0 +1,157 @@
+package info.nightscout.androidaps.danars.comm
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.danars.encryption.BleEncryption
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.utils.DateUtil
+import org.joda.time.DateTime
+import java.nio.charset.StandardCharsets
+import javax.inject.Inject
+
+open class DanaRSPacket(protected var injector: HasAndroidInjector) {
+
+    @Inject lateinit var aapsLogger: AAPSLogger
+    @Inject lateinit var dateUtil: DateUtil
+
+    var isReceived = false
+        private set
+    var failed = false
+    var type = BleEncryption.DANAR_PACKET__TYPE_RESPONSE // most of the messages, should be changed for others
+        protected set
+    var opCode = 0
+        protected set
+
+    fun success(): Boolean = !failed
+
+    fun setReceived() {
+        isReceived = true
+    }
+
+    val command: Int
+        get() = (type and 0xFF shl 8) + (opCode and 0xFF)
+
+    open fun getRequestParams(): ByteArray = ByteArray(0)
+
+    fun getCommand(data: ByteArray): Int {
+        val type = byteArrayToInt(getBytes(data, TYPE_START, 1))
+        val opCode = byteArrayToInt(getBytes(data, OPCODE_START, 1))
+        return (type and 0xFF shl 8) + (opCode and 0xFF)
+    }
+
+    open fun handleMessage(data: ByteArray) {}
+    open fun handleMessageNotReceived() {
+        failed = true
+    }
+
+    open val friendlyName: String = "UNKNOWN_PACKET"
+
+    protected fun getBytes(data: ByteArray, srcStart: Int, srcLength: Int): ByteArray {
+        val ret = ByteArray(srcLength)
+        System.arraycopy(data, srcStart, ret, 0, srcLength)
+        return ret
+    }
+
+    fun dateFromBuff(buff: ByteArray, offset: Int): Long =
+        DateTime(
+            2000 + byteArrayToInt(getBytes(buff, offset, 1)),
+            byteArrayToInt(getBytes(buff, offset + 1, 1)),
+            byteArrayToInt(getBytes(buff, offset + 2, 1)),
+            0,
+            0
+        ).millis
+
+    protected fun byteArrayToInt(b: ByteArray): Int =
+        when (b.size) {
+            1    -> b[0].toInt() and 0xFF
+            2    -> (b[1].toInt() and 0xFF shl 8) + (b[0].toInt() and 0xFF)
+            3    -> (b[2].toInt() and 0xFF shl 16) + (b[1].toInt() and 0xFF shl 8) + (b[0].toInt() and 0xFF)
+            4    -> (b[3].toInt() and 0xFF shl 24) + (b[2].toInt() and 0xFF shl 16) + (b[1].toInt() and 0xFF shl 8) + (b[0].toInt() and 0xFF)
+            else -> -1
+        }
+
+    @Synchronized fun dateTimeSecFromBuff(buff: ByteArray, offset: Int): Long =
+        DateTime(
+            2000 + intFromBuff(buff, offset, 1),
+            intFromBuff(buff, offset + 1, 1),
+            intFromBuff(buff, offset + 2, 1),
+            intFromBuff(buff, offset + 3, 1),
+            intFromBuff(buff, offset + 4, 1),
+            intFromBuff(buff, offset + 5, 1)
+        ).millis
+
+    protected fun intFromBuff(b: ByteArray, srcStart: Int, srcLength: Int): Int =
+        when (srcLength) {
+            1    -> b[DATA_START + srcStart + 0].toInt() and 0xFF
+            2    -> (b[DATA_START + srcStart + 1].toInt() and 0xFF shl 8) + (b[DATA_START + srcStart + 0].toInt() and 0xFF)
+            3    -> (b[DATA_START + srcStart + 2].toInt() and 0xFF shl 16) + (b[DATA_START + srcStart + 1].toInt() and 0xFF shl 8) + (b[DATA_START + srcStart + 0].toInt() and 0xFF)
+            4    -> (b[DATA_START + srcStart + 3].toInt() and 0xFF shl 24) + (b[DATA_START + srcStart + 2].toInt() and 0xFF shl 16) + (b[DATA_START + srcStart + 1].toInt() and 0xFF shl 8) + (b[DATA_START + srcStart + 0].toInt() and 0xFF)
+            else -> -1
+        }
+
+    protected fun intFromBuffMsbLsb(b: ByteArray, srcStart: Int, srcLength: Int): Int =
+        when (srcLength) {
+            1    -> b[DATA_START + srcStart].toInt() and 0xFF
+            2    -> (b[DATA_START + srcStart].toInt() and 0xFF shl 8) + (b[DATA_START + srcStart + 1].toInt() and 0xFF)
+            3    -> (b[DATA_START + srcStart].toInt() and 0xFF shl 16) + (b[DATA_START + srcStart + 1].toInt() and 0xFF shl 8) + (b[DATA_START + srcStart + 2].toInt() and 0xFF)
+            4    -> (b[DATA_START + srcStart].toInt() and 0xFF shl 24) + (b[DATA_START + srcStart + 1].toInt() and 0xFF shl 16) + (b[DATA_START + srcStart + 2].toInt() and 0xFF shl 8) + (b[DATA_START + srcStart + 3].toInt() and 0xFF)
+            else -> -1
+        }
+
+    fun stringFromBuff(buff: ByteArray, offset: Int, length: Int): String {
+        val stringBuff = ByteArray(length)
+        System.arraycopy(buff, offset, stringBuff, 0, length)
+        return String(stringBuff, StandardCharsets.UTF_8)
+    }
+
+    companion object {
+
+        private const val TYPE_START = 0
+        private const val OPCODE_START = 1
+        const val DATA_START = 2
+
+        fun asciiStringFromBuff(buff: ByteArray, offset: Int, length: Int): String {
+            val stringBuff = ByteArray(length)
+            System.arraycopy(buff, offset, stringBuff, 0, length)
+            return String(stringBuff, StandardCharsets.UTF_8)
+        }
+
+        fun toHexString(buff: ByteArray?): String {
+            if (buff == null) return "null"
+            val sb = StringBuilder()
+            for ((count, element) in buff.withIndex()) {
+                sb.append(String.format("%02X ", element))
+                if ((count + 1) % 4 == 0) sb.append(" ")
+            }
+            return sb.toString()
+        }
+
+        @Suppress("SpellCheckingInspection")
+        private val hexArray = "0123456789ABCDEF".toCharArray()
+        fun bytesToHex(bytes: ByteArray): String {
+            val hexChars = CharArray(bytes.size * 2)
+            for (j in bytes.indices) {
+                val v: Int = bytes[j].toInt() and 0xFF
+                hexChars[j * 2] = hexArray[v ushr 4]
+                hexChars[j * 2 + 1] = hexArray[v and 0x0F]
+            }
+            return String(hexChars)
+        }
+
+        fun hexToBytes(s: String): ByteArray {
+            val len = s.length
+            val data = ByteArray(len / 2)
+            var i = 0
+            while (i < len) {
+                data[i / 2] = ((Character.digit(s[i], 16) shl 4)
+                    + Character.digit(s[i + 1], 16)).toByte()
+                i += 2
+            }
+            return data
+        }
+    }
+
+    init {
+        @Suppress("LeakingThis")
+        injector.androidInjector().inject(this)
+    }
+}
\ No newline at end of file
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_APS_Basal_Set_Temporary_Basal.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketAPSBasalSetTemporaryBasal.kt
similarity index 91%
rename from danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_APS_Basal_Set_Temporary_Basal.kt
rename to danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketAPSBasalSetTemporaryBasal.kt
index ab1649f380..bf490138a2 100644
--- a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_APS_Basal_Set_Temporary_Basal.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketAPSBasalSetTemporaryBasal.kt
@@ -4,10 +4,10 @@ import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.danars.encryption.BleEncryption
 
-class DanaRS_Packet_APS_Basal_Set_Temporary_Basal(
+class DanaRSPacketAPSBasalSetTemporaryBasal(
     injector: HasAndroidInjector,
     private var percent: Int
-) : DanaRS_Packet(injector) {
+) : DanaRSPacket(injector) {
 
     var temporaryBasalRatio = 0
     var temporaryBasalDuration = 0
@@ -48,11 +48,10 @@ class DanaRS_Packet_APS_Basal_Set_Temporary_Basal(
         }
     }
 
-    override fun getFriendlyName(): String {
-        return "BASAL__APS_SET_TEMPORARY_BASAL"
-    }
+    override val friendlyName: String = "BASAL__APS_SET_TEMPORARY_BASAL"
 
     companion object {
+
         const val PARAM30MIN = 160
         const val PARAM15MIN = 150
     }
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_APS_History_Events.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketAPSHistoryEvents.kt
similarity index 72%
rename from danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_APS_History_Events.kt
rename to danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketAPSHistoryEvents.kt
index 5e6b49a66a..dbfbf8dc6f 100644
--- a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_APS_History_Events.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketAPSHistoryEvents.kt
@@ -19,10 +19,10 @@ import org.joda.time.DateTime
 import org.joda.time.DateTimeZone
 import javax.inject.Inject
 
-open class DanaRS_Packet_APS_History_Events(
+open class DanaRSPacketAPSHistoryEvents(
     injector: HasAndroidInjector,
     private var from: Long
-) : DanaRS_Packet(injector) {
+) : DanaRSPacket(injector) {
 
     @Inject lateinit var rxBus: RxBusWrapper
     @Inject lateinit var resourceHelper: ResourceHelper
@@ -86,7 +86,7 @@ open class DanaRS_Packet_APS_History_Events(
                 // but on pump is running
                 // at least on Model: 05 Protocol: 10 Code: 10
                 if (index > 0 && recordCode(message) == DanaPump.TEMPSTOP) {
-                    val previous = sorted[index-1]
+                    val previous = sorted[index - 1]
                     if (recordCode(previous) == DanaPump.TEMPSTART && dateTime(message) == dateTime(previous)) {
                         aapsLogger.debug(LTag.PUMPCOMM, "SKIPPING EVENT TEMPSTOP (" + recordCode(message) + ") " + dateUtil.dateAndTimeString(dateTime(message)) + " (" + dateTime(message) + ")")
                         continue
@@ -102,31 +102,32 @@ open class DanaRS_Packet_APS_History_Events(
         if (!danaPump.usingUTC) dateTimeSecFromBuff(data, 1) // 6 bytes
         else intFromBuffMsbLsb(data, 3, 4) * 1000L
 
-    fun recordCode(data: ByteArray): Int =
-        intFromBuff(data, 0, 1).toInt()
+    private fun recordCode(data: ByteArray): Int =
+        if (!danaPump.usingUTC)
+            intFromBuff(data, 0, 1)
+        else
+            intFromBuff(data, 2, 1)
 
     fun processMessage(data: ByteArray) {
-        var recordCode = intFromBuff(data, 0, 1).toByte()
+        val recordCode = recordCode(data)
         // Last record
-        if (recordCode == 0xFF.toByte()) {
+        if (recordCode == 0xFF) {
             return
         }
         val datetime: Long
         val param1 = intFromBuffMsbLsb(data, 7, 2)
         val param2 = intFromBuffMsbLsb(data, 9, 2)
         val pumpId: Long
-        var id = 0
         if (!danaPump.usingUTC) {
             datetime = dateTimeSecFromBuff(data, 1) // 6 bytes
             pumpId = datetime
         } else {
             datetime = intFromBuffMsbLsb(data, 3, 4) * 1000L
-            recordCode = intFromBuff(data, 2, 1).toByte()
-            id = intFromBuffMsbLsb(data, 0, 2) // range only 1-2000
-            pumpId = datetime shl 16 + id
+            val id = intFromBuffMsbLsb(data, 0, 2) // range only 1-2000
+            pumpId = datetime * 2 + id
         }
         val status: String
-        when (recordCode.toInt()) {
+        when (recordCode) {
             DanaPump.TEMPSTART         -> {
                 val temporaryBasalInfo = temporaryBasalStorage.findTemporaryBasal(datetime, param1.toDouble())
                 val newRecord = pumpSync.syncTemporaryBasalWithPumpId(
@@ -136,9 +137,9 @@ open class DanaRS_Packet_APS_History_Events(
                     isAbsolute = false,
                     type = temporaryBasalInfo?.type,
                     pumpId = pumpId,
-                    pumpType = PumpType.DANA_RS,
+                    pumpType = danaPump.pumpType(),
                     pumpSerial = danaPump.serialNumber)
-                aapsLogger.debug(LTag.PUMPCOMM, "[" + id + "] " + (if (newRecord) "**NEW** " else "") + "EVENT TEMPSTART (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Ratio: " + param1 + "% Duration: " + param2 + "min")
+                aapsLogger.debug(LTag.PUMPCOMM, "[" + pumpId + "] " + (if (newRecord) "**NEW** " else "") + "EVENT TEMPSTART (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Ratio: " + param1 + "% Duration: " + param2 + "min")
                 status = "TEMPSTART " + dateUtil.timeString(datetime)
             }
 
@@ -146,9 +147,9 @@ open class DanaRS_Packet_APS_History_Events(
                 val newRecord = pumpSync.syncStopTemporaryBasalWithPumpId(
                     timestamp = datetime,
                     endPumpId = pumpId,
-                    pumpType = PumpType.DANA_RS,
+                    pumpType = danaPump.pumpType(),
                     pumpSerial = danaPump.serialNumber)
-                aapsLogger.debug(LTag.PUMPCOMM, "[" + id + "] " + (if (newRecord) "**NEW** " else "") + "EVENT TEMPSTOP (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")")
+                aapsLogger.debug(LTag.PUMPCOMM, "[" + pumpId + "] " + (if (newRecord) "**NEW** " else "") + "EVENT TEMPSTOP (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")")
                 status = "TEMPSTOP " + dateUtil.timeString(datetime)
             }
 
@@ -159,9 +160,9 @@ open class DanaRS_Packet_APS_History_Events(
                     duration = T.mins(param2.toLong()).msecs(),
                     isEmulatingTB = false,
                     pumpId = pumpId,
-                    pumpType = PumpType.DANA_RS,
+                    pumpType = danaPump.pumpType(),
                     pumpSerial = danaPump.serialNumber)
-                aapsLogger.debug(LTag.PUMPCOMM, "[" + id + "] " + (if (newRecord) "**NEW** " else "") + "EVENT EXTENDEDSTART (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Amount: " + param1 / 100.0 + "U Duration: " + param2 + "min")
+                aapsLogger.debug(LTag.PUMPCOMM, "[" + pumpId + "] " + (if (newRecord) "**NEW** " else "") + "EVENT EXTENDEDSTART (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Amount: " + param1 / 100.0 + "U Duration: " + param2 + "min")
                 status = "EXTENDEDSTART " + dateUtil.timeString(datetime)
             }
 
@@ -169,9 +170,9 @@ open class DanaRS_Packet_APS_History_Events(
                 val newRecord = pumpSync.syncStopExtendedBolusWithPumpId(
                     timestamp = datetime,
                     endPumpId = pumpId,
-                    pumpType = PumpType.DANA_RS,
+                    pumpType = danaPump.pumpType(),
                     pumpSerial = danaPump.serialNumber)
-                aapsLogger.debug(LTag.PUMPCOMM, "[" + id + "] " + (if (newRecord) "**NEW** " else "") + "EVENT EXTENDEDSTOP (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Delivered: " + param1 / 100.0 + "U RealDuration: " + param2 + "min")
+                aapsLogger.debug(LTag.PUMPCOMM, "[" + pumpId + "] " + (if (newRecord) "**NEW** " else "") + "EVENT EXTENDEDSTOP (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Delivered: " + param1 / 100.0 + "U RealDuration: " + param2 + "min")
                 status = "EXTENDEDSTOP " + dateUtil.timeString(datetime)
             }
 
@@ -182,9 +183,9 @@ open class DanaRS_Packet_APS_History_Events(
                     amount = param1 / 100.0,
                     type = detailedBolusInfo?.bolusType,
                     pumpId = pumpId,
-                    pumpType = PumpType.DANA_RS,
+                    pumpType = danaPump.pumpType(),
                     pumpSerial = danaPump.serialNumber)
-                aapsLogger.debug(LTag.PUMPCOMM, "[" + id + "] " + (if (newRecord) "**NEW** " else "") + "EVENT BOLUS (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Bolus: " + param1 / 100.0 + "U ")
+                aapsLogger.debug(LTag.PUMPCOMM, "[" + pumpId + "] " + (if (newRecord) "**NEW** " else "") + "EVENT BOLUS (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Bolus: " + param1 / 100.0 + "U ")
                 status = "BOLUS " + dateUtil.timeString(datetime)
             }
 
@@ -195,9 +196,9 @@ open class DanaRS_Packet_APS_History_Events(
                     amount = param1 / 100.0,
                     type = detailedBolusInfo?.bolusType,
                     pumpId = pumpId,
-                    pumpType = PumpType.DANA_RS,
+                    pumpType = danaPump.pumpType(),
                     pumpSerial = danaPump.serialNumber)
-                aapsLogger.debug(LTag.PUMPCOMM, "[" + id + "] " + (if (newRecord) "**NEW** " else "") + "EVENT DUALBOLUS (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Bolus: " + param1 / 100.0 + "U Duration: " + param2 + "min")
+                aapsLogger.debug(LTag.PUMPCOMM, "[" + pumpId + "] " + (if (newRecord) "**NEW** " else "") + "EVENT DUALBOLUS (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Bolus: " + param1 / 100.0 + "U Duration: " + param2 + "min")
                 status = "DUALBOLUS " + dateUtil.timeString(datetime)
             }
 
@@ -208,9 +209,9 @@ open class DanaRS_Packet_APS_History_Events(
                     duration = T.mins(param2.toLong()).msecs(),
                     isEmulatingTB = false,
                     pumpId = pumpId,
-                    pumpType = PumpType.DANA_RS,
+                    pumpType = danaPump.pumpType(),
                     pumpSerial = danaPump.serialNumber)
-                aapsLogger.debug(LTag.PUMPCOMM, "[" + id + "] " + (if (newRecord) "**NEW** " else "") + "EVENT DUALEXTENDEDSTART (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Amount: " + param1 / 100.0 + "U Duration: " + param2 + "min")
+                aapsLogger.debug(LTag.PUMPCOMM, "[" + pumpId + "] " + (if (newRecord) "**NEW** " else "") + "EVENT DUALEXTENDEDSTART (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Amount: " + param1 / 100.0 + "U Duration: " + param2 + "min")
                 status = "DUALEXTENDEDSTART " + dateUtil.timeString(datetime)
             }
 
@@ -218,19 +219,19 @@ open class DanaRS_Packet_APS_History_Events(
                 val newRecord = pumpSync.syncStopExtendedBolusWithPumpId(
                     timestamp = datetime,
                     endPumpId = pumpId,
-                    pumpType = PumpType.DANA_RS,
+                    pumpType = danaPump.pumpType(),
                     pumpSerial = danaPump.serialNumber)
-                aapsLogger.debug(LTag.PUMPCOMM, "[" + id + "] " + (if (newRecord) "**NEW** " else "") + "EVENT DUALEXTENDEDSTOP (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Delivered: " + param1 / 100.0 + "U RealDuration: " + param2 + "min")
+                aapsLogger.debug(LTag.PUMPCOMM, "[" + pumpId + "] " + (if (newRecord) "**NEW** " else "") + "EVENT DUALEXTENDEDSTOP (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Delivered: " + param1 / 100.0 + "U RealDuration: " + param2 + "min")
                 status = "DUALEXTENDEDSTOP " + dateUtil.timeString(datetime)
             }
 
             DanaPump.SUSPENDON         -> {
-                aapsLogger.debug(LTag.PUMPCOMM, "[" + id + "] " + "EVENT SUSPENDON (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")")
+                aapsLogger.debug(LTag.PUMPCOMM, "[" + pumpId + "] " + "EVENT SUSPENDON (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")")
                 status = "SUSPENDON " + dateUtil.timeString(datetime)
             }
 
             DanaPump.SUSPENDOFF        -> {
-                aapsLogger.debug(LTag.PUMPCOMM, "[" + id + "] " + "EVENT SUSPENDOFF (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")")
+                aapsLogger.debug(LTag.PUMPCOMM, "[" + pumpId + "] " + "EVENT SUSPENDOFF (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")")
                 status = "SUSPENDOFF " + dateUtil.timeString(datetime)
             }
 
@@ -243,18 +244,18 @@ open class DanaRS_Packet_APS_History_Events(
                         pumpType = danaPump.pumpType(),
                         pumpSerial = danaPump.serialNumber
                     )
-                    aapsLogger.debug(LTag.PUMPCOMM, "[" + id + "] " + (if (newRecord) "**NEW** " else "") + "EVENT REFILL (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Amount: " + param1 / 100.0 + "U")
+                    aapsLogger.debug(LTag.PUMPCOMM, "[" + pumpId + "] " + (if (newRecord) "**NEW** " else "") + "EVENT REFILL (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Amount: " + param1 / 100.0 + "U")
                 }
                 status = "REFILL " + dateUtil.timeString(datetime)
             }
 
             DanaPump.PRIME             -> {
-                aapsLogger.debug(LTag.PUMPCOMM, "[" + id + "] " + "EVENT PRIME (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Amount: " + param1 / 100.0 + "U")
+                aapsLogger.debug(LTag.PUMPCOMM, "[" + pumpId + "] " + "EVENT PRIME (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Amount: " + param1 / 100.0 + "U")
                 status = "PRIME " + dateUtil.timeString(datetime)
             }
 
             DanaPump.PROFILECHANGE     -> {
-                aapsLogger.debug(LTag.PUMPCOMM, "[" + id + "] " + "EVENT PROFILECHANGE (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " No: " + param1 + " CurrentRate: " + param2 / 100.0 + "U/h")
+                aapsLogger.debug(LTag.PUMPCOMM, "[" + pumpId + "] " + "EVENT PROFILECHANGE (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " No: " + param1 + " CurrentRate: " + param2 / 100.0 + "U/h")
                 status = "PROFILECHANGE " + dateUtil.timeString(datetime)
             }
 
@@ -263,9 +264,9 @@ open class DanaRS_Packet_APS_History_Events(
                     timestamp = datetime,
                     amount = param1.toDouble(),
                     pumpId = pumpId,
-                    pumpType = PumpType.DANA_RS,
+                    pumpType = danaPump.pumpType(),
                     pumpSerial = danaPump.serialNumber)
-                aapsLogger.debug(LTag.PUMPCOMM, "[" + id + "] " + (if (newRecord) "**NEW** " else "") + "EVENT CARBS (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Carbs: " + param1 + "g")
+                aapsLogger.debug(LTag.PUMPCOMM, "[" + pumpId + "] " + (if (newRecord) "**NEW** " else "") + "EVENT CARBS (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Carbs: " + param1 + "g")
                 status = "CARBS " + dateUtil.timeString(datetime)
             }
 
@@ -278,19 +279,19 @@ open class DanaRS_Packet_APS_History_Events(
                         pumpType = danaPump.pumpType(),
                         pumpSerial = danaPump.serialNumber
                     )
-                    aapsLogger.debug(LTag.PUMPCOMM, "[" + id + "] " + (if (newRecord) "**NEW** " else "") + "EVENT PRIMECANNULA(" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Amount: " + param1 / 100.0 + "U")
+                    aapsLogger.debug(LTag.PUMPCOMM, "[" + pumpId + "] " + (if (newRecord) "**NEW** " else "") + "EVENT PRIMECANNULA(" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Amount: " + param1 / 100.0 + "U")
                 }
                 status = "PRIMECANNULA " + dateUtil.timeString(datetime)
             }
 
             DanaPump.TIMECHANGE        -> {
                 val oldDateTime = intFromBuffMsbLsb(data, 7, 4) * 1000L
-                aapsLogger.debug(LTag.PUMPCOMM, "[" + id + "] " + "EVENT TIMECHANGE(" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Previous: " + dateUtil.dateAndTimeString(oldDateTime))
+                aapsLogger.debug(LTag.PUMPCOMM, "[" + pumpId + "] " + "EVENT TIMECHANGE(" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Previous: " + dateUtil.dateAndTimeString(oldDateTime))
                 status = "TIMECHANGE " + dateUtil.timeString(datetime)
             }
 
             else                       -> {
-                aapsLogger.debug(LTag.PUMPCOMM, "[" + id + "] " + "Event: " + recordCode + " " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Param1: " + param1 + " Param2: " + param2)
+                aapsLogger.debug(LTag.PUMPCOMM, "[" + pumpId + "] " + "Event: " + recordCode + " " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Param1: " + param1 + " Param2: " + param2)
                 status = "UNKNOWN " + dateUtil.timeString(datetime)
             }
         }
@@ -298,7 +299,5 @@ open class DanaRS_Packet_APS_History_Events(
         rxBus.send(EventPumpStatusChanged(resourceHelper.gs(R.string.processinghistory) + ": " + status))
     }
 
-    override fun getFriendlyName(): String {
-        return "APS_HISTORY_EVENTS"
-    }
+    override val friendlyName: String = "APS_HISTORY_EVENTS"
 }
\ No newline at end of file
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_APS_Set_Event_History.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketAPSSetEventHistory.kt
similarity index 92%
rename from danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_APS_Set_Event_History.kt
rename to danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketAPSSetEventHistory.kt
index 802eb09b56..cfa51a9d5e 100644
--- a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_APS_Set_Event_History.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketAPSSetEventHistory.kt
@@ -8,13 +8,13 @@ import org.joda.time.DateTime
 import org.joda.time.DateTimeZone
 import javax.inject.Inject
 
-class DanaRS_Packet_APS_Set_Event_History(
+class DanaRSPacketAPSSetEventHistory(
     injector: HasAndroidInjector,
     private var packetType: Int,
     private var time: Long,
     private var param1: Int,
     private var param2: Int
-) : DanaRS_Packet(injector) {
+) : DanaRSPacket(injector) {
 
     @Inject lateinit var danaPump: DanaPump
 
@@ -54,7 +54,5 @@ class DanaRS_Packet_APS_Set_Event_History(
         }
     }
 
-    override fun getFriendlyName(): String {
-        return "APS_SET_EVENT_HISTORY"
-    }
+    override val friendlyName: String = "APS_SET_EVENT_HISTORY"
 }
\ No newline at end of file
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Basal_Get_Basal_Rate.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBasalGetBasalRate.kt
similarity index 93%
rename from danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Basal_Get_Basal_Rate.kt
rename to danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBasalGetBasalRate.kt
index 64a91766bd..ae9b5a95c9 100644
--- a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Basal_Get_Basal_Rate.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBasalGetBasalRate.kt
@@ -13,9 +13,9 @@ import info.nightscout.androidaps.utils.resources.ResourceHelper
 import java.util.*
 import javax.inject.Inject
 
-class DanaRS_Packet_Basal_Get_Basal_Rate(
+class DanaRSPacketBasalGetBasalRate(
     injector: HasAndroidInjector
-) : DanaRS_Packet(injector) {
+) : DanaRSPacket(injector) {
 
     @Inject lateinit var rxBus: RxBusWrapper
     @Inject lateinit var resourceHelper: ResourceHelper
@@ -55,7 +55,5 @@ class DanaRS_Packet_Basal_Get_Basal_Rate(
         }
     }
 
-    override fun getFriendlyName(): String {
-        return "BASAL__GET_BASAL_RATE"
-    }
+    override val friendlyName: String = "BASAL__GET_BASAL_RATE"
 }
\ No newline at end of file
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Basal_Get_Profile_Number.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBasalGetProfileNumber.kt
similarity index 81%
rename from danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Basal_Get_Profile_Number.kt
rename to danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBasalGetProfileNumber.kt
index 399555e09d..5c0bed60a0 100644
--- a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Basal_Get_Profile_Number.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBasalGetProfileNumber.kt
@@ -6,9 +6,9 @@ import info.nightscout.androidaps.dana.DanaPump
 import info.nightscout.androidaps.danars.encryption.BleEncryption
 import javax.inject.Inject
 
-class DanaRS_Packet_Basal_Get_Profile_Number(
+class DanaRSPacketBasalGetProfileNumber(
     injector: HasAndroidInjector
-) : DanaRS_Packet(injector) {
+) : DanaRSPacket(injector) {
 
     @Inject lateinit var danaPump: DanaPump
 
@@ -22,8 +22,5 @@ class DanaRS_Packet_Basal_Get_Profile_Number(
         aapsLogger.debug(LTag.PUMPCOMM, "Active profile: " + danaPump.activeProfile)
     }
 
-    override fun getFriendlyName(): String {
-        return "BASAL__GET_PROFILE_NUMBER"
-    }
-
+    override val friendlyName: String = "BASAL__GET_PROFILE_NUMBER"
 }
\ No newline at end of file
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Basal_Set_Cancel_Temporary_Basal.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBasalSetCancelTemporaryBasal.kt
similarity index 79%
rename from danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Basal_Set_Cancel_Temporary_Basal.kt
rename to danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBasalSetCancelTemporaryBasal.kt
index e20f2ba80e..e36b027ecb 100644
--- a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Basal_Set_Cancel_Temporary_Basal.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBasalSetCancelTemporaryBasal.kt
@@ -1,12 +1,12 @@
 package info.nightscout.androidaps.danars.comm
 
 import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.danars.encryption.BleEncryption
+import info.nightscout.androidaps.logging.LTag
 
-class DanaRS_Packet_Basal_Set_Cancel_Temporary_Basal(
+class DanaRSPacketBasalSetCancelTemporaryBasal(
     injector: HasAndroidInjector
-) : DanaRS_Packet(injector) {
+) : DanaRSPacket(injector) {
 
     init {
         opCode = BleEncryption.DANAR_PACKET__OPCODE_BASAL__CANCEL_TEMPORARY_BASAL
@@ -24,7 +24,5 @@ class DanaRS_Packet_Basal_Set_Cancel_Temporary_Basal(
         }
     }
 
-    override fun getFriendlyName(): String {
-        return "BASAL__CANCEL_TEMPORARY_BASAL"
-    }
+    override val friendlyName: String = "BASAL__CANCEL_TEMPORARY_BASAL"
 }
\ No newline at end of file
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Basal_Set_Profile_Basal_Rate.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBasalSetProfileBasalRate.kt
similarity index 87%
rename from danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Basal_Set_Profile_Basal_Rate.kt
rename to danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBasalSetProfileBasalRate.kt
index 6d397ca86f..d047e76588 100644
--- a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Basal_Set_Profile_Basal_Rate.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBasalSetProfileBasalRate.kt
@@ -4,11 +4,11 @@ import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.danars.encryption.BleEncryption
 
-class DanaRS_Packet_Basal_Set_Profile_Basal_Rate(
+class DanaRSPacketBasalSetProfileBasalRate(
     injector: HasAndroidInjector,
     private var profileNumber: Int,
     private var profileBasalRate: Array<Double>
-) : DanaRS_Packet(injector) {
+) : DanaRSPacket(injector) {
 
     init {
         opCode = BleEncryption.DANAR_PACKET__OPCODE_BASAL__SET_PROFILE_BASAL_RATE
@@ -31,6 +31,7 @@ class DanaRS_Packet_Basal_Set_Profile_Basal_Rate(
 
     override fun handleMessage(data: ByteArray) {
         val result = intFromBuff(data, 0, 1)
+        @Suppress("LiftReturnOrAssignment")
         if (result == 0) {
             aapsLogger.debug(LTag.PUMPCOMM, "Result OK")
             failed = false
@@ -40,7 +41,5 @@ class DanaRS_Packet_Basal_Set_Profile_Basal_Rate(
         }
     }
 
-    override fun getFriendlyName(): String {
-        return "BASAL__SET_PROFILE_BASAL_RATE"
-    }
+    override val friendlyName: String = "BASAL__SET_PROFILE_BASAL_RATE"
 }
\ No newline at end of file
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Basal_Set_Profile_Number.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBasalSetProfileNumber.kt
similarity index 83%
rename from danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Basal_Set_Profile_Number.kt
rename to danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBasalSetProfileNumber.kt
index 2f88623296..f22b90aee9 100644
--- a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Basal_Set_Profile_Number.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBasalSetProfileNumber.kt
@@ -1,13 +1,13 @@
 package info.nightscout.androidaps.danars.comm
 
 import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.danars.encryption.BleEncryption
+import info.nightscout.androidaps.logging.LTag
 
-class DanaRS_Packet_Basal_Set_Profile_Number(
+class DanaRSPacketBasalSetProfileNumber(
     injector: HasAndroidInjector,
     private var profileNumber: Int = 0
-) : DanaRS_Packet(injector) {
+) : DanaRSPacket(injector) {
 
     init {
         opCode = BleEncryption.DANAR_PACKET__OPCODE_BASAL__SET_PROFILE_NUMBER
@@ -22,6 +22,7 @@ class DanaRS_Packet_Basal_Set_Profile_Number(
 
     override fun handleMessage(data: ByteArray) {
         val result = intFromBuff(data, 0, 1)
+        @Suppress("LiftReturnOrAssignment")
         if (result == 0) {
             aapsLogger.debug(LTag.PUMPCOMM, "Result OK")
             failed = false
@@ -31,7 +32,5 @@ class DanaRS_Packet_Basal_Set_Profile_Number(
         }
     }
 
-    override fun getFriendlyName(): String {
-        return "BASAL__SET_PROFILE_NUMBER"
-    }
+    override val friendlyName: String = "BASAL__SET_PROFILE_NUMBER"
 }
\ No newline at end of file
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Basal_Set_Suspend_Off.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBasalSetSuspendOff.kt
similarity index 80%
rename from danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Basal_Set_Suspend_Off.kt
rename to danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBasalSetSuspendOff.kt
index cdd3b83f2c..644728e2ac 100644
--- a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Basal_Set_Suspend_Off.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBasalSetSuspendOff.kt
@@ -4,9 +4,9 @@ import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.danars.encryption.BleEncryption
 
-class DanaRS_Packet_Basal_Set_Suspend_Off(
+class DanaRSPacketBasalSetSuspendOff(
     injector: HasAndroidInjector
-) : DanaRS_Packet(injector) {
+) : DanaRSPacket(injector) {
 
     init {
         opCode = BleEncryption.DANAR_PACKET__OPCODE_BASAL__SET_SUSPEND_OFF
@@ -15,6 +15,7 @@ class DanaRS_Packet_Basal_Set_Suspend_Off(
 
     override fun handleMessage(data: ByteArray) {
         val result = intFromBuff(data, 0, 1)
+        @Suppress("LiftReturnOrAssignment")
         if (result == 0) {
             aapsLogger.debug(LTag.PUMPCOMM, "Result OK")
             failed = false
@@ -24,7 +25,5 @@ class DanaRS_Packet_Basal_Set_Suspend_Off(
         }
     }
 
-    override fun getFriendlyName(): String {
-        return "BASAL__SET_SUSPEND_OFF"
-    }
+    override val friendlyName: String = "BASAL__SET_SUSPEND_OFF"
 }
\ No newline at end of file
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Basal_Set_Suspend_On.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBasalSetSuspendOn.kt
similarity index 80%
rename from danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Basal_Set_Suspend_On.kt
rename to danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBasalSetSuspendOn.kt
index 6d0cb88052..a0d1b41f0d 100644
--- a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Basal_Set_Suspend_On.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBasalSetSuspendOn.kt
@@ -4,9 +4,9 @@ import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.danars.encryption.BleEncryption
 
-class DanaRS_Packet_Basal_Set_Suspend_On(
+class DanaRSPacketBasalSetSuspendOn(
     injector: HasAndroidInjector
-) : DanaRS_Packet(injector) {
+) : DanaRSPacket(injector) {
 
     init {
         opCode = BleEncryption.DANAR_PACKET__OPCODE_BASAL__SET_SUSPEND_ON
@@ -15,6 +15,7 @@ class DanaRS_Packet_Basal_Set_Suspend_On(
 
     override fun handleMessage(data: ByteArray) {
         val result = intFromBuff(data, 0, 1)
+        @Suppress("LiftReturnOrAssignment")
         if (result == 0) {
             aapsLogger.debug(LTag.PUMPCOMM, "Result OK")
             failed = false
@@ -24,7 +25,5 @@ class DanaRS_Packet_Basal_Set_Suspend_On(
         }
     }
 
-    override fun getFriendlyName(): String {
-        return "BASAL__SET_SUSPEND_ON"
-    }
+    override val friendlyName: String = "BASAL__SET_SUSPEND_ON"
 }
\ No newline at end of file
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Basal_Set_Temporary_Basal.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBasalSetTemporaryBasal.kt
similarity index 85%
rename from danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Basal_Set_Temporary_Basal.kt
rename to danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBasalSetTemporaryBasal.kt
index 3e5725694f..63399a195d 100644
--- a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Basal_Set_Temporary_Basal.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBasalSetTemporaryBasal.kt
@@ -4,11 +4,11 @@ import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.danars.encryption.BleEncryption
 
-open class DanaRS_Packet_Basal_Set_Temporary_Basal(
+open class DanaRSPacketBasalSetTemporaryBasal(
     injector: HasAndroidInjector,
     private var temporaryBasalRatio: Int = 0,
     private var temporaryBasalDuration: Int = 0
-) : DanaRS_Packet(injector) {
+) : DanaRSPacket(injector) {
 
     init {
         opCode = BleEncryption.DANAR_PACKET__OPCODE_BASAL__SET_TEMPORARY_BASAL
@@ -24,6 +24,7 @@ open class DanaRS_Packet_Basal_Set_Temporary_Basal(
 
     override fun handleMessage(data: ByteArray) {
         val result = intFromBuff(data, 0, 1)
+        @Suppress("LiftReturnOrAssignment")
         if (result == 0) {
             aapsLogger.debug(LTag.PUMPCOMM, "Result OK")
             failed = false
@@ -33,7 +34,5 @@ open class DanaRS_Packet_Basal_Set_Temporary_Basal(
         }
     }
 
-    override fun getFriendlyName(): String {
-        return "BASAL__SET_TEMPORARY_BASAL"
-    }
+    override val friendlyName: String = "BASAL__SET_TEMPORARY_BASAL"
 }
\ No newline at end of file
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_24_CIR_CF_Array.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBolusGet24CIRCFArray.kt
similarity index 76%
rename from danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_24_CIR_CF_Array.kt
rename to danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBolusGet24CIRCFArray.kt
index 1d9b752cf9..3f0e2488ba 100644
--- a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_24_CIR_CF_Array.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBolusGet24CIRCFArray.kt
@@ -1,14 +1,14 @@
 package info.nightscout.androidaps.danars.comm
 
 import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.dana.DanaPump
 import info.nightscout.androidaps.danars.encryption.BleEncryption
+import info.nightscout.androidaps.logging.LTag
 import javax.inject.Inject
 
-class DanaRS_Packet_Bolus_Get_24_CIR_CF_Array(
+class DanaRSPacketBolusGet24CIRCFArray(
     injector: HasAndroidInjector
-) : DanaRS_Packet(injector) {
+) : DanaRSPacket(injector) {
 
     @Inject lateinit var danaPump: DanaPump
 
@@ -19,9 +19,9 @@ class DanaRS_Packet_Bolus_Get_24_CIR_CF_Array(
 
     override fun handleMessage(data: ByteArray) {
         danaPump.units = byteArrayToInt(getBytes(data, DATA_START, 1))
-        for (i in 0 .. 23) {
-            val cir =  byteArrayToInt(getBytes(data, DATA_START + 1 + 2 * i, 2)).toDouble()
-            val cf =  if (danaPump.units == DanaPump.UNITS_MGDL)
+        for (i in 0..23) {
+            val cir = byteArrayToInt(getBytes(data, DATA_START + 1 + 2 * i, 2)).toDouble()
+            val cf = if (danaPump.units == DanaPump.UNITS_MGDL)
                 byteArrayToInt(getBytes(data, DATA_START + 1 + 48 + 2 * i, 2)).toDouble()
             else
                 byteArrayToInt(getBytes(data, DATA_START + 1 + 48 + 2 * i, 2)) / 100.0
@@ -33,7 +33,5 @@ class DanaRS_Packet_Bolus_Get_24_CIR_CF_Array(
         aapsLogger.debug(LTag.PUMPCOMM, "Pump units: " + if (danaPump.units == DanaPump.UNITS_MGDL) "MGDL" else "MMOL")
     }
 
-    override fun getFriendlyName(): String {
-        return "BOLUS__GET_24_ CIR_CF_ARRAY"
-    }
+    override val friendlyName = "BOLUS__GET_24_ CIR_CF_ARRAY"
 }
\ No newline at end of file
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_Bolus_Option.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBolusGetBolusOption.kt
similarity index 97%
rename from danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_Bolus_Option.kt
rename to danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBolusGetBolusOption.kt
index 433f782730..9b87c11a19 100644
--- a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_Bolus_Option.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBolusGetBolusOption.kt
@@ -12,9 +12,9 @@ import info.nightscout.androidaps.danars.encryption.BleEncryption
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import javax.inject.Inject
 
-class DanaRS_Packet_Bolus_Get_Bolus_Option(
+class DanaRSPacketBolusGetBolusOption(
     injector: HasAndroidInjector
-) : DanaRS_Packet(injector) {
+) : DanaRSPacket(injector) {
 
     @Inject lateinit var rxBus: RxBusWrapper
     @Inject lateinit var resourceHelper: ResourceHelper
@@ -110,7 +110,5 @@ class DanaRS_Packet_Bolus_Get_Bolus_Option(
         aapsLogger.debug(LTag.PUMPCOMM, "missedBolus04EndMin: $missedBolus04EndMin")
     }
 
-    override fun getFriendlyName(): String {
-        return "BOLUS__GET_BOLUS_OPTION"
-    }
+    override val friendlyName: String = "BOLUS__GET_BOLUS_OPTION"
 }
\ No newline at end of file
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_CIR_CF_Array.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBolusGetCIRCFArray.kt
similarity index 96%
rename from danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_CIR_CF_Array.kt
rename to danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBolusGetCIRCFArray.kt
index d476115d63..59af61aa30 100644
--- a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_CIR_CF_Array.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBolusGetCIRCFArray.kt
@@ -6,9 +6,9 @@ import info.nightscout.androidaps.dana.DanaPump
 import info.nightscout.androidaps.danars.encryption.BleEncryption
 import javax.inject.Inject
 
-class DanaRS_Packet_Bolus_Get_CIR_CF_Array(
+class DanaRSPacketBolusGetCIRCFArray(
     injector: HasAndroidInjector
-) : DanaRS_Packet(injector) {
+) : DanaRSPacket(injector) {
 
     @Inject lateinit var danaPump: DanaPump
 
@@ -112,7 +112,5 @@ class DanaRS_Packet_Bolus_Get_CIR_CF_Array(
         aapsLogger.debug(LTag.PUMPCOMM, "cf06: $cf06")
     }
 
-    override fun getFriendlyName(): String {
-        return "BOLUS__GET_CIR_CF_ARRAY"
-    }
+    override val friendlyName: String = "BOLUS__GET_CIR_CF_ARRAY"
 }
\ No newline at end of file
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_Calculation_Information.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBolusGetCalculationInformation.kt
similarity index 91%
rename from danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_Calculation_Information.kt
rename to danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBolusGetCalculationInformation.kt
index fff895b239..58d6d95eb8 100644
--- a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_Calculation_Information.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBolusGetCalculationInformation.kt
@@ -6,9 +6,9 @@ import info.nightscout.androidaps.dana.DanaPump
 import info.nightscout.androidaps.danars.encryption.BleEncryption
 import javax.inject.Inject
 
-class DanaRS_Packet_Bolus_Get_Calculation_Information(
+class DanaRSPacketBolusGetCalculationInformation(
     injector: HasAndroidInjector
-) : DanaRS_Packet(injector) {
+) : DanaRSPacket(injector) {
 
     @Inject lateinit var danaPump: DanaPump
 
@@ -45,7 +45,7 @@ class DanaRS_Packet_Bolus_Get_Calculation_Information(
         if (danaPump.units == DanaPump.UNITS_MMOL) {
             danaPump.currentCF = danaPump.currentCF / 100.0
             danaPump.currentTarget = danaPump.currentTarget / 100.0
-            currentBG = currentBG / 100.0
+            currentBG /= 100.0
         }
         if (error != 0) failed = true
         aapsLogger.debug(LTag.PUMPCOMM, "Result: $error")
@@ -58,7 +58,5 @@ class DanaRS_Packet_Bolus_Get_Calculation_Information(
         aapsLogger.debug(LTag.PUMPCOMM, "Pump IOB: " + danaPump.iob)
     }
 
-    override fun getFriendlyName(): String {
-        return "BOLUS__GET_CALCULATION_INFORMATION"
-    }
+    override val friendlyName: String = "BOLUS__GET_CALCULATION_INFORMATION"
 }
\ No newline at end of file
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_Step_Bolus_Information.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBolusGetStepBolusInformation.kt
similarity index 91%
rename from danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_Step_Bolus_Information.kt
rename to danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBolusGetStepBolusInformation.kt
index 7cc2d3aa65..992dc7bd40 100644
--- a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_Step_Bolus_Information.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBolusGetStepBolusInformation.kt
@@ -8,9 +8,9 @@ import org.joda.time.DateTime
 import org.joda.time.DateTimeZone
 import javax.inject.Inject
 
-class DanaRS_Packet_Bolus_Get_Step_Bolus_Information(
+class DanaRSPacketBolusGetStepBolusInformation(
     injector: HasAndroidInjector
-) : DanaRS_Packet(injector) {
+) : DanaRSPacket(injector) {
 
     @Inject lateinit var danaPump: DanaPump
 
@@ -40,7 +40,5 @@ class DanaRS_Packet_Bolus_Get_Step_Bolus_Information(
         aapsLogger.debug(LTag.PUMPCOMM, "Bolus step: " + danaPump.bolusStep + " U")
     }
 
-    override fun getFriendlyName(): String {
-        return "BOLUS__GET_STEP_BOLUS_INFORMATION"
-    }
+    override val friendlyName: String = "BOLUS__GET_STEP_BOLUS_INFORMATION"
 }
\ No newline at end of file
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Set_24_CIR_CF_Array.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBolusSet24CIRCFArray.kt
similarity index 91%
rename from danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Set_24_CIR_CF_Array.kt
rename to danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBolusSet24CIRCFArray.kt
index a7a4d573cc..febd8479c7 100644
--- a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Set_24_CIR_CF_Array.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBolusSet24CIRCFArray.kt
@@ -9,10 +9,10 @@ import info.nightscout.androidaps.logging.LTag
 import javax.inject.Inject
 import kotlin.math.round
 
-class DanaRS_Packet_Bolus_Set_24_CIR_CF_Array(
+class DanaRSPacketBolusSet24CIRCFArray(
     injector: HasAndroidInjector,
     private val profile: Profile?
-) : DanaRS_Packet(injector) {
+) : DanaRSPacket(injector) {
 
     @Inject lateinit var danaPump: DanaPump
 
@@ -42,6 +42,7 @@ class DanaRS_Packet_Bolus_Set_24_CIR_CF_Array(
 
     override fun handleMessage(data: ByteArray) {
         val result = intFromBuff(data, 0, 1)
+        @Suppress("LiftReturnOrAssignment")
         if (result == 0) {
             aapsLogger.debug(LTag.PUMPCOMM, "Result OK")
             failed = false
@@ -51,7 +52,5 @@ class DanaRS_Packet_Bolus_Set_24_CIR_CF_Array(
         }
     }
 
-    override fun getFriendlyName(): String {
-        return "BOLUS__SET_24_CIR_CF_ARRAY"
-    }
+    override val friendlyName: String = "BOLUS__SET_24_CIR_CF_ARRAY"
 }
\ No newline at end of file
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Set_Bolus_Option.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBolusSetBolusOption.kt
similarity index 94%
rename from danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Set_Bolus_Option.kt
rename to danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBolusSetBolusOption.kt
index ac40d4ef56..cee5a745de 100644
--- a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Set_Bolus_Option.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBolusSetBolusOption.kt
@@ -4,7 +4,7 @@ import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.danars.encryption.BleEncryption
 
-class DanaRS_Packet_Bolus_Set_Bolus_Option(
+class DanaRSPacketBolusSetBolusOption(
     injector: HasAndroidInjector,
     private var extendedBolusOptionOnOff: Int = 0,
     private var bolusCalculationOption: Int = 0,
@@ -26,7 +26,7 @@ class DanaRS_Packet_Bolus_Set_Bolus_Option(
     private var missedBolus04EndHour: Int = 0,
     private var missedBolus04EndMin: Int = 0
 
-) : DanaRS_Packet(injector) {
+) : DanaRSPacket(injector) {
 
     init {
         opCode = BleEncryption.DANAR_PACKET__OPCODE_BOLUS__SET_BOLUS_OPTION
@@ -59,6 +59,7 @@ class DanaRS_Packet_Bolus_Set_Bolus_Option(
 
     override fun handleMessage(data: ByteArray) {
         val result = intFromBuff(data, 0, 1)
+        @Suppress("LiftReturnOrAssignment")
         if (result == 0) {
             aapsLogger.debug(LTag.PUMPCOMM, "Result OK")
             failed = false
@@ -68,7 +69,5 @@ class DanaRS_Packet_Bolus_Set_Bolus_Option(
         }
     }
 
-    override fun getFriendlyName(): String {
-        return "BOLUS__SET_BOLUS_OPTION"
-    }
+    override val friendlyName: String = "BOLUS__SET_BOLUS_OPTION"
 }
\ No newline at end of file
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Set_Extended_Bolus.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBolusSetExtendedBolus.kt
similarity index 82%
rename from danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Set_Extended_Bolus.kt
rename to danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBolusSetExtendedBolus.kt
index 749b72206c..0afe2df2e0 100644
--- a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Set_Extended_Bolus.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBolusSetExtendedBolus.kt
@@ -4,15 +4,15 @@ import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.danars.encryption.BleEncryption
 
-class DanaRS_Packet_Bolus_Set_Extended_Bolus(
+class DanaRSPacketBolusSetExtendedBolus(
     injector: HasAndroidInjector,
     private var extendedAmount: Double = 0.0,
     private var extendedBolusDurationInHalfHours: Int = 0
-) : DanaRS_Packet(injector) {
+) : DanaRSPacket(injector) {
 
     init {
         opCode = BleEncryption.DANAR_PACKET__OPCODE_BOLUS__SET_EXTENDED_BOLUS
-        aapsLogger.debug(LTag.PUMPCOMM, "Extended bolus start : $extendedAmount U halfhours: $extendedBolusDurationInHalfHours")
+        aapsLogger.debug(LTag.PUMPCOMM, "Extended bolus start : $extendedAmount U half-hours: $extendedBolusDurationInHalfHours")
     }
 
     override fun getRequestParams(): ByteArray {
@@ -26,6 +26,7 @@ class DanaRS_Packet_Bolus_Set_Extended_Bolus(
 
     override fun handleMessage(data: ByteArray) {
         val result = intFromBuff(data, 0, 1)
+        @Suppress("LiftReturnOrAssignment")
         if (result == 0) {
             aapsLogger.debug(LTag.PUMPCOMM, "Result OK")
             failed = false
@@ -35,7 +36,5 @@ class DanaRS_Packet_Bolus_Set_Extended_Bolus(
         }
     }
 
-    override fun getFriendlyName(): String {
-        return "BOLUS__SET_EXTENDED_BOLUS"
-    }
+    override val friendlyName: String = "BOLUS__SET_EXTENDED_BOLUS"
 }
\ No newline at end of file
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Set_Extended_Bolus_Cancel.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBolusSetExtendedBolusCancel.kt
similarity index 78%
rename from danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Set_Extended_Bolus_Cancel.kt
rename to danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBolusSetExtendedBolusCancel.kt
index 7bc1cea154..4f0afeb0a0 100644
--- a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Set_Extended_Bolus_Cancel.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBolusSetExtendedBolusCancel.kt
@@ -4,9 +4,9 @@ import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.danars.encryption.BleEncryption
 
-class DanaRS_Packet_Bolus_Set_Extended_Bolus_Cancel(
+class DanaRSPacketBolusSetExtendedBolusCancel(
     injector: HasAndroidInjector
-) : DanaRS_Packet(injector) {
+) : DanaRSPacket(injector) {
 
     init {
         opCode = BleEncryption.DANAR_PACKET__OPCODE_BOLUS__SET_EXTENDED_BOLUS_CANCEL
@@ -15,6 +15,7 @@ class DanaRS_Packet_Bolus_Set_Extended_Bolus_Cancel(
 
     override fun handleMessage(data: ByteArray) {
         val result = intFromBuff(data, 0, 1)
+        @Suppress("LiftReturnOrAssignment")
         if (result == 0) {
             aapsLogger.debug(LTag.PUMPCOMM, "Result OK")
             failed = false
@@ -24,7 +25,5 @@ class DanaRS_Packet_Bolus_Set_Extended_Bolus_Cancel(
         }
     }
 
-    override fun getFriendlyName(): String {
-        return "BOLUS__SET_EXTENDED_BOLUS_CANCEL"
-    }
+    override val friendlyName: String = "BOLUS__SET_EXTENDED_BOLUS_CANCEL"
 }
\ No newline at end of file
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Set_Step_Bolus_Start.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBolusSetStepBolusStart.kt
similarity index 90%
rename from danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Set_Step_Bolus_Start.kt
rename to danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBolusSetStepBolusStart.kt
index 319e294895..0f4afcac1f 100644
--- a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Set_Step_Bolus_Start.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBolusSetStepBolusStart.kt
@@ -8,11 +8,11 @@ import info.nightscout.androidaps.dana.DanaPump
 import info.nightscout.androidaps.danars.encryption.BleEncryption
 import javax.inject.Inject
 
-class DanaRS_Packet_Bolus_Set_Step_Bolus_Start(
+class DanaRSPacketBolusSetStepBolusStart(
     injector: HasAndroidInjector,
     private var amount: Double = 0.0,
     private var speed: Int = 0
-) : DanaRS_Packet(injector) {
+) : DanaRSPacket(injector) {
 
     @Inject lateinit var danaPump: DanaPump
     @Inject lateinit var constraintChecker: ConstraintChecker
@@ -45,7 +45,5 @@ class DanaRS_Packet_Bolus_Set_Step_Bolus_Start(
         }
     }
 
-    override fun getFriendlyName(): String {
-        return "BOLUS__SET_STEP_BOLUS_START"
-    }
+    override val friendlyName: String = "BOLUS__SET_STEP_BOLUS_START"
 }
\ No newline at end of file
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Set_Step_Bolus_Stop.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBolusSetStepBolusStop.kt
similarity index 90%
rename from danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Set_Step_Bolus_Stop.kt
rename to danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBolusSetStepBolusStop.kt
index a8f1bc0084..2262a2acde 100644
--- a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Set_Step_Bolus_Stop.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBolusSetStepBolusStop.kt
@@ -10,9 +10,9 @@ import info.nightscout.androidaps.danars.encryption.BleEncryption
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import javax.inject.Inject
 
-open class DanaRS_Packet_Bolus_Set_Step_Bolus_Stop(
+open class DanaRSPacketBolusSetStepBolusStop(
     injector: HasAndroidInjector
-) : DanaRS_Packet(injector) {
+) : DanaRSPacket(injector) {
 
     @Inject lateinit var rxBus: RxBusWrapper
     @Inject lateinit var resourceHelper: ResourceHelper
@@ -24,6 +24,7 @@ open class DanaRS_Packet_Bolus_Set_Step_Bolus_Stop(
 
     override fun handleMessage(data: ByteArray) {
         val result = intFromBuff(data, 0, 1)
+        @Suppress("LiftReturnOrAssignment")
         if (result == 0) {
             aapsLogger.debug(LTag.PUMPCOMM, "Result OK")
             failed = false
@@ -44,7 +45,5 @@ open class DanaRS_Packet_Bolus_Set_Step_Bolus_Stop(
         rxBus.send(bolusingEvent)
     }
 
-    override fun getFriendlyName(): String {
-        return "BOLUS__SET_STEP_BOLUS_STOP"
-    }
+    override val friendlyName: String = "BOLUS__SET_STEP_BOLUS_STOP"
 }
\ No newline at end of file
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Etc_Keep_Connection.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketEtcKeepConnection.kt
similarity index 80%
rename from danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Etc_Keep_Connection.kt
rename to danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketEtcKeepConnection.kt
index 0a5f5f10b4..310a9adcc8 100644
--- a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Etc_Keep_Connection.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketEtcKeepConnection.kt
@@ -4,9 +4,9 @@ import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.danars.encryption.BleEncryption
 
-class DanaRS_Packet_Etc_Keep_Connection(
+class DanaRSPacketEtcKeepConnection(
     injector: HasAndroidInjector
-) : DanaRS_Packet(injector) {
+) : DanaRSPacket(injector) {
 
     init {
         opCode = BleEncryption.DANAR_PACKET__OPCODE_ETC__KEEP_CONNECTION
@@ -15,6 +15,7 @@ class DanaRS_Packet_Etc_Keep_Connection(
 
     override fun handleMessage(data: ByteArray) {
         val result = intFromBuff(data, 0, 1)
+        @Suppress("LiftReturnOrAssignment")
         if (result == 0) {
             aapsLogger.debug(LTag.PUMPCOMM, "Result OK")
             failed = false
@@ -24,7 +25,5 @@ class DanaRS_Packet_Etc_Keep_Connection(
         }
     }
 
-    override fun getFriendlyName(): String {
-        return "ETC__KEEP_CONNECTION"
-    }
+    override val friendlyName: String = "ETC__KEEP_CONNECTION"
 }
\ No newline at end of file
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Etc_Set_History_Save.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketEtcSetHistorySave.kt
similarity index 90%
rename from danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Etc_Set_History_Save.kt
rename to danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketEtcSetHistorySave.kt
index aa812ca588..a464c2d70d 100644
--- a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Etc_Set_History_Save.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketEtcSetHistorySave.kt
@@ -4,7 +4,7 @@ import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.danars.encryption.BleEncryption
 
-class DanaRS_Packet_Etc_Set_History_Save(
+class DanaRSPacketEtcSetHistorySave(
     injector: HasAndroidInjector,
     private var historyType: Int = 0,
     private var historyYear: Int = 0,
@@ -15,7 +15,7 @@ class DanaRS_Packet_Etc_Set_History_Save(
     private var historySecond: Int = 0,
     private var historyCode: Int = 0,
     private var historyValue: Int = 0
-) : DanaRS_Packet(injector) {
+) : DanaRSPacket(injector) {
 
     init {
         opCode = BleEncryption.DANAR_PACKET__OPCODE_ETC__SET_HISTORY_SAVE
@@ -39,6 +39,7 @@ class DanaRS_Packet_Etc_Set_History_Save(
 
     override fun handleMessage(data: ByteArray) {
         val result = intFromBuff(data, 0, 1)
+        @Suppress("LiftReturnOrAssignment")
         if (result == 0) {
             aapsLogger.debug(LTag.PUMPCOMM, "Result OK")
             failed = false
@@ -48,7 +49,5 @@ class DanaRS_Packet_Etc_Set_History_Save(
         }
     }
 
-    override fun getFriendlyName(): String {
-        return "ETC__SET_HISTORY_SAVE"
-    }
+    override val friendlyName: String = "ETC__SET_HISTORY_SAVE"
 }
\ No newline at end of file
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Get_Pump_Check.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketGeneralGetPumpCheck.kt
similarity index 92%
rename from danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Get_Pump_Check.kt
rename to danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketGeneralGetPumpCheck.kt
index 6c55bcee19..8085f4163a 100644
--- a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Get_Pump_Check.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketGeneralGetPumpCheck.kt
@@ -11,9 +11,9 @@ import info.nightscout.androidaps.danars.encryption.BleEncryption
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import javax.inject.Inject
 
-class DanaRS_Packet_General_Get_Pump_Check(
+class DanaRSPacketGeneralGetPumpCheck(
     injector: HasAndroidInjector
-) : DanaRS_Packet(injector) {
+) : DanaRSPacket(injector) {
 
     @Inject lateinit var rxBus: RxBusWrapper
     @Inject lateinit var resourceHelper: ResourceHelper
@@ -47,7 +47,5 @@ class DanaRS_Packet_General_Get_Pump_Check(
         }
     }
 
-    override fun getFriendlyName(): String {
-        return "REVIEW__GET_PUMP_CHECK"
-    }
-}
\ No newline at end of file
+    override val friendlyName: String = "REVIEW__GET_PUMP_CHECK"
+ }
\ No newline at end of file
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Get_Shipping_Information.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketGeneralGetShippingInformation.kt
similarity index 86%
rename from danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Get_Shipping_Information.kt
rename to danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketGeneralGetShippingInformation.kt
index edcb565f6c..c557fcc5c0 100644
--- a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Get_Shipping_Information.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketGeneralGetShippingInformation.kt
@@ -6,9 +6,9 @@ import info.nightscout.androidaps.dana.DanaPump
 import info.nightscout.androidaps.danars.encryption.BleEncryption
 import javax.inject.Inject
 
-class DanaRS_Packet_General_Get_Shipping_Information(
+class DanaRSPacketGeneralGetShippingInformation(
     injector: HasAndroidInjector
-) : DanaRS_Packet(injector) {
+) : DanaRSPacket(injector) {
 
     @Inject lateinit var danaPump: DanaPump
 
@@ -30,7 +30,5 @@ class DanaRS_Packet_General_Get_Shipping_Information(
         aapsLogger.debug(LTag.PUMPCOMM, "Shipping country: " + danaPump.shippingCountry)
     }
 
-    override fun getFriendlyName(): String {
-        return "REVIEW__GET_SHIPPING_INFORMATION"
-    }
+    override val friendlyName: String = "REVIEW__GET_SHIPPING_INFORMATION"
 }
\ No newline at end of file
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Get_Shipping_Version.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketGeneralGetShippingVersion.kt
similarity index 81%
rename from danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Get_Shipping_Version.kt
rename to danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketGeneralGetShippingVersion.kt
index 4a83192d39..f69b920458 100644
--- a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Get_Shipping_Version.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketGeneralGetShippingVersion.kt
@@ -7,9 +7,9 @@ import info.nightscout.androidaps.danars.encryption.BleEncryption
 import java.nio.charset.Charset
 import javax.inject.Inject
 
-class DanaRS_Packet_General_Get_Shipping_Version(
+class DanaRSPacketGeneralGetShippingVersion(
     injector: HasAndroidInjector
-) : DanaRS_Packet(injector) {
+) : DanaRSPacket(injector) {
 
     @Inject lateinit var danaPump: DanaPump
 
@@ -24,7 +24,5 @@ class DanaRS_Packet_General_Get_Shipping_Version(
         aapsLogger.debug(LTag.PUMPCOMM, "BLE Model: " + danaPump.bleModel)
     }
 
-    override fun getFriendlyName(): String {
-        return "GENERAL__GET_SHIPPING_VERSION"
-    }
+    override val friendlyName: String = "GENERAL__GET_SHIPPING_VERSION"
 }
\ No newline at end of file
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Get_User_Time_Change_Flag.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketGeneralGetUserTimeChangeFlag.kt
similarity index 80%
rename from danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Get_User_Time_Change_Flag.kt
rename to danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketGeneralGetUserTimeChangeFlag.kt
index eaaecf7f03..4e4db0238c 100644
--- a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Get_User_Time_Change_Flag.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketGeneralGetUserTimeChangeFlag.kt
@@ -4,9 +4,9 @@ import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.danars.encryption.BleEncryption
 
-class DanaRS_Packet_General_Get_User_Time_Change_Flag(
+class DanaRSPacketGeneralGetUserTimeChangeFlag(
     injector: HasAndroidInjector
-) : DanaRS_Packet(injector) {
+) : DanaRSPacket(injector) {
 
     init {
         opCode = BleEncryption.DANAR_PACKET__OPCODE_REVIEW__GET_USER_TIME_CHANGE_FLAG
@@ -24,7 +24,5 @@ class DanaRS_Packet_General_Get_User_Time_Change_Flag(
         aapsLogger.debug(LTag.PUMPCOMM, "UserTimeChangeFlag: $userTimeChangeFlag")
     }
 
-    override fun getFriendlyName(): String {
-        return "REVIEW__GET_USER_TIME_CHANGE_FLAG"
-    }
+    override val friendlyName: String = "REVIEW__GET_USER_TIME_CHANGE_FLAG"
 }
\ No newline at end of file
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Initial_Screen_Information.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketGeneralInitialScreenInformation.kt
similarity index 92%
rename from danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Initial_Screen_Information.kt
rename to danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketGeneralInitialScreenInformation.kt
index 35a0e35487..3c7de5873d 100644
--- a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Initial_Screen_Information.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketGeneralInitialScreenInformation.kt
@@ -6,9 +6,9 @@ import info.nightscout.androidaps.dana.DanaPump
 import info.nightscout.androidaps.danars.encryption.BleEncryption
 import javax.inject.Inject
 
-class DanaRS_Packet_General_Initial_Screen_Information(
+class DanaRSPacketGeneralInitialScreenInformation(
     injector: HasAndroidInjector
-) : DanaRS_Packet(injector) {
+) : DanaRSPacket(injector) {
 
     @Inject lateinit var danaPump: DanaPump
 
@@ -70,11 +70,9 @@ class DanaRS_Packet_General_Initial_Screen_Information(
         aapsLogger.debug(LTag.PUMPCOMM, "Reservoir remaining units: " + danaPump.reservoirRemainingUnits)
         aapsLogger.debug(LTag.PUMPCOMM, "Battery: " + danaPump.batteryRemaining)
         aapsLogger.debug(LTag.PUMPCOMM, "Current basal: " + danaPump.currentBasal)
-        aapsLogger.debug(LTag.PUMPCOMM, "Temp basal percent: " + tempBasalPercent)
+        aapsLogger.debug(LTag.PUMPCOMM, "Temp basal percent: $tempBasalPercent")
         aapsLogger.debug(LTag.PUMPCOMM, "Extended absolute rate: $extendedBolusAbsoluteRate")
     }
 
-    override fun getFriendlyName(): String {
-        return "REVIEW__INITIAL_SCREEN_INFORMATION"
-    }
+    override val friendlyName: String = "REVIEW__INITIAL_SCREEN_INFORMATION"
 }
\ No newline at end of file
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Set_History_Upload_Mode.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketGeneralSetHistoryUploadMode.kt
similarity index 82%
rename from danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Set_History_Upload_Mode.kt
rename to danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketGeneralSetHistoryUploadMode.kt
index c695632177..c51ce79577 100644
--- a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Set_History_Upload_Mode.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketGeneralSetHistoryUploadMode.kt
@@ -4,10 +4,10 @@ import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.danars.encryption.BleEncryption
 
-class DanaRS_Packet_General_Set_History_Upload_Mode(
+class DanaRSPacketGeneralSetHistoryUploadMode(
     injector: HasAndroidInjector,
     private var mode: Int = 0
-) : DanaRS_Packet(injector) {
+) : DanaRSPacket(injector) {
 
     init {
         opCode = BleEncryption.DANAR_PACKET__OPCODE_REVIEW__SET_HISTORY_UPLOAD_MODE
@@ -22,6 +22,7 @@ class DanaRS_Packet_General_Set_History_Upload_Mode(
 
     override fun handleMessage(data: ByteArray) {
         val result = intFromBuff(data, 0, 1)
+        @Suppress("LiftReturnOrAssignment")
         if (result == 0) {
             aapsLogger.debug(LTag.PUMPCOMM, "Result OK")
             failed = false
@@ -31,7 +32,5 @@ class DanaRS_Packet_General_Set_History_Upload_Mode(
         }
     }
 
-    override fun getFriendlyName(): String {
-        return "REVIEW__SET_HISTORY_UPLOAD_MODE"
-    }
+    override val friendlyName: String = "REVIEW__SET_HISTORY_UPLOAD_MODE"
 }
\ No newline at end of file
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Set_User_Time_Change_Flag_Clear.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketGeneralSetUserTimeChangeFlagClear.kt
similarity index 77%
rename from danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Set_User_Time_Change_Flag_Clear.kt
rename to danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketGeneralSetUserTimeChangeFlagClear.kt
index 45a5d01962..bac9212f24 100644
--- a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Set_User_Time_Change_Flag_Clear.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketGeneralSetUserTimeChangeFlagClear.kt
@@ -4,9 +4,9 @@ import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.danars.encryption.BleEncryption
 
-class DanaRS_Packet_General_Set_User_Time_Change_Flag_Clear(
+class DanaRSPacketGeneralSetUserTimeChangeFlagClear(
     injector: HasAndroidInjector
-) : DanaRS_Packet(injector) {
+) : DanaRSPacket(injector) {
 
     init {
         opCode = BleEncryption.DANAR_PACKET__OPCODE_REVIEW__SET_USER_TIME_CHANGE_FLAG_CLEAR
@@ -15,6 +15,7 @@ class DanaRS_Packet_General_Set_User_Time_Change_Flag_Clear(
 
     override fun handleMessage(data: ByteArray) {
         val result = intFromBuff(data, 0, 1)
+        @Suppress("LiftReturnOrAssignment")
         if (result == 0) {
             aapsLogger.debug(LTag.PUMPCOMM, "Result OK")
             failed = false
@@ -24,7 +25,5 @@ class DanaRS_Packet_General_Set_User_Time_Change_Flag_Clear(
         }
     }
 
-    override fun getFriendlyName(): String {
-        return "REVIEW__SET_USER_TIME_CHANGE_FLAG_CLEAR"
-    }
+    override val friendlyName: String = "REVIEW__SET_USER_TIME_CHANGE_FLAG_CLEAR"
 }
\ No newline at end of file
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_History_.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketHistory.kt
similarity index 99%
rename from danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_History_.kt
rename to danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketHistory.kt
index 63f0882acf..5cbb2ecff0 100644
--- a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_History_.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketHistory.kt
@@ -15,10 +15,10 @@ import org.joda.time.DateTime
 import java.util.*
 import javax.inject.Inject
 
-abstract class DanaRS_Packet_History_(
+abstract class DanaRSPacketHistory(
     injector: HasAndroidInjector,
     protected val from: Long
-) : DanaRS_Packet(injector) {
+) : DanaRSPacket(injector) {
 
     @Inject lateinit var rxBus: RxBusWrapper
     @Inject lateinit var danaHistoryRecordDao: DanaHistoryRecordDao
@@ -60,7 +60,6 @@ abstract class DanaRS_Packet_History_(
         return request
     }
 
-    @kotlin.ExperimentalStdlibApi
     override fun handleMessage(data: ByteArray) {
         val error: Int
         totalCount = 0
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_History_Alarm.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketHistoryAlarm.kt
similarity index 67%
rename from danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_History_Alarm.kt
rename to danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketHistoryAlarm.kt
index 23430fab80..b206792378 100644
--- a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_History_Alarm.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketHistoryAlarm.kt
@@ -4,17 +4,15 @@ import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.danars.encryption.BleEncryption
 
-class DanaRS_Packet_History_Alarm @JvmOverloads constructor(
+class DanaRSPacketHistoryAlarm constructor(
     injector: HasAndroidInjector,
     from: Long = 0
-) : DanaRS_Packet_History_(injector, from) {
+) : DanaRSPacketHistory(injector, from) {
 
     init {
         opCode = BleEncryption.DANAR_PACKET__OPCODE_REVIEW__ALARM
         aapsLogger.debug(LTag.PUMPCOMM, "New message")
     }
 
-    override fun getFriendlyName(): String {
-        return "REVIEW__ALARM"
-    }
+    override val friendlyName: String = "REVIEW__ALARM"
 }
\ No newline at end of file
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_History_All_History.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketHistoryAllHistory.kt
similarity index 69%
rename from danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_History_All_History.kt
rename to danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketHistoryAllHistory.kt
index c8cbc8e39e..a6c44abce4 100644
--- a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_History_All_History.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketHistoryAllHistory.kt
@@ -4,17 +4,15 @@ import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.danars.encryption.BleEncryption
 
-class DanaRS_Packet_History_All_History(
+class DanaRSPacketHistoryAllHistory(
     injector: HasAndroidInjector,
     from: Long = 0
-) : DanaRS_Packet_History_(injector, from) {
+) : DanaRSPacketHistory(injector, from) {
 
     init {
         opCode = BleEncryption.DANAR_PACKET__OPCODE_REVIEW__ALL_HISTORY
         aapsLogger.debug(LTag.PUMPCOMM, "New message")
     }
 
-    override fun getFriendlyName(): String {
-        return "REVIEW__ALL_HISTORY"
-    }
+    override val friendlyName: String = "REVIEW__ALL_HISTORY"
 }
\ No newline at end of file
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_History_Basal.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketHistoryBasal.kt
similarity index 67%
rename from danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_History_Basal.kt
rename to danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketHistoryBasal.kt
index 5166d9de0c..9f66e8d346 100644
--- a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_History_Basal.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketHistoryBasal.kt
@@ -4,17 +4,15 @@ import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.danars.encryption.BleEncryption
 
-class DanaRS_Packet_History_Basal @JvmOverloads constructor(
+class DanaRSPacketHistoryBasal constructor(
     injector: HasAndroidInjector,
     from: Long = 0
-) : DanaRS_Packet_History_(injector, from) {
+) : DanaRSPacketHistory(injector, from) {
 
     init {
         opCode = BleEncryption.DANAR_PACKET__OPCODE_REVIEW__BASAL
         aapsLogger.debug(LTag.PUMPCOMM, "New message")
     }
 
-    override fun getFriendlyName(): String {
-        return "REVIEW__BASAL"
-    }
+    override val friendlyName: String = "REVIEW__BASAL"
 }
\ No newline at end of file
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_History_Blood_Glucose.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketHistoryBloodGlucose.kt
similarity index 66%
rename from danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_History_Blood_Glucose.kt
rename to danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketHistoryBloodGlucose.kt
index 237006ef4a..e11e7de3e5 100644
--- a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_History_Blood_Glucose.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketHistoryBloodGlucose.kt
@@ -4,17 +4,15 @@ import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.danars.encryption.BleEncryption
 
-class DanaRS_Packet_History_Blood_Glucose @JvmOverloads constructor(
+class DanaRSPacketHistoryBloodGlucose constructor(
     injector: HasAndroidInjector,
     from: Long = 0
-) : DanaRS_Packet_History_(injector, from) {
+) : DanaRSPacketHistory(injector, from) {
 
     init {
         opCode = BleEncryption.DANAR_PACKET__OPCODE_REVIEW__BLOOD_GLUCOSE
         aapsLogger.debug(LTag.PUMPCOMM, "New message")
     }
 
-    override fun getFriendlyName(): String {
-        return "REVIEW__BLOOD_GLUCOSE"
-    }
+    override val friendlyName: String = "REVIEW__BLOOD_GLUCOSE"
 }
\ No newline at end of file
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_History_Bolus.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketHistoryBolus.kt
similarity index 67%
rename from danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_History_Bolus.kt
rename to danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketHistoryBolus.kt
index 3b8cec0a6f..55b7d7cf43 100644
--- a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_History_Bolus.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketHistoryBolus.kt
@@ -4,17 +4,15 @@ import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.danars.encryption.BleEncryption
 
-class DanaRS_Packet_History_Bolus @JvmOverloads constructor(
+class DanaRSPacketHistoryBolus constructor(
     injector: HasAndroidInjector,
     from: Long = 0
-) : DanaRS_Packet_History_(injector, from) {
+) : DanaRSPacketHistory(injector, from) {
 
     init {
         opCode = BleEncryption.DANAR_PACKET__OPCODE_REVIEW__BOLUS
         aapsLogger.debug(LTag.PUMPCOMM, "New message")
     }
 
-    override fun getFriendlyName(): String {
-        return "REVIEW__BOLUS"
-    }
+    override val friendlyName: String = "REVIEW__BOLUS"
 }
\ No newline at end of file
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_History_Carbohydrate.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketHistoryCarbohydrate.kt
similarity index 66%
rename from danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_History_Carbohydrate.kt
rename to danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketHistoryCarbohydrate.kt
index 6ac0f18b17..2f599ed452 100644
--- a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_History_Carbohydrate.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketHistoryCarbohydrate.kt
@@ -4,17 +4,15 @@ import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.danars.encryption.BleEncryption
 
-class DanaRS_Packet_History_Carbohydrate @JvmOverloads constructor(
+class DanaRSPacketHistoryCarbohydrate constructor(
     injector: HasAndroidInjector,
     from: Long = 0
-) : DanaRS_Packet_History_(injector, from) {
+) : DanaRSPacketHistory(injector, from) {
 
     init {
         opCode = BleEncryption.DANAR_PACKET__OPCODE_REVIEW__CARBOHYDRATE
         aapsLogger.debug(LTag.PUMPCOMM, "New message")
     }
 
-    override fun getFriendlyName(): String {
-        return "REVIEW__CARBOHYDRATE"
-    }
+    override val friendlyName: String = "REVIEW__CARBOHYDRATE"
 }
\ No newline at end of file
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_History_Daily.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketHistoryDaily.kt
similarity index 67%
rename from danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_History_Daily.kt
rename to danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketHistoryDaily.kt
index d0b3625e6a..20956e6304 100644
--- a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_History_Daily.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketHistoryDaily.kt
@@ -4,17 +4,15 @@ import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.danars.encryption.BleEncryption
 
-class DanaRS_Packet_History_Daily @JvmOverloads constructor(
+class DanaRSPacketHistoryDaily constructor(
     injector: HasAndroidInjector,
     from: Long = 0
-) : DanaRS_Packet_History_(injector, from) {
+) : DanaRSPacketHistory(injector, from) {
 
     init {
         opCode = BleEncryption.DANAR_PACKET__OPCODE_REVIEW__DAILY
         aapsLogger.debug(LTag.PUMPCOMM, "New message")
     }
 
-    override fun getFriendlyName(): String {
-        return "REVIEW__DAILY"
-    }
+    override val friendlyName: String = "REVIEW__DAILY"
 }
\ No newline at end of file
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_History_Prime.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketHistoryPrime.kt
similarity index 67%
rename from danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_History_Prime.kt
rename to danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketHistoryPrime.kt
index 4069f9be0b..eab2c923c5 100644
--- a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_History_Prime.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketHistoryPrime.kt
@@ -4,17 +4,15 @@ import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.danars.encryption.BleEncryption
 
-class DanaRS_Packet_History_Prime @JvmOverloads constructor(
+class DanaRSPacketHistoryPrime constructor(
     injector: HasAndroidInjector,
     from: Long = 0
-) : DanaRS_Packet_History_(injector, from) {
+) : DanaRSPacketHistory(injector, from) {
 
     init {
         opCode = BleEncryption.DANAR_PACKET__OPCODE_REVIEW__PRIME
         aapsLogger.debug(LTag.PUMPCOMM, "New message")
     }
 
-    override fun getFriendlyName(): String {
-        return "REVIEW__PRIME"
-    }
+    override val friendlyName: String = "REVIEW__PRIME"
 }
\ No newline at end of file
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_History_Refill.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketHistoryRefill.kt
similarity index 67%
rename from danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_History_Refill.kt
rename to danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketHistoryRefill.kt
index ba83640f5b..ca59c45876 100644
--- a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_History_Refill.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketHistoryRefill.kt
@@ -4,17 +4,15 @@ import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.danars.encryption.BleEncryption
 
-class DanaRS_Packet_History_Refill @JvmOverloads constructor(
+class DanaRSPacketHistoryRefill constructor(
     injector: HasAndroidInjector,
     from: Long = 0
-) : DanaRS_Packet_History_(injector, from) {
+) : DanaRSPacketHistory(injector, from) {
 
     init {
         opCode = BleEncryption.DANAR_PACKET__OPCODE_REVIEW__REFILL
         aapsLogger.debug(LTag.PUMPCOMM, "New message")
     }
 
-    override fun getFriendlyName(): String {
-        return "REVIEW__REFILL"
-    }
+    override val friendlyName: String = "REVIEW__REFILL"
 }
\ No newline at end of file
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_History_Suspend.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketHistorySuspend.kt
similarity index 67%
rename from danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_History_Suspend.kt
rename to danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketHistorySuspend.kt
index fdc4bb7086..ab920b8e5c 100644
--- a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_History_Suspend.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketHistorySuspend.kt
@@ -4,17 +4,15 @@ import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.danars.encryption.BleEncryption
 
-class DanaRS_Packet_History_Suspend @JvmOverloads constructor(
+class DanaRSPacketHistorySuspend constructor(
     injector: HasAndroidInjector,
     from: Long = 0
-) : DanaRS_Packet_History_(injector, from) {
+) : DanaRSPacketHistory(injector, from) {
 
     init {
         opCode = BleEncryption.DANAR_PACKET__OPCODE_REVIEW__SUSPEND
         aapsLogger.debug(LTag.PUMPCOMM, "New message")
     }
 
-    override fun getFriendlyName(): String {
-        return "REVIEW__SUSPEND"
-    }
+    override val friendlyName: String = "REVIEW__SUSPEND"
 }
\ No newline at end of file
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_History_Temporary.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketHistoryTemporary.kt
similarity index 70%
rename from danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_History_Temporary.kt
rename to danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketHistoryTemporary.kt
index 534a0f0667..c7c909bf71 100644
--- a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_History_Temporary.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketHistoryTemporary.kt
@@ -4,17 +4,15 @@ import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.danars.encryption.BleEncryption
 
-class DanaRS_Packet_History_Temporary(
+class DanaRSPacketHistoryTemporary(
     injector: HasAndroidInjector,
     from: Long = 0
-) : DanaRS_Packet_History_(injector, from) {
+) : DanaRSPacketHistory(injector, from) {
 
     init {
         opCode = BleEncryption.DANAR_PACKET__OPCODE_REVIEW__TEMPORARY
         aapsLogger.debug(LTag.PUMPCOMM, "New message")
     }
 
-    override fun getFriendlyName(): String {
-        return "REVIEW__TEMPORARY"
-    }
+    override val friendlyName: String = "REVIEW__TEMPORARY"
 }
\ No newline at end of file
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Notify_Alarm.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketNotifyAlarm.kt
similarity index 95%
rename from danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Notify_Alarm.kt
rename to danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketNotifyAlarm.kt
index f49f25010a..f46b5581f4 100644
--- a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Notify_Alarm.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketNotifyAlarm.kt
@@ -12,9 +12,9 @@ import info.nightscout.androidaps.plugins.general.overview.notifications.Notific
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import javax.inject.Inject
 
-class DanaRS_Packet_Notify_Alarm(
+class DanaRSPacketNotifyAlarm(
     injector: HasAndroidInjector
-) : DanaRS_Packet(injector) {
+) : DanaRSPacket(injector) {
 
     @Inject lateinit var rxBus: RxBusWrapper
     @Inject lateinit var resourceHelper: ResourceHelper
@@ -69,7 +69,5 @@ class DanaRS_Packet_Notify_Alarm(
         pumpSync.insertAnnouncement(errorString, null, danaPump.pumpType(), danaPump.serialNumber)
     }
 
-    override fun getFriendlyName(): String {
-        return "NOTIFY__ALARM"
-    }
+    override val friendlyName: String = "NOTIFY__ALARM"
 }
\ No newline at end of file
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Notify_Delivery_Complete.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketNotifyDeliveryComplete.kt
similarity index 90%
rename from danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Notify_Delivery_Complete.kt
rename to danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketNotifyDeliveryComplete.kt
index fd245226d3..c6b55b2e96 100644
--- a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Notify_Delivery_Complete.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketNotifyDeliveryComplete.kt
@@ -11,9 +11,9 @@ import info.nightscout.androidaps.utils.resources.ResourceHelper
 import javax.inject.Inject
 import kotlin.math.min
 
-class DanaRS_Packet_Notify_Delivery_Complete(
+class DanaRSPacketNotifyDeliveryComplete(
     injector: HasAndroidInjector
-) : DanaRS_Packet(injector) {
+) : DanaRSPacket(injector) {
 
     @Inject lateinit var rxBus: RxBusWrapper
     @Inject lateinit var resourceHelper: ResourceHelper
@@ -37,7 +37,5 @@ class DanaRS_Packet_Notify_Delivery_Complete(
         aapsLogger.debug(LTag.PUMPCOMM, "Delivered insulin: $deliveredInsulin")
     }
 
-    override fun getFriendlyName(): String {
-        return "NOTIFY__DELIVERY_COMPLETE"
-    }
+    override val friendlyName: String = "NOTIFY__DELIVERY_COMPLETE"
 }
\ No newline at end of file
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Notify_Delivery_Rate_Display.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketNotifyDeliveryRateDisplay.kt
similarity index 90%
rename from danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Notify_Delivery_Rate_Display.kt
rename to danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketNotifyDeliveryRateDisplay.kt
index 8c54865d4a..e1a18ddd40 100644
--- a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Notify_Delivery_Rate_Display.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketNotifyDeliveryRateDisplay.kt
@@ -11,9 +11,9 @@ import info.nightscout.androidaps.utils.resources.ResourceHelper
 import javax.inject.Inject
 import kotlin.math.min
 
-class DanaRS_Packet_Notify_Delivery_Rate_Display(
+class DanaRSPacketNotifyDeliveryRateDisplay(
     injector: HasAndroidInjector
-) : DanaRS_Packet(injector) {
+) : DanaRSPacket(injector) {
 
     @Inject lateinit var rxBus: RxBusWrapper
     @Inject lateinit var resourceHelper: ResourceHelper
@@ -37,7 +37,5 @@ class DanaRS_Packet_Notify_Delivery_Rate_Display(
         aapsLogger.debug(LTag.PUMPCOMM, "Delivered insulin so far: $deliveredInsulin")
     }
 
-    override fun getFriendlyName(): String {
-        return "NOTIFY__DELIVERY_RATE_DISPLAY"
-    }
+    override val friendlyName: String = "NOTIFY__DELIVERY_RATE_DISPLAY"
 }
\ No newline at end of file
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Notify_Missed_Bolus_Alarm.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketNotifyMissedBolusAlarm.kt
similarity index 89%
rename from danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Notify_Missed_Bolus_Alarm.kt
rename to danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketNotifyMissedBolusAlarm.kt
index 1fea0135ab..e8799c34e0 100644
--- a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Notify_Missed_Bolus_Alarm.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketNotifyMissedBolusAlarm.kt
@@ -4,9 +4,9 @@ import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.danars.encryption.BleEncryption
 
-class DanaRS_Packet_Notify_Missed_Bolus_Alarm(
+class DanaRSPacketNotifyMissedBolusAlarm(
     injector: HasAndroidInjector
-) : DanaRS_Packet(injector) {
+) : DanaRSPacket(injector) {
 
     init {
         type = BleEncryption.DANAR_PACKET__TYPE_NOTIFY
@@ -38,7 +38,5 @@ class DanaRS_Packet_Notify_Missed_Bolus_Alarm(
         aapsLogger.debug(LTag.PUMPCOMM, "End min: $endMin")
     }
 
-    override fun getFriendlyName(): String {
-        return "NOTIFY__MISSED_BOLUS_ALARM"
-    }
+    override val friendlyName: String = "NOTIFY__MISSED_BOLUS_ALARM"
 }
\ No newline at end of file
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Option_Get_Pump_Time.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketOptionGetPumpTime.kt
similarity index 87%
rename from danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Option_Get_Pump_Time.kt
rename to danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketOptionGetPumpTime.kt
index ded5b89540..ccaa4b23fd 100644
--- a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Option_Get_Pump_Time.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketOptionGetPumpTime.kt
@@ -7,9 +7,9 @@ import info.nightscout.androidaps.danars.encryption.BleEncryption
 import org.joda.time.DateTime
 import javax.inject.Inject
 
-class DanaRS_Packet_Option_Get_Pump_Time(
+class DanaRSPacketOptionGetPumpTime(
     injector: HasAndroidInjector
-) : DanaRS_Packet(injector) {
+) : DanaRSPacket(injector) {
 
     @Inject lateinit var danaPump: DanaPump
 
@@ -27,7 +27,7 @@ class DanaRS_Packet_Option_Get_Pump_Time(
         val sec = byteArrayToInt(getBytes(data, DATA_START + 5, 1))
         val time = DateTime(2000 + year, month, day, hour, min, sec)
         danaPump.setPumpTime(time.millis)
-        aapsLogger.debug(LTag.PUMPCOMM, "Pump time " + dateUtil.dateAndTimeString(time.millis))
+        aapsLogger.debug(LTag.PUMPCOMM, "Pump time " + dateUtil.dateAndTimeAndSecondsString(time.millis))
     }
 
     override fun handleMessageNotReceived() {
@@ -35,7 +35,5 @@ class DanaRS_Packet_Option_Get_Pump_Time(
         danaPump.resetPumpTime()
     }
 
-    override fun getFriendlyName(): String {
-        return "OPTION__GET_PUMP_TIME"
-    }
+    override val friendlyName: String = "OPTION__GET_PUMP_TIME"
 }
\ No newline at end of file
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Option_Get_Pump_UTC_And_TimeZone.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketOptionGetPumpUTCAndTimeZone.kt
similarity index 84%
rename from danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Option_Get_Pump_UTC_And_TimeZone.kt
rename to danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketOptionGetPumpUTCAndTimeZone.kt
index 61040521ea..d8c5d5fbc8 100644
--- a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Option_Get_Pump_UTC_And_TimeZone.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketOptionGetPumpUTCAndTimeZone.kt
@@ -7,9 +7,9 @@ import info.nightscout.androidaps.danars.encryption.BleEncryption
 import org.joda.time.DateTime
 import javax.inject.Inject
 
-class DanaRS_Packet_Option_Get_Pump_UTC_And_TimeZone(
+class DanaRSPacketOptionGetPumpUTCAndTimeZone(
     injector: HasAndroidInjector
-) : DanaRS_Packet(injector) {
+) : DanaRSPacket(injector) {
 
     @Inject lateinit var danaPump: DanaPump
 
@@ -28,7 +28,7 @@ class DanaRS_Packet_Option_Get_Pump_UTC_And_TimeZone(
         val zoneOffset = getBytes(data, DATA_START + 6, 1)[0].toInt()
         val time = DateTime(2000 + year, month, day, hour, min, sec)
         danaPump.setPumpTime(time.millis, zoneOffset)
-        aapsLogger.debug(LTag.PUMPCOMM, "Pump time ${dateUtil.dateAndTimeString(danaPump.getPumpTime())} ZoneOffset: $zoneOffset")
+        aapsLogger.debug(LTag.PUMPCOMM, "Pump time ${dateUtil.dateAndTimeAndSecondsString(danaPump.getPumpTime())} ZoneOffset: $zoneOffset")
     }
 
     override fun handleMessageNotReceived() {
@@ -36,7 +36,5 @@ class DanaRS_Packet_Option_Get_Pump_UTC_And_TimeZone(
         danaPump.resetPumpTime()
     }
 
-    override fun getFriendlyName(): String {
-        return "OPTION__GET_PUMP_UTC_AND_TIMEZONE"
-    }
+    override val friendlyName: String = "OPTION__GET_PUMP_UTC_AND_TIMEZONE"
 }
\ No newline at end of file
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Option_Get_User_Option.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketOptionGetUserOption.kt
similarity index 95%
rename from danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Option_Get_User_Option.kt
rename to danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketOptionGetUserOption.kt
index 7c2a9fa16d..f6b88ca139 100644
--- a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Option_Get_User_Option.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketOptionGetUserOption.kt
@@ -6,9 +6,9 @@ import info.nightscout.androidaps.dana.DanaPump
 import info.nightscout.androidaps.danars.encryption.BleEncryption
 import javax.inject.Inject
 
-class DanaRS_Packet_Option_Get_User_Option(
+class DanaRSPacketOptionGetUserOption(
     injector: HasAndroidInjector
-) : DanaRS_Packet(injector) {
+) : DanaRSPacket(injector) {
 
     @Inject lateinit var danaPump: DanaPump
 
@@ -57,7 +57,5 @@ class DanaRS_Packet_Option_Get_User_Option(
         aapsLogger.debug(LTag.PUMPCOMM, "target: ${if (danaPump.units == DanaPump.UNITS_MGDL) danaPump.target else danaPump.target / 100}")
     }
 
-    override fun getFriendlyName(): String {
-        return "OPTION__GET_USER_OPTION"
-    }
+    override val friendlyName: String = "OPTION__GET_USER_OPTION"
 }
\ No newline at end of file
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Option_Set_Pump_Time.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketOptionSetPumpTime.kt
similarity index 85%
rename from danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Option_Set_Pump_Time.kt
rename to danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketOptionSetPumpTime.kt
index dc4b6b0efe..8b14ee9085 100644
--- a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Option_Set_Pump_Time.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketOptionSetPumpTime.kt
@@ -5,16 +5,16 @@ import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.danars.encryption.BleEncryption
 import org.joda.time.DateTime
 
-class DanaRS_Packet_Option_Set_Pump_Time(
+class DanaRSPacketOptionSetPumpTime(
     injector: HasAndroidInjector,
     private var time: Long = 0
-) : DanaRS_Packet(injector) {
+) : DanaRSPacket(injector) {
 
     var error = 0
 
     init {
         opCode = BleEncryption.DANAR_PACKET__OPCODE_OPTION__SET_PUMP_TIME
-        aapsLogger.debug(LTag.PUMPCOMM, "Setting pump time " + dateUtil.dateAndTimeString(time))
+        aapsLogger.debug(LTag.PUMPCOMM, "Setting pump time " + dateUtil.dateAndTimeAndSecondsString(time))
     }
 
     override fun getRequestParams(): ByteArray {
@@ -31,6 +31,7 @@ class DanaRS_Packet_Option_Set_Pump_Time(
 
     override fun handleMessage(data: ByteArray) {
         val result = intFromBuff(data, 0, 1)
+        @Suppress("LiftReturnOrAssignment")
         if (result == 0) {
             aapsLogger.debug(LTag.PUMPCOMM, "Result OK")
             failed = false
@@ -40,7 +41,5 @@ class DanaRS_Packet_Option_Set_Pump_Time(
         }
     }
 
-    override fun getFriendlyName(): String {
-        return "OPTION__SET_PUMP_TIME"
-    }
+    override val friendlyName: String = "OPTION__SET_PUMP_TIME"
 }
\ No newline at end of file
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Option_Set_Pump_UTC_And_TimeZone.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketOptionSetPumpUTCAndTimeZone.kt
similarity index 84%
rename from danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Option_Set_Pump_UTC_And_TimeZone.kt
rename to danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketOptionSetPumpUTCAndTimeZone.kt
index 3fbf79a388..5e34f81f41 100644
--- a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Option_Set_Pump_UTC_And_TimeZone.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketOptionSetPumpUTCAndTimeZone.kt
@@ -6,17 +6,17 @@ import info.nightscout.androidaps.danars.encryption.BleEncryption
 import org.joda.time.DateTime
 import org.joda.time.DateTimeZone
 
-class DanaRS_Packet_Option_Set_Pump_UTC_And_TimeZone(
+class DanaRSPacketOptionSetPumpUTCAndTimeZone(
     injector: HasAndroidInjector,
     private var time: Long = 0,
     private var zoneOffset: Int = 0
-) : DanaRS_Packet(injector) {
+) : DanaRSPacket(injector) {
 
     var error = 0
 
     init {
         opCode = BleEncryption.DANAR_PACKET__OPCODE_OPTION__SET_PUMP_UTC_AND_TIME_ZONE
-        aapsLogger.debug(LTag.PUMPCOMM, "Setting UTC pump time ${dateUtil.dateAndTimeString(time)} ZoneOffset: $zoneOffset")
+        aapsLogger.debug(LTag.PUMPCOMM, "Setting UTC pump time ${dateUtil.dateAndTimeAndSecondsString(time)} ZoneOffset: $zoneOffset")
     }
 
     override fun getRequestParams(): ByteArray {
@@ -34,6 +34,7 @@ class DanaRS_Packet_Option_Set_Pump_UTC_And_TimeZone(
 
     override fun handleMessage(data: ByteArray) {
         val result = intFromBuff(data, 0, 1)
+        @Suppress("LiftReturnOrAssignment")
         if (result == 0) {
             aapsLogger.debug(LTag.PUMPCOMM, "Result OK")
             failed = false
@@ -43,7 +44,5 @@ class DanaRS_Packet_Option_Set_Pump_UTC_And_TimeZone(
         }
     }
 
-    override fun getFriendlyName(): String {
-        return "OPTION__SET_PUMP_UTC_AND_TIMEZONE"
-    }
+    override val friendlyName: String = "OPTION__SET_PUMP_UTC_AND_TIMEZONE"
 }
\ No newline at end of file
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Option_Set_User_Option.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketOptionSetUserOption.kt
similarity index 94%
rename from danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Option_Set_User_Option.kt
rename to danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketOptionSetUserOption.kt
index ae2e0c03ef..e88969ab4f 100644
--- a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Option_Set_User_Option.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketOptionSetUserOption.kt
@@ -6,9 +6,9 @@ import info.nightscout.androidaps.dana.DanaPump
 import info.nightscout.androidaps.danars.encryption.BleEncryption
 import javax.inject.Inject
 
-class DanaRS_Packet_Option_Set_User_Option(
+class DanaRSPacketOptionSetUserOption(
     injector: HasAndroidInjector
-) : DanaRS_Packet(injector) {
+) : DanaRSPacket(injector) {
 
     @Inject lateinit var danaPump: DanaPump
 
@@ -54,6 +54,7 @@ class DanaRS_Packet_Option_Set_User_Option(
 
     override fun handleMessage(data: ByteArray) {
         val result = intFromBuff(data, 0, 1)
+        @Suppress("LiftReturnOrAssignment")
         if (result == 0) {
             aapsLogger.debug(LTag.PUMPCOMM, "Result OK")
             failed = false
@@ -63,7 +64,5 @@ class DanaRS_Packet_Option_Set_User_Option(
         }
     }
 
-    override fun getFriendlyName(): String {
-        return "OPTION__SET_USER_OPTION"
-    }
+    override val friendlyName: String = "OPTION__SET_USER_OPTION"
 }
\ No newline at end of file
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Review_Bolus_Avg.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketReviewBolusAvg.kt
similarity index 91%
rename from danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Review_Bolus_Avg.kt
rename to danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketReviewBolusAvg.kt
index 6e0af1260f..5a1577f208 100644
--- a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Review_Bolus_Avg.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketReviewBolusAvg.kt
@@ -4,9 +4,9 @@ import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.danars.encryption.BleEncryption
 
-class DanaRS_Packet_Review_Bolus_Avg(
+class DanaRSPacketReviewBolusAvg(
     injector: HasAndroidInjector
-) : DanaRS_Packet(injector) {
+) : DanaRSPacket(injector) {
 
     init {
         opCode = BleEncryption.DANAR_PACKET__OPCODE_REVIEW__BOLUS_AVG
@@ -38,7 +38,5 @@ class DanaRS_Packet_Review_Bolus_Avg(
         aapsLogger.debug(LTag.PUMPCOMM, "Bolus average 28d: $bolusAvg28 U")
     }
 
-    override fun getFriendlyName(): String {
-        return "REVIEW__BOLUS_AVG"
-    }
+    override val friendlyName: String = "REVIEW__BOLUS_AVG"
 }
\ No newline at end of file
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Review_Get_Pump_Dec_Ratio.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketReviewGetPumpDecRatio.kt
similarity index 80%
rename from danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Review_Get_Pump_Dec_Ratio.kt
rename to danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketReviewGetPumpDecRatio.kt
index 990ffce54c..eafc4837d4 100644
--- a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Review_Get_Pump_Dec_Ratio.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketReviewGetPumpDecRatio.kt
@@ -6,9 +6,9 @@ import info.nightscout.androidaps.dana.DanaPump
 import info.nightscout.androidaps.danars.encryption.BleEncryption
 import javax.inject.Inject
 
-class DanaRS_Packet_Review_Get_Pump_Dec_Ratio(
+class DanaRSPacketReviewGetPumpDecRatio(
     injector: HasAndroidInjector
-) : DanaRS_Packet(injector) {
+) : DanaRSPacket(injector) {
 
     @Inject lateinit var danaPump: DanaPump
 
@@ -23,7 +23,5 @@ class DanaRS_Packet_Review_Get_Pump_Dec_Ratio(
         aapsLogger.debug(LTag.PUMPCOMM, "Dec ratio: ${danaPump.decRatio}%")
     }
 
-    override fun getFriendlyName(): String {
-        return "REVIEW__GET_PUMP_DEC_RATIO"
-    }
+    override val friendlyName: String = "REVIEW__GET_PUMP_DEC_RATIO"
 }
\ No newline at end of file
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet.java b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet.java
deleted file mode 100644
index ff99f0d891..0000000000
--- a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet.java
+++ /dev/null
@@ -1,248 +0,0 @@
-package info.nightscout.androidaps.danars.comm;
-
-import android.annotation.TargetApi;
-import android.os.Build;
-
-import org.joda.time.DateTime;
-
-import java.nio.charset.StandardCharsets;
-
-import javax.inject.Inject;
-
-import dagger.android.HasAndroidInjector;
-import info.nightscout.androidaps.danars.encryption.BleEncryption;
-import info.nightscout.androidaps.logging.AAPSLogger;
-import info.nightscout.androidaps.logging.LTag;
-import info.nightscout.androidaps.utils.DateUtil;
-
-public class DanaRS_Packet {
-
-    @Inject AAPSLogger aapsLogger;
-    @Inject DateUtil dateUtil;
-
-    protected HasAndroidInjector injector;
-
-    private static final int TYPE_START = 0;
-    private static final int OPCODE_START = 1;
-    public static final int DATA_START = 2;
-
-    private boolean received;
-    public boolean failed;
-    protected int type = BleEncryption.DANAR_PACKET__TYPE_RESPONSE; // most of the messages, should be changed for others
-    protected int opCode;
-
-    public DanaRS_Packet(HasAndroidInjector injector) {
-        received = false;
-        failed = false;
-        this.injector = injector;
-        injector.androidInjector().inject(this);
-    }
-
-    public boolean success() {
-        return !failed;
-    }
-    public void setReceived() {
-        received = true;
-    }
-
-    public boolean isReceived() {
-        return received;
-    }
-
-    public int getType() {
-        return type;
-    }
-
-    public int getOpCode() {
-        return opCode;
-    }
-
-    public int getCommand() {
-        return ((type & 0xFF) << 8) + (opCode & 0xFF);
-    }
-
-    public byte[] getRequestParams() {
-        return null;
-    }
-
-    // STATIC FUNCTIONS
-
-    public int getCommand(byte[] data) {
-        int type = byteArrayToInt(getBytes(data, TYPE_START, 1));
-        int opCode = byteArrayToInt(getBytes(data, OPCODE_START, 1));
-        return ((type & 0xFF) << 8) + (opCode & 0xFF);
-    }
-
-    public void handleMessage(byte[] data) {
-    }
-
-    public void handleMessageNotReceived() {
-        failed = true;
-    }
-
-    public String getFriendlyName() {
-        return "UNKNOWN_PACKET";
-    }
-
-    protected byte[] getBytes(byte[] data, int srcStart, int srcLength) {
-        try {
-            byte[] ret = new byte[srcLength];
-
-            System.arraycopy(data, srcStart, ret, 0, srcLength);
-
-            return ret;
-        } catch (Exception e) {
-            aapsLogger.error(LTag.PUMPBTCOMM, "Unhandled exception", e);
-        }
-        return null;
-    }
-
-    protected static int byteArrayToInt(byte[] b) {
-        int ret;
-
-        switch (b.length) {
-            case 1:
-                ret = b[0] & 0x000000FF;
-                break;
-            case 2:
-                ret = ((b[1] & 0x000000FF) << 8) + (b[0] & 0x000000FF);
-                break;
-            case 3:
-                ret = ((b[2] & 0x000000FF) << 16) + ((b[1] & 0x000000FF) << 8) + (b[0] & 0x000000FF);
-                break;
-            case 4:
-                ret = ((b[3] & 0x000000FF) << 24) + ((b[2] & 0x000000FF) << 16) + ((b[1] & 0x000000FF) << 8) + (b[0] & 0x000000FF);
-                break;
-            default:
-                ret = -1;
-                break;
-        }
-        return ret;
-    }
-
-    public static synchronized long dateTimeSecFromBuff(byte[] buff, int offset) {
-        return
-                new DateTime(
-                        2000 + intFromBuff(buff, offset, 1),
-                        intFromBuff(buff, offset + 1, 1),
-                        intFromBuff(buff, offset + 2, 1),
-                        intFromBuff(buff, offset + 3, 1),
-                        intFromBuff(buff, offset + 4, 1),
-                        intFromBuff(buff, offset + 5, 1)
-                ).getMillis();
-    }
-
-    protected static int intFromBuff(byte[] b, int srcStart, int srcLength) {
-        int ret;
-
-        switch (srcLength) {
-            case 1:
-                ret = b[DATA_START + srcStart + 0] & 0x000000FF;
-                break;
-            case 2:
-                ret = ((b[DATA_START + srcStart + 1] & 0x000000FF) << 8) + (b[DATA_START + srcStart + 0] & 0x000000FF);
-                break;
-            case 3:
-                ret = ((b[DATA_START + srcStart + 2] & 0x000000FF) << 16) + ((b[DATA_START + srcStart + 1] & 0x000000FF) << 8) + (b[DATA_START + srcStart + 0] & 0x000000FF);
-                break;
-            case 4:
-                ret = ((b[DATA_START + srcStart + 3] & 0x000000FF) << 24) + ((b[DATA_START + srcStart + 2] & 0x000000FF) << 16) + ((b[DATA_START + srcStart + 1] & 0x000000FF) << 8) + (b[DATA_START + srcStart + 0] & 0x000000FF);
-                break;
-            default:
-                ret = -1;
-                break;
-        }
-        return ret;
-    }
-
-    protected static int intFromBuffMsbLsb(byte[] b, int srcStart, int srcLength) {
-        int ret;
-
-        switch (srcLength) {
-            case 1:
-                ret = b[DATA_START + srcStart] & 0x000000FF;
-                break;
-            case 2:
-                ret = ((b[DATA_START + srcStart] & 0x000000FF) << 8) + (b[DATA_START + srcStart + 1] & 0x000000FF);
-                break;
-            case 3:
-                ret = ((b[DATA_START + srcStart] & 0x000000FF) << 16) + ((b[DATA_START + srcStart + 1] & 0x000000FF) << 8) + (b[DATA_START + srcStart + 2] & 0x000000FF);
-                break;
-            case 4:
-                ret = ((b[DATA_START + srcStart] & 0x000000FF) << 24) + ((b[DATA_START + srcStart + 1] & 0x000000FF) << 16) + ((b[DATA_START + srcStart + 2] & 0x000000FF) << 8) + (b[DATA_START + srcStart + 3] & 0x000000FF);
-                break;
-            default:
-                ret = -1;
-                break;
-        }
-        return ret;
-    }
-
-    @TargetApi(Build.VERSION_CODES.KITKAT)
-    public static String stringFromBuff(byte[] buff, int offset, int length) {
-        byte[] strbuff = new byte[length];
-        System.arraycopy(buff, offset, strbuff, 0, length);
-        return new String(strbuff, StandardCharsets.UTF_8);
-    }
-
-    public long dateFromBuff(byte[] buff, int offset) {
-        return
-                new DateTime(
-                        2000 + byteArrayToInt(getBytes(buff, offset, 1)),
-                        byteArrayToInt(getBytes(buff, offset + 1, 1)),
-                        byteArrayToInt(getBytes(buff, offset + 2, 1)),
-                        0,
-                        0
-                ).getMillis();
-    }
-
-    @TargetApi(Build.VERSION_CODES.KITKAT)
-
-    public static String asciiStringFromBuff(byte[] buff, int offset, int length) {
-        byte[] strbuff = new byte[length];
-        System.arraycopy(buff, offset, strbuff, 0, length);
-        return new String(strbuff, StandardCharsets.UTF_8);
-    }
-
-    public static String toHexString(byte[] buff) {
-        if (buff == null)
-            return "";
-
-        StringBuilder sb = new StringBuilder();
-
-        int count = 0;
-        for (byte element : buff) {
-            sb.append(String.format("%02X ", element));
-            if (++count % 4 == 0) sb.append(" ");
-        }
-
-        return sb.toString();
-    }
-
-    final private static char[] hexArray = "0123456789ABCDEF".toCharArray();
-
-    public static String bytesToHex(byte[] bytes) {
-        char[] hexChars = new char[bytes.length * 2];
-        for (int j = 0; j < bytes.length; j++) {
-            int v = bytes[j] & 0xFF;
-            hexChars[j * 2] = hexArray[v >>> 4];
-            hexChars[j * 2 + 1] = hexArray[v & 0x0F];
-        }
-        return new String(hexChars);
-    }
-
-    public static byte[] hexToBytes(String s) {
-        int len = s.length();
-        byte[] data = new byte[len / 2];
-        for (int i = 0; i < len; i += 2) {
-            data[i / 2] = (byte) ((Character.digit(s.charAt(i), 16) << 4)
-                    + Character.digit(s.charAt(i + 1), 16));
-        }
-        return data;
-    }
-
-    public static int ByteToInt(byte b) {
-        return b & 0x000000FF;
-    }
-
-}
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Basal_Get_Profile_Basal_Rate.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Basal_Get_Profile_Basal_Rate.kt
deleted file mode 100644
index 721479198c..0000000000
--- a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Basal_Get_Profile_Basal_Rate.kt
+++ /dev/null
@@ -1,47 +0,0 @@
-package info.nightscout.androidaps.danars.comm
-
-import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.dana.DanaPump
-import info.nightscout.androidaps.danars.encryption.BleEncryption
-import java.util.*
-import javax.inject.Inject
-
-open class DanaRS_Packet_Basal_Get_Profile_Basal_Rate(
-    injector: HasAndroidInjector,
-    private val profileNumber: Int = 0
-) : DanaRS_Packet(injector) {
-
-    @Inject lateinit var danaPump: DanaPump
-
-    init {
-        opCode = BleEncryption.DANAR_PACKET__OPCODE_BASAL__GET_PROFILE_BASAL_RATE
-        aapsLogger.debug(LTag.PUMPCOMM, "Requesting basal rates for profile $profileNumber")
-    }
-
-    override fun getRequestParams(): ByteArray {
-        val request = ByteArray(1)
-        request[0] = (profileNumber and 0xff).toByte()
-        return request
-    }
-
-    override fun handleMessage(data: ByteArray) {
-        var dataIndex = DATA_START
-        var dataSize = 2
-        danaPump.pumpProfiles = Array(4) { Array(48) { 0.0 } }
-        var i = 0
-        val size = 24
-        while (i < size) {
-            danaPump.pumpProfiles!![profileNumber][i] = byteArrayToInt(getBytes(data, dataIndex, dataSize)) / 100.0
-            dataIndex += dataSize
-            dataSize = 2
-            i++
-        }
-        for (index in 0..23)
-            aapsLogger.debug(LTag.PUMPCOMM, "Basal " + String.format(Locale.ENGLISH, "%02d", index) + "h: " + danaPump.pumpProfiles!![profileNumber][index])
-    }
-
-    override fun getFriendlyName(): String {
-        return "BASAL__GET_PROFILE_BASAL_RATE"
-    }
-}
\ No newline at end of file
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Basal_Get_Temporary_Basal_State.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Basal_Get_Temporary_Basal_State.kt
deleted file mode 100644
index f8f475f759..0000000000
--- a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Basal_Get_Temporary_Basal_State.kt
+++ /dev/null
@@ -1,55 +0,0 @@
-package info.nightscout.androidaps.danars.comm
-
-import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.dana.DanaPump
-import info.nightscout.androidaps.danars.encryption.BleEncryption
-import javax.inject.Inject
-import kotlin.math.abs
-import kotlin.math.ceil
-
-class DanaRS_Packet_Basal_Get_Temporary_Basal_State(
-    injector: HasAndroidInjector
-) : DanaRS_Packet(injector) {
-
-    @Inject lateinit var danaPump: DanaPump
-
-    init {
-        opCode = BleEncryption.DANAR_PACKET__OPCODE_BASAL__TEMPORARY_BASAL_STATE
-        aapsLogger.debug(LTag.PUMPCOMM, "Requesting temporary basal status")
-    }
-
-    var isTempBasalInProgress: Boolean = false
-    var tempBasalTotalSec: Int = 0
-    var tempBasalPercent: Int = 0
-
-    override fun handleMessage(data: ByteArray) {
-        val error = byteArrayToInt(getBytes(data, DATA_START, 1))
-        isTempBasalInProgress = byteArrayToInt(getBytes(data, DATA_START + 1, 1)) == 0x01
-        val isAPSTempBasalInProgress = byteArrayToInt(getBytes(data, DATA_START + 1, 1)) == 0x02
-        tempBasalPercent = byteArrayToInt(getBytes(data, DATA_START + 2, 1))
-        if (tempBasalPercent > 200) tempBasalPercent = (tempBasalPercent - 200) * 10
-        val durationHour = byteArrayToInt(getBytes(data, DATA_START + 3, 1))
-        tempBasalTotalSec = if (durationHour == 150) 15 * 60 else if (durationHour == 160) 30 * 60 else durationHour * 60 * 60
-        val runningMin = byteArrayToInt(getBytes(data, DATA_START + 4, 2))
-        if (error != 0) failed = true
-        val tempBasalRemainingMin = (danaPump.tempBasalTotalSec - runningMin * 60) / 60
-        val tempBasalStart = if (isTempBasalInProgress) getDateFromTempBasalSecAgo(runningMin * 60) else 0
-        if (!isTempBasalInProgress) danaPump.isTempBasalInProgress = false
-        aapsLogger.debug(LTag.PUMPCOMM, "Error code: $error")
-        aapsLogger.debug(LTag.PUMPCOMM, "Is temp basal running: $isTempBasalInProgress")
-        aapsLogger.debug(LTag.PUMPCOMM, "Is APS temp basal running: $isAPSTempBasalInProgress")
-        aapsLogger.debug(LTag.PUMPCOMM, "Current temp basal percent: $tempBasalPercent")
-        aapsLogger.debug(LTag.PUMPCOMM, "Current temp basal remaining min: $tempBasalRemainingMin")
-        aapsLogger.debug(LTag.PUMPCOMM, "Current temp basal total sec: $tempBasalTotalSec")
-        aapsLogger.debug(LTag.PUMPCOMM, "Current temp basal start: " + dateUtil.dateAndTimeString(tempBasalStart))
-    }
-
-    override fun getFriendlyName(): String {
-        return "BASAL__TEMPORARY_BASAL_STATE"
-    }
-
-    private fun getDateFromTempBasalSecAgo(tempBasalAgoSecs: Int): Long {
-        return (ceil(System.currentTimeMillis() / 1000.0) - tempBasalAgoSecs).toLong() * 1000
-    }
-}
\ No newline at end of file
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Basal_Set_Basal_Rate.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Basal_Set_Basal_Rate.kt
deleted file mode 100644
index de96fb2c4d..0000000000
--- a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Basal_Set_Basal_Rate.kt
+++ /dev/null
@@ -1,45 +0,0 @@
-package info.nightscout.androidaps.danars.comm
-
-import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.danars.encryption.BleEncryption
-
-class DanaRS_Packet_Basal_Set_Basal_Rate(
-    injector: HasAndroidInjector,
-    private var profileBasalRate: Array<Double>
-) : DanaRS_Packet(injector) {
-
-
-    init {
-        opCode = BleEncryption.DANAR_PACKET__OPCODE_BASAL__SET_BASAL_RATE
-        aapsLogger.debug(LTag.PUMPCOMM, "Setting new basal rates")
-    }
-
-    override fun getRequestParams(): ByteArray {
-        val request = ByteArray(48)
-        var i = 0
-        val size = 24
-        while (i < size) {
-            val rate = (profileBasalRate[i] * 100.0).toInt()
-            request[0 + i * 2] = (rate and 0xff).toByte()
-            request[1 + i * 2] = (rate ushr 8 and 0xff).toByte()
-            i++
-        }
-        return request
-    }
-
-    override fun handleMessage(data: ByteArray) {
-        val result = intFromBuff(data, 0, 1)
-        if (result == 0) {
-            aapsLogger.debug(LTag.PUMPCOMM, "Result OK")
-            failed = false
-        } else {
-            aapsLogger.error("Result Error: $result")
-            failed = true
-        }
-    }
-
-    override fun getFriendlyName(): String {
-        return "BASAL__SET_BASAL_RATE"
-    }
-}
\ No newline at end of file
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_Carbohydrate_Calculation_Information.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_Carbohydrate_Calculation_Information.kt
deleted file mode 100644
index e51a25967d..0000000000
--- a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_Carbohydrate_Calculation_Information.kt
+++ /dev/null
@@ -1,39 +0,0 @@
-package info.nightscout.androidaps.danars.comm
-
-import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.dana.DanaPump
-import info.nightscout.androidaps.danars.encryption.BleEncryption
-import javax.inject.Inject
-
-class DanaRS_Packet_Bolus_Get_Carbohydrate_Calculation_Information(
-    injector: HasAndroidInjector
-) : DanaRS_Packet(injector) {
-
-    @Inject lateinit var danaPump: DanaPump
-
-    init {
-        opCode = BleEncryption.DANAR_PACKET__OPCODE_BOLUS__GET_CARBOHYDRATE_CALCULATION_INFORMATION
-        aapsLogger.debug(LTag.PUMPCOMM, "New message")
-    }
-
-    override fun handleMessage(data: ByteArray) {
-        var dataIndex = DATA_START
-        var dataSize = 1
-        val error = byteArrayToInt(getBytes(data, dataIndex, dataSize))
-        dataIndex += dataSize
-        dataSize = 2
-        val carbs = byteArrayToInt(getBytes(data, dataIndex, dataSize))
-        dataIndex += dataSize
-        dataSize = 2
-        danaPump.currentCIR = byteArrayToInt(getBytes(data, dataIndex, dataSize))
-        if (error != 0) failed = true
-        aapsLogger.debug(LTag.PUMPCOMM, "Result: $error")
-        aapsLogger.debug(LTag.PUMPCOMM, "Carbs: $carbs")
-        aapsLogger.debug(LTag.PUMPCOMM, "Current CIR: " + danaPump.currentCIR)
-    }
-
-    override fun getFriendlyName(): String {
-        return "BOLUS__GET_CARBOHYDRATE_CALCULATION_INFORMATION"
-    }
-}
\ No newline at end of file
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_Dual_Bolus.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_Dual_Bolus.kt
deleted file mode 100644
index 309f3ed561..0000000000
--- a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_Dual_Bolus.kt
+++ /dev/null
@@ -1,37 +0,0 @@
-package info.nightscout.androidaps.danars.comm
-
-import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.dana.DanaPump
-import info.nightscout.androidaps.danars.encryption.BleEncryption
-import javax.inject.Inject
-
-class DanaRS_Packet_Bolus_Get_Dual_Bolus(
-    injector: HasAndroidInjector
-) : DanaRS_Packet(injector) {
-
-    @Inject lateinit var danaPump: DanaPump
-
-    init {
-        opCode = BleEncryption.DANAR_PACKET__OPCODE_BOLUS__GET_DUAL_BOLUS
-        aapsLogger.debug(LTag.PUMPCOMM, "New message")
-    }
-
-    override fun handleMessage(data: ByteArray) {
-        val error = byteArrayToInt(getBytes(data, DATA_START, 1))
-        danaPump.bolusStep = byteArrayToInt(getBytes(data, DATA_START + 1, 2)) / 100.0
-        val extendedBolusAbsoluteRate = byteArrayToInt(getBytes(data, DATA_START + 3, 2)) / 100.0
-        danaPump.maxBolus = byteArrayToInt(getBytes(data, DATA_START + 5, 2)) / 100.0
-        val bolusIncrement = byteArrayToInt(getBytes(data, DATA_START + 7, 1)) / 100.0
-        failed = error != 0
-        aapsLogger.debug(LTag.PUMPCOMM, "Result: $error")
-        aapsLogger.debug(LTag.PUMPCOMM, "Bolus step: ${danaPump.bolusStep} U")
-        aapsLogger.debug(LTag.PUMPCOMM, "Extended bolus running: $extendedBolusAbsoluteRate U/h")
-        aapsLogger.debug(LTag.PUMPCOMM, "Max bolus: " + danaPump.maxBolus + " U")
-        aapsLogger.debug(LTag.PUMPCOMM, "bolusIncrement: $bolusIncrement U")
-    }
-
-    override fun getFriendlyName(): String {
-        return "BOLUS__GET_DUAL_BOLUS"
-    }
-}
\ No newline at end of file
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_Extended_Bolus.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_Extended_Bolus.kt
deleted file mode 100644
index 623e1f8361..0000000000
--- a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_Extended_Bolus.kt
+++ /dev/null
@@ -1,43 +0,0 @@
-package info.nightscout.androidaps.danars.comm
-
-import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.dana.DanaPump
-import info.nightscout.androidaps.danars.encryption.BleEncryption
-import javax.inject.Inject
-
-class DanaRS_Packet_Bolus_Get_Extended_Bolus(
-    injector: HasAndroidInjector
-) : DanaRS_Packet(injector) {
-
-    @Inject lateinit var danaPump: DanaPump
-
-    init {
-        opCode = BleEncryption.DANAR_PACKET__OPCODE_BOLUS__GET_EXTENDED_BOLUS
-        aapsLogger.debug(LTag.PUMPCOMM, "New message")
-    }
-
-    override fun handleMessage(data: ByteArray) {
-        var dataIndex = DATA_START
-        var dataSize = 1
-        val error = byteArrayToInt(getBytes(data, dataIndex, dataSize))
-        dataIndex += dataSize
-        dataSize = 2
-        val extendedBolusAbsoluteRate = byteArrayToInt(getBytes(data, dataIndex, dataSize)) / 100.0
-        dataIndex += dataSize
-        dataSize = 2
-        danaPump.maxBolus = byteArrayToInt(getBytes(data, dataIndex, dataSize)) / 100.0
-        dataIndex += dataSize
-        dataSize = 1
-        danaPump.bolusStep = byteArrayToInt(getBytes(data, dataIndex, dataSize)) / 100.0
-        failed = error != 0
-        aapsLogger.debug(LTag.PUMPCOMM, "Result: $error")
-        aapsLogger.debug(LTag.PUMPCOMM, "Extended bolus running: $extendedBolusAbsoluteRate U/h")
-        aapsLogger.debug(LTag.PUMPCOMM, "Max bolus: " + danaPump.maxBolus + " U")
-        aapsLogger.debug(LTag.PUMPCOMM, "Bolus step: " + danaPump.bolusStep + " U")
-    }
-
-    override fun getFriendlyName(): String {
-        return "BOLUS__GET_EXTENDED_BOLUS"
-    }
-}
\ No newline at end of file
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_Extended_Bolus_State.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_Extended_Bolus_State.kt
deleted file mode 100644
index e3e6cb9e45..0000000000
--- a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_Extended_Bolus_State.kt
+++ /dev/null
@@ -1,54 +0,0 @@
-package info.nightscout.androidaps.danars.comm
-
-import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.dana.DanaPump
-import info.nightscout.androidaps.danars.encryption.BleEncryption
-import info.nightscout.androidaps.utils.T
-import javax.inject.Inject
-
-class DanaRS_Packet_Bolus_Get_Extended_Bolus_State(
-    injector: HasAndroidInjector
-) : DanaRS_Packet(injector) {
-
-    @Inject lateinit var danaPump: DanaPump
-
-    init {
-        opCode = BleEncryption.DANAR_PACKET__OPCODE_BOLUS__GET_EXTENDED_BOLUS_STATE
-        aapsLogger.debug(LTag.PUMPCOMM, "New message")
-    }
-
-    var isExtendedInProgress: Boolean = false
-
-    override fun handleMessage(data: ByteArray) {
-        var dataIndex = DATA_START
-        var dataSize = 1
-        val error = byteArrayToInt(getBytes(data, dataIndex, dataSize))
-        dataIndex += dataSize
-        dataSize = 1
-        isExtendedInProgress = byteArrayToInt(getBytes(data, dataIndex, dataSize)) == 0x01
-        dataIndex += dataSize
-        dataSize = 1
-        val extendedBolusDuration = T.mins(byteArrayToInt(getBytes(data, dataIndex, dataSize)) * 30L).msecs()
-        dataIndex += dataSize
-        dataSize = 2
-        val extendedBolusAbsoluteRate = byteArrayToInt(getBytes(data, dataIndex, dataSize)) / 100.0 // duration must be set first for recalculation to amount
-        dataIndex += dataSize
-        dataSize = 2
-        val extendedBolusSoFarInMinutes = byteArrayToInt(getBytes(data, dataIndex, dataSize))
-        dataIndex += dataSize
-        dataSize = 2
-        val extendedBolusDeliveredSoFar = byteArrayToInt(getBytes(data, dataIndex, dataSize)) / 100.0
-        failed = error != 0
-        aapsLogger.debug(LTag.PUMPCOMM, "Result: $error")
-        aapsLogger.debug(LTag.PUMPCOMM, "Is extended bolus running: $isExtendedInProgress")
-        aapsLogger.debug(LTag.PUMPCOMM, "Extended bolus running: $extendedBolusAbsoluteRate U/h")
-        aapsLogger.debug(LTag.PUMPCOMM, "Extended bolus duration: " + T.msecs(extendedBolusDuration).mins() + " min")
-        aapsLogger.debug(LTag.PUMPCOMM, "Extended bolus so far: $extendedBolusSoFarInMinutes min")
-        aapsLogger.debug(LTag.PUMPCOMM, "Extended bolus delivered so far: $extendedBolusDeliveredSoFar U")
-    }
-
-    override fun getFriendlyName(): String {
-        return "BOLUS__GET_EXTENDED_BOLUS_STATE"
-    }
-}
\ No newline at end of file
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_Extended_Menu_Option_State.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_Extended_Menu_Option_State.kt
deleted file mode 100644
index 9f4a26da6f..0000000000
--- a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_Extended_Menu_Option_State.kt
+++ /dev/null
@@ -1,35 +0,0 @@
-package info.nightscout.androidaps.danars.comm
-
-import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.dana.DanaPump
-import info.nightscout.androidaps.danars.encryption.BleEncryption
-import javax.inject.Inject
-
-class DanaRS_Packet_Bolus_Get_Extended_Menu_Option_State(
-    injector: HasAndroidInjector
-) : DanaRS_Packet(injector) {
-
-    @Inject lateinit var danaPump: DanaPump
-
-    init {
-        opCode = BleEncryption.DANAR_PACKET__OPCODE_BOLUS__GET_EXTENDED_MENU_OPTION_STATE
-        aapsLogger.debug(LTag.PUMPCOMM, "New message")
-    }
-
-    var isExtendedInProgress: Boolean = false
-
-    override fun handleMessage(data: ByteArray) {
-        var dataIndex = DATA_START
-        var dataSize = 1
-        val extendedMenuOption = byteArrayToInt(getBytes(data, dataIndex, dataSize))
-        dataIndex += dataSize
-        dataSize = 1
-        isExtendedInProgress = byteArrayToInt(getBytes(data, dataIndex, dataSize)) == 0x01
-        aapsLogger.debug(LTag.PUMPCOMM, "extendedMenuOption: $extendedMenuOption")
-    }
-
-    override fun getFriendlyName(): String {
-        return "BOLUS__GET_EXTENDED_MENU_OPTION_STATE"
-    }
-}
\ No newline at end of file
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_Initial_Bolus.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_Initial_Bolus.kt
deleted file mode 100644
index 3c58bc5175..0000000000
--- a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_Initial_Bolus.kt
+++ /dev/null
@@ -1,43 +0,0 @@
-package info.nightscout.androidaps.danars.comm
-
-import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.danars.encryption.BleEncryption
-
-class DanaRS_Packet_Bolus_Get_Initial_Bolus(
-    injector: HasAndroidInjector
-) : DanaRS_Packet(injector) {
-
-    init {
-        opCode = BleEncryption.DANAR_PACKET__OPCODE_BOLUS__GET_BOLUS_RATE
-        aapsLogger.debug(LTag.PUMPCOMM, "New message")
-    }
-
-    override fun handleMessage(data: ByteArray) {
-        val initialBolusValue01: Double
-        val initialBolusValue02: Double
-        val initialBolusValue03: Double
-        val initialBolusValue04: Double
-        var dataIndex = DATA_START
-        var dataSize = 2
-        initialBolusValue01 = byteArrayToInt(getBytes(data, dataIndex, dataSize)) / 100.0
-        dataIndex += dataSize
-        dataSize = 2
-        initialBolusValue02 = byteArrayToInt(getBytes(data, dataIndex, dataSize)) / 100.0
-        dataIndex += dataSize
-        dataSize = 2
-        initialBolusValue03 = byteArrayToInt(getBytes(data, dataIndex, dataSize)) / 100.0
-        dataIndex += dataSize
-        dataSize = 2
-        initialBolusValue04 = byteArrayToInt(getBytes(data, dataIndex, dataSize)) / 100.0
-        failed = initialBolusValue01 == 0.0 && initialBolusValue02 == 0.0 && initialBolusValue03 == 0.0 && initialBolusValue04 == 0.0
-        aapsLogger.debug(LTag.PUMPCOMM, "Initial bolus amount 01: $initialBolusValue01")
-        aapsLogger.debug(LTag.PUMPCOMM, "Initial bolus amount 02: $initialBolusValue02")
-        aapsLogger.debug(LTag.PUMPCOMM, "Initial bolus amount 03: $initialBolusValue03")
-        aapsLogger.debug(LTag.PUMPCOMM, "Initial bolus amount 04: $initialBolusValue04")
-    }
-
-    override fun getFriendlyName(): String {
-        return "BOLUS__GET_BOLUS_RATE"
-    }
-}
\ No newline at end of file
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Set_CIR_CF_Array.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Set_CIR_CF_Array.kt
deleted file mode 100644
index 783b874f4a..0000000000
--- a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Set_CIR_CF_Array.kt
+++ /dev/null
@@ -1,77 +0,0 @@
-package info.nightscout.androidaps.danars.comm
-
-import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.danars.encryption.BleEncryption
-
-class DanaRS_Packet_Bolus_Set_CIR_CF_Array(
-    injector: HasAndroidInjector,
-    private var cir01: Int = 0,
-    private var cir02: Int = 0,
-    private var cir03: Int = 0,
-    private var cir04: Int = 0,
-    private var cir05: Int = 0,
-    private var cir06: Int = 0,
-    private var cir07: Int = 0,
-    private var cf01: Int = 0,
-    private var cf02: Int = 0,
-    private var cf03: Int = 0,
-    private var cf04: Int = 0,
-    private var cf05: Int = 0,
-    private var cf06: Int = 0,
-    private var cf07: Int = 0
-) : DanaRS_Packet(injector) {
-
-    init {
-        opCode = BleEncryption.DANAR_PACKET__OPCODE_BOLUS__SET_CIR_CF_ARRAY
-        aapsLogger.debug(LTag.PUMPCOMM, "New message")
-    }
-
-    override fun getRequestParams(): ByteArray {
-        val request = ByteArray(28)
-        request[0] = (cir01 and 0xff).toByte()
-        request[1] = (cir01 ushr 8 and 0xff).toByte()
-        request[2] = (cir02 and 0xff).toByte()
-        request[3] = (cir02 ushr 8 and 0xff).toByte()
-        request[4] = (cir03 and 0xff).toByte()
-        request[5] = (cir03 ushr 8 and 0xff).toByte()
-        request[6] = (cir04 and 0xff).toByte()
-        request[7] = (cir04 ushr 8 and 0xff).toByte()
-        request[8] = (cir05 and 0xff).toByte()
-        request[9] = (cir05 ushr 8 and 0xff).toByte()
-        request[10] = (cir06 and 0xff).toByte()
-        request[11] = (cir06 ushr 8 and 0xff).toByte()
-        request[12] = (cir07 and 0xff).toByte()
-        request[13] = (cir07 ushr 8 and 0xff).toByte()
-        request[14] = (cf01 and 0xff).toByte()
-        request[15] = (cf01 ushr 8 and 0xff).toByte()
-        request[16] = (cf02 and 0xff).toByte()
-        request[17] = (cf02 ushr 8 and 0xff).toByte()
-        request[18] = (cf03 and 0xff).toByte()
-        request[19] = (cf03 ushr 8 and 0xff).toByte()
-        request[20] = (cf04 and 0xff).toByte()
-        request[21] = (cf04 ushr 8 and 0xff).toByte()
-        request[22] = (cf05 and 0xff).toByte()
-        request[23] = (cf05 ushr 8 and 0xff).toByte()
-        request[24] = (cf06 and 0xff).toByte()
-        request[25] = (cf06 ushr 8 and 0xff).toByte()
-        request[26] = (cf07 and 0xff).toByte()
-        request[27] = (cf07 ushr 8 and 0xff).toByte()
-        return request
-    }
-
-    override fun handleMessage(data: ByteArray) {
-        val result = intFromBuff(data, 0, 1)
-        if (result == 0) {
-            aapsLogger.debug(LTag.PUMPCOMM, "Result OK")
-            failed = false
-        } else {
-            aapsLogger.error("Result Error: $result")
-            failed = true
-        }
-    }
-
-    override fun getFriendlyName(): String {
-        return "BOLUS__SET_CIR_CF_ARRAY"
-    }
-}
\ No newline at end of file
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Set_Dual_Bolus.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Set_Dual_Bolus.kt
deleted file mode 100644
index 0f93dbf349..0000000000
--- a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Set_Dual_Bolus.kt
+++ /dev/null
@@ -1,45 +0,0 @@
-package info.nightscout.androidaps.danars.comm
-
-import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.danars.encryption.BleEncryption
-
-class DanaRS_Packet_Bolus_Set_Dual_Bolus(
-    injector: HasAndroidInjector,
-    private var amount: Double = 0.0,
-    private var extendedAmount: Double = 0.0,
-    private var extendedBolusDurationInHalfHours: Int = 0
-) : DanaRS_Packet(injector) {
-
-    init {
-        opCode = BleEncryption.DANAR_PACKET__OPCODE_BOLUS__SET_DUAL_BOLUS
-        aapsLogger.debug(LTag.PUMPCOMM, "Dual bolus start : $amount U extended: $extendedAmount U halfhours: $extendedBolusDurationInHalfHours")
-    }
-
-    override fun getRequestParams(): ByteArray {
-        val stepBolusRate = (amount / 100.0).toInt()
-        val extendedBolusRate = (extendedAmount / 100.0).toInt()
-        val request = ByteArray(5)
-        request[0] = (stepBolusRate and 0xff).toByte()
-        request[1] = (stepBolusRate ushr 8 and 0xff).toByte()
-        request[2] = (extendedBolusRate and 0xff).toByte()
-        request[3] = (extendedBolusRate ushr 8 and 0xff).toByte()
-        request[4] = (extendedBolusDurationInHalfHours and 0xff).toByte()
-        return request
-    }
-
-    override fun handleMessage(data: ByteArray) {
-        val result = intFromBuff(data, 0, 1)
-        if (result == 0) {
-            aapsLogger.debug(LTag.PUMPCOMM, "Result OK")
-            failed = false
-        } else {
-            aapsLogger.error("Result Error: $result")
-            failed = true
-        }
-    }
-
-    override fun getFriendlyName(): String {
-        return "BOLUS__SET_DUAL_BOLUS"
-    }
-}
\ No newline at end of file
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Set_Initial_Bolus.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Set_Initial_Bolus.kt
deleted file mode 100644
index 6b8278ac29..0000000000
--- a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Set_Initial_Bolus.kt
+++ /dev/null
@@ -1,47 +0,0 @@
-package info.nightscout.androidaps.danars.comm
-
-import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.danars.encryption.BleEncryption
-
-class DanaRS_Packet_Bolus_Set_Initial_Bolus(
-    injector: HasAndroidInjector,
-    private var bolusRate01: Int = 0,
-    private var bolusRate02: Int = 0,
-    private var bolusRate03: Int = 0,
-    private var bolusRate04: Int = 0
-) : DanaRS_Packet(injector) {
-
-    init {
-        opCode = BleEncryption.DANAR_PACKET__OPCODE_BOLUS__SET_BOLUS_RATE
-        aapsLogger.debug(LTag.PUMPCOMM, "New message")
-    }
-
-    override fun getRequestParams(): ByteArray {
-        val request = ByteArray(8)
-        request[0] = (bolusRate01 and 0xff).toByte()
-        request[1] = (bolusRate01 ushr 8 and 0xff).toByte()
-        request[2] = (bolusRate02 and 0xff).toByte()
-        request[3] = (bolusRate02 ushr 8 and 0xff).toByte()
-        request[4] = (bolusRate03 and 0xff).toByte()
-        request[5] = (bolusRate03 ushr 8 and 0xff).toByte()
-        request[6] = (bolusRate04 and 0xff).toByte()
-        request[7] = (bolusRate04 ushr 8 and 0xff).toByte()
-        return request
-    }
-
-    override fun handleMessage(data: ByteArray) {
-        val result = intFromBuff(data, 0, 1)
-        if (result == 0) {
-            aapsLogger.debug(LTag.PUMPCOMM, "Result OK")
-            failed = false
-        } else {
-            aapsLogger.error("Result Error: $result")
-            failed = true
-        }
-    }
-
-    override fun getFriendlyName(): String {
-        return "BOLUS__SET_BOLUS_RATE"
-    }
-}
\ No newline at end of file
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Delivery_Status.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Delivery_Status.kt
deleted file mode 100644
index 9ff3884a57..0000000000
--- a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Delivery_Status.kt
+++ /dev/null
@@ -1,30 +0,0 @@
-package info.nightscout.androidaps.danars.comm
-
-import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.danars.encryption.BleEncryption
-
-class DanaRS_Packet_General_Delivery_Status(
-    injector: HasAndroidInjector
-) : DanaRS_Packet(injector) {
-
-    init {
-        opCode = BleEncryption.DANAR_PACKET__OPCODE_REVIEW__DELIVERY_STATUS
-        aapsLogger.debug(LTag.PUMPCOMM, "New message")
-    }
-
-    override fun handleMessage(data: ByteArray) {
-        val result = intFromBuff(data, 0, 1)
-        if (result == 0) {
-            aapsLogger.debug(LTag.PUMPCOMM, "Result OK")
-            failed = false
-        } else {
-            aapsLogger.error("Result Error: $result")
-            failed = true
-        }
-    }
-
-    override fun getFriendlyName(): String {
-        return "REVIEW__DELIVERY_STATUS"
-    }
-}
\ No newline at end of file
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Get_More_Information.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Get_More_Information.kt
deleted file mode 100644
index 4659e91dae..0000000000
--- a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Get_More_Information.kt
+++ /dev/null
@@ -1,49 +0,0 @@
-package info.nightscout.androidaps.danars.comm
-
-import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.dana.DanaPump
-import info.nightscout.androidaps.danars.encryption.BleEncryption
-import org.joda.time.DateTime
-import org.joda.time.DateTimeZone
-import javax.inject.Inject
-
-class DanaRS_Packet_General_Get_More_Information(
-    injector: HasAndroidInjector
-) : DanaRS_Packet(injector) {
-
-    @Inject lateinit var danaPump: DanaPump
-
-    init {
-        opCode = BleEncryption.DANAR_PACKET__OPCODE_REVIEW__GET_MORE_INFORMATION
-        aapsLogger.debug(LTag.PUMPCOMM, "New message")
-    }
-
-    override fun handleMessage(data: ByteArray) {
-        if (data.size < 15) {
-            failed = true
-            return
-        }
-        danaPump.iob = intFromBuff(data, 0, 2) / 100.0
-        danaPump.dailyTotalUnits = intFromBuff(data, 2, 2) / 100.0
-        val isExtendedInProgress = intFromBuff(data, 4, 1) == 0x01
-        val extendedBolusRemainingMinutes = intFromBuff(data, 5, 2)
-        // val remainRate = intFromBuff(data, 7, 2) / 100.0
-        val hours = intFromBuff(data, 9, 1)
-        val minutes = intFromBuff(data, 10, 1)
-        if (danaPump.usingUTC) danaPump.lastBolusTime = DateTime.now().withZone(DateTimeZone.UTC).withHourOfDay(hours).withMinuteOfHour(minutes).millis
-        else danaPump.lastBolusTime = DateTime.now().withHourOfDay(hours).withMinuteOfHour(minutes).millis
-        danaPump.lastBolusAmount = intFromBuff(data, 11, 2) / 100.0
-        // On DanaRS DailyUnits can't be more than 160
-        if (danaPump.dailyTotalUnits > 160) failed = true
-        aapsLogger.debug(LTag.PUMPCOMM, "Daily total units: " + danaPump.dailyTotalUnits.toString() + " U")
-        aapsLogger.debug(LTag.PUMPCOMM, "Is extended in progress: $isExtendedInProgress")
-        aapsLogger.debug(LTag.PUMPCOMM, "Extended bolus remaining minutes: $extendedBolusRemainingMinutes")
-        aapsLogger.debug(LTag.PUMPCOMM, "Last bolus time: " + dateUtil.dateAndTimeAndSecondsString(danaPump.lastBolusTime))
-        aapsLogger.debug(LTag.PUMPCOMM, "Last bolus amount: " + danaPump.lastBolusAmount)
-    }
-
-    override fun getFriendlyName(): String {
-        return "REVIEW__GET_MORE_INFORMATION"
-    }
-}
\ No newline at end of file
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Get_Password.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Get_Password.kt
deleted file mode 100644
index 34d9ce1238..0000000000
--- a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Get_Password.kt
+++ /dev/null
@@ -1,36 +0,0 @@
-package info.nightscout.androidaps.danars.comm
-
-import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.dana.DanaPump
-import info.nightscout.androidaps.danars.encryption.BleEncryption
-import javax.inject.Inject
-
-class DanaRS_Packet_General_Get_Password(
-    injector: HasAndroidInjector
-) : DanaRS_Packet(injector) {
-
-    @Inject lateinit var danaPump: DanaPump
-
-    init {
-        opCode = BleEncryption.DANAR_PACKET__OPCODE_REVIEW__GET_PASSWORD
-        aapsLogger.debug(LTag.PUMPCOMM, "New message")
-    }
-
-    override fun handleMessage(data: ByteArray) {
-        if (data.size < 2) { // returned data size is too small
-            failed = true
-            return
-        } else {
-            failed = false
-        }
-        var pass: Int = (data[DATA_START + 1].toInt() and 0x000000FF shl 8) + (data[DATA_START + 0].toInt() and 0x000000FF)
-        pass = pass xor 3463
-        danaPump.rsPassword = Integer.toHexString(pass)
-        aapsLogger.debug(LTag.PUMPCOMM, "Pump password: " + danaPump.rsPassword)
-    }
-
-    override fun getFriendlyName(): String {
-        return "REVIEW__GET_PASSWORD"
-    }
-}
\ No newline at end of file
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Get_Today_Delivery_Total.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Get_Today_Delivery_Total.kt
deleted file mode 100644
index 4eece3e5fe..0000000000
--- a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Get_Today_Delivery_Total.kt
+++ /dev/null
@@ -1,42 +0,0 @@
-package info.nightscout.androidaps.danars.comm
-
-import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.dana.DanaPump
-import info.nightscout.androidaps.danars.encryption.BleEncryption
-import javax.inject.Inject
-
-class DanaRS_Packet_General_Get_Today_Delivery_Total(
-    injector: HasAndroidInjector
-) : DanaRS_Packet(injector) {
-
-    @Inject lateinit var danaPump: DanaPump
-
-    init {
-        opCode = BleEncryption.DANAR_PACKET__OPCODE_REVIEW__GET_TODAY_DELIVERY_TOTAL
-        aapsLogger.debug(LTag.PUMPCOMM, "New message")
-    }
-
-    override fun handleMessage(data: ByteArray) {
-        if (data.size < 8) {
-            failed = true
-            return
-        } else failed = false
-        var dataIndex = DATA_START
-        var dataSize = 2
-        danaPump.dailyTotalUnits = byteArrayToInt(getBytes(data, dataIndex, dataSize)) / 100.0
-        dataIndex += dataSize
-        dataSize = 2
-        danaPump.dailyTotalBasalUnits = byteArrayToInt(getBytes(data, dataIndex, dataSize)) / 100.0
-        dataIndex += dataSize
-        dataSize = 2
-        danaPump.dailyTotalBolusUnits = byteArrayToInt(getBytes(data, dataIndex, dataSize)) / 100.0
-        aapsLogger.debug(LTag.PUMPCOMM, "Daily total: " + danaPump.dailyTotalUnits + " U")
-        aapsLogger.debug(LTag.PUMPCOMM, "Daily total bolus: " + danaPump.dailyTotalBolusUnits + " U")
-        aapsLogger.debug(LTag.PUMPCOMM, "Daily total basal: " + danaPump.dailyTotalBasalUnits + " U")
-    }
-
-    override fun getFriendlyName(): String {
-        return "REVIEW__GET_TODAY_DELIVERY_TOTAL"
-    }
-}
\ No newline at end of file
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/di/DanaRSCommModule.kt b/danars/src/main/java/info/nightscout/androidaps/danars/di/DanaRSCommModule.kt
index f239525f85..cef12e716c 100644
--- a/danars/src/main/java/info/nightscout/androidaps/danars/di/DanaRSCommModule.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/di/DanaRSCommModule.kt
@@ -8,76 +8,60 @@ import info.nightscout.androidaps.danars.comm.*
 @Suppress("unused")
 abstract class DanaRSCommModule {
 
-    @ContributesAndroidInjector abstract fun contributesDanaRS_Packet(): DanaRS_Packet
-    @ContributesAndroidInjector abstract fun contributesDanaRS_Packet_Basal_Set_Cancel_Temporary_Basal(): DanaRS_Packet_Basal_Set_Cancel_Temporary_Basal
-    @ContributesAndroidInjector abstract fun contributesDanaRS_Packet_Basal_Get_Basal_Rate(): DanaRS_Packet_Basal_Get_Basal_Rate
-    @ContributesAndroidInjector abstract fun contributesDanaRS_Packet_Basal_Get_Profile_Basal_Rate(): DanaRS_Packet_Basal_Get_Profile_Basal_Rate
-    @ContributesAndroidInjector abstract fun contributesDanaRS_Packet_Basal_Get_Profile_Number(): DanaRS_Packet_Basal_Get_Profile_Number
-    @ContributesAndroidInjector abstract fun contributesDanaRS_Packet_Basal_Set_Basal_Rate(): DanaRS_Packet_Basal_Set_Basal_Rate
-    @ContributesAndroidInjector abstract fun contributesDanaRS_Packet_Basal_Set_Profile_Basal_Rate(): DanaRS_Packet_Basal_Set_Profile_Basal_Rate
-    @ContributesAndroidInjector abstract fun contributesDanaRS_Packet_Basal_Set_Profile_Number(): DanaRS_Packet_Basal_Set_Profile_Number
-    @ContributesAndroidInjector abstract fun contributesDanaRS_Packet_Basal_Set_Suspend_Off(): DanaRS_Packet_Basal_Set_Suspend_Off
-    @ContributesAndroidInjector abstract fun contributesDanaRS_Packet_Basal_Set_Suspend_On(): DanaRS_Packet_Basal_Set_Suspend_On
-    @ContributesAndroidInjector abstract fun contributesDanaRS_Packet_Basal_Set_Temporary_Basal(): DanaRS_Packet_Basal_Set_Temporary_Basal
-    @ContributesAndroidInjector abstract fun contributesDanaRS_Packet_Basal_Get_Temporary_Basal_State(): DanaRS_Packet_Basal_Get_Temporary_Basal_State
-    @ContributesAndroidInjector abstract fun contributesDanaRS_Packet_Bolus_Get_Bolus_Option(): DanaRS_Packet_Bolus_Get_Bolus_Option
-    @ContributesAndroidInjector abstract fun contributesDanaRS_Packet_Bolus_Get_Initial_Bolus(): DanaRS_Packet_Bolus_Get_Initial_Bolus
-    @ContributesAndroidInjector abstract fun contributesDanaRS_Packet_Bolus_Get_Calculation_Information(): DanaRS_Packet_Bolus_Get_Calculation_Information
-    @ContributesAndroidInjector abstract fun contributesDanaRS_Packet_Bolus_Get_Carbohydrate_Calculation_Information(): DanaRS_Packet_Bolus_Get_Carbohydrate_Calculation_Information
-    @ContributesAndroidInjector abstract fun contributesDanaRS_Packet_Bolus_Get_CIR_CF_Array(): DanaRS_Packet_Bolus_Get_CIR_CF_Array
-    @ContributesAndroidInjector abstract fun contributesDanaRS_Packet_Bolus_Get_24_CIR_CF_Array(): DanaRS_Packet_Bolus_Get_24_CIR_CF_Array
-    @ContributesAndroidInjector abstract fun contributesDanaRS_Packet_Bolus_Get_Dual_Bolus(): DanaRS_Packet_Bolus_Get_Dual_Bolus
-    @ContributesAndroidInjector abstract fun contributesDanaRS_Packet_Bolus_Get_Extended_Bolus(): DanaRS_Packet_Bolus_Get_Extended_Bolus
-    @ContributesAndroidInjector abstract fun contributesDanaRS_Packet_Bolus_Get_Extended_Bolus_State(): DanaRS_Packet_Bolus_Get_Extended_Bolus_State
-    @ContributesAndroidInjector abstract fun contributesDanaRS_Packet_Bolus_Get_Extended_Menu_Option_State(): DanaRS_Packet_Bolus_Get_Extended_Menu_Option_State
-    @ContributesAndroidInjector abstract fun contributesDanaRS_Packet_Bolus_Get_Step_Bolus_Information(): DanaRS_Packet_Bolus_Get_Step_Bolus_Information
-    @ContributesAndroidInjector abstract fun contributesDanaRS_Packet_Bolus_Set_Bolus_Option(): DanaRS_Packet_Bolus_Set_Bolus_Option
-    @ContributesAndroidInjector abstract fun contributesDanaRS_Packet_Bolus_Set_Initial_Bolus(): DanaRS_Packet_Bolus_Set_Initial_Bolus
-    @ContributesAndroidInjector abstract fun contributesDanaRS_Packet_Bolus_Set_CIR_CF_Array(): DanaRS_Packet_Bolus_Set_CIR_CF_Array
-    @ContributesAndroidInjector abstract fun contributesDanaRS_Packet_Bolus_Set_24_CIR_CF_Array(): DanaRS_Packet_Bolus_Set_24_CIR_CF_Array
-    @ContributesAndroidInjector abstract fun contributesDanaRS_Packet_Bolus_Set_Dual_Bolus(): DanaRS_Packet_Bolus_Set_Dual_Bolus
-    @ContributesAndroidInjector abstract fun contributesDanaRS_Packet_Bolus_Set_Extended_Bolus(): DanaRS_Packet_Bolus_Set_Extended_Bolus
-    @ContributesAndroidInjector abstract fun contributesDanaRS_Packet_Bolus_Set_Extended_Bolus_Cancel(): DanaRS_Packet_Bolus_Set_Extended_Bolus_Cancel
-    @ContributesAndroidInjector abstract fun contributesDanaRS_Packet_Bolus_Set_Step_Bolus_Start(): DanaRS_Packet_Bolus_Set_Step_Bolus_Start
-    @ContributesAndroidInjector abstract fun contributesDanaRS_Packet_Bolus_Set_Step_Bolus_Stop(): DanaRS_Packet_Bolus_Set_Step_Bolus_Stop
-    @ContributesAndroidInjector abstract fun contributesDanaRS_Packet_Etc_Keep_Connection(): DanaRS_Packet_Etc_Keep_Connection
-    @ContributesAndroidInjector abstract fun contributesDanaRS_Packet_Etc_Set_History_Save(): DanaRS_Packet_Etc_Set_History_Save
-    @ContributesAndroidInjector abstract fun contributesDanaRS_Packet_General_Delivery_Status(): DanaRS_Packet_General_Delivery_Status
-    @ContributesAndroidInjector abstract fun contributesDanaRS_Packet_General_Get_Password(): DanaRS_Packet_General_Get_Password
-    @ContributesAndroidInjector abstract fun contributesDanaRS_Packet_General_Initial_Screen_Information(): DanaRS_Packet_General_Initial_Screen_Information
-    @ContributesAndroidInjector abstract fun contributesDanaRS_Packet_Notify_Alarm(): DanaRS_Packet_Notify_Alarm
-    @ContributesAndroidInjector abstract fun contributesDanaRS_Packet_Notify_Delivery_Complete(): DanaRS_Packet_Notify_Delivery_Complete
-    @ContributesAndroidInjector abstract fun contributesDanaRS_Packet_Notify_Delivery_Rate_Display(): DanaRS_Packet_Notify_Delivery_Rate_Display
-    @ContributesAndroidInjector abstract fun contributesDanaRS_Packet_Notify_Missed_Bolus_Alarm(): DanaRS_Packet_Notify_Missed_Bolus_Alarm
-    @ContributesAndroidInjector abstract fun contributesDanaRS_Packet_Option_Get_Pump_Time(): DanaRS_Packet_Option_Get_Pump_Time
-    @ContributesAndroidInjector abstract fun contributesDanaRS_Packet_Option_Get_User_Option(): DanaRS_Packet_Option_Get_User_Option
-    @ContributesAndroidInjector abstract fun contributesDanaRS_Packet_Option_Set_Pump_Time(): DanaRS_Packet_Option_Set_Pump_Time
-    @ContributesAndroidInjector abstract fun contributesDanaRS_Packet_Option_Set_User_Option(): DanaRS_Packet_Option_Set_User_Option
-    @ContributesAndroidInjector abstract fun contributesDanaRS_Packet_History_(): DanaRS_Packet_History_
-    @ContributesAndroidInjector abstract fun contributesDanaRS_Packet_History_Alarm(): DanaRS_Packet_History_Alarm
-    @ContributesAndroidInjector abstract fun contributesDanaRS_Packet_History_All_History(): DanaRS_Packet_History_All_History
-    @ContributesAndroidInjector abstract fun contributesDanaRS_Packet_History_Basal(): DanaRS_Packet_History_Basal
-    @ContributesAndroidInjector abstract fun contributesDanaRS_Packet_History_Blood_Glucose(): DanaRS_Packet_History_Blood_Glucose
-    @ContributesAndroidInjector abstract fun contributesDanaRS_Packet_History_Bolus(): DanaRS_Packet_History_Bolus
-    @ContributesAndroidInjector abstract fun contributesDanaRS_Packet_Review_Bolus_Avg(): DanaRS_Packet_Review_Bolus_Avg
-    @ContributesAndroidInjector abstract fun contributesDanaRS_Packet_History_Carbohydrate(): DanaRS_Packet_History_Carbohydrate
-    @ContributesAndroidInjector abstract fun contributesDanaRS_Packet_History_Daily(): DanaRS_Packet_History_Daily
-    @ContributesAndroidInjector abstract fun contributesDanaRS_Packet_General_Get_More_Information(): DanaRS_Packet_General_Get_More_Information
-    @ContributesAndroidInjector abstract fun contributesDanaRS_Packet_General_Get_Pump_Check(): DanaRS_Packet_General_Get_Pump_Check
-    @ContributesAndroidInjector abstract fun contributesDanaRS_Packet_General_Get_Shipping_Information(): DanaRS_Packet_General_Get_Shipping_Information
-    @ContributesAndroidInjector abstract fun contributesDanaRS_Packet_General_Get_Today_Delivery_Total(): DanaRS_Packet_General_Get_Today_Delivery_Total
-    @ContributesAndroidInjector abstract fun contributesDanaRS_Packet_General_Get_User_Time_Change_Flag(): DanaRS_Packet_General_Get_User_Time_Change_Flag
-    @ContributesAndroidInjector abstract fun contributesDanaRS_Packet_History_Prime(): DanaRS_Packet_History_Prime
-    @ContributesAndroidInjector abstract fun contributesDanaRS_Packet_History_Refill(): DanaRS_Packet_History_Refill
-    @ContributesAndroidInjector abstract fun contributesDanaRS_Packet_General_Set_History_Upload_Mode(): DanaRS_Packet_General_Set_History_Upload_Mode
-    @ContributesAndroidInjector abstract fun contributesDanaRS_Packet_General_Set_User_Time_Change_Flag_Clear(): DanaRS_Packet_General_Set_User_Time_Change_Flag_Clear
-    @ContributesAndroidInjector abstract fun contributesDanaRS_Packet_History_Suspend(): DanaRS_Packet_History_Suspend
-    @ContributesAndroidInjector abstract fun contributesDanaRS_Packet_History_Temporary(): DanaRS_Packet_History_Temporary
-    @ContributesAndroidInjector abstract fun contributesDanaRS_Packet_APS_Basal_Set_Temporary_Basal(): DanaRS_Packet_APS_Basal_Set_Temporary_Basal
-    @ContributesAndroidInjector abstract fun contributesDanaRS_Packet_APS_History_Events(): DanaRS_Packet_APS_History_Events
-    @ContributesAndroidInjector abstract fun contributesDanaRS_Packet_APS_Set_Event_History(): DanaRS_Packet_APS_Set_Event_History
-    @ContributesAndroidInjector abstract fun contributesDanaRS_Packet_General_Get_Shipping_Version(): DanaRS_Packet_General_Get_Shipping_Version
-    @ContributesAndroidInjector abstract fun contributesDanaRS_Packet_Review_Get_Pump_Dec_Ratio(): DanaRS_Packet_Review_Get_Pump_Dec_Ratio
-    @ContributesAndroidInjector abstract fun contributesDanaRS_Packet_Option_Get_Pump_UTC_And_TimeZone(): DanaRS_Packet_Option_Get_Pump_UTC_And_TimeZone
-    @ContributesAndroidInjector abstract fun contributesDanaRS_Packet_Option_Set_Pump_UTC_And_TimeZone(): DanaRS_Packet_Option_Set_Pump_UTC_And_TimeZone
+    @ContributesAndroidInjector abstract fun contributesDanaRSPacket(): DanaRSPacket
+    @ContributesAndroidInjector abstract fun contributesDanaRSPacketBasalSetCancelTemporaryBasal(): DanaRSPacketBasalSetCancelTemporaryBasal
+    @ContributesAndroidInjector abstract fun contributesDanaRSPacketBasalGetBasalRate(): DanaRSPacketBasalGetBasalRate
+    @ContributesAndroidInjector abstract fun contributesDanaRSPacketBasalGetProfileNumber(): DanaRSPacketBasalGetProfileNumber
+    @ContributesAndroidInjector abstract fun contributesDanaRSPacketBasalSetProfileBasalRate(): DanaRSPacketBasalSetProfileBasalRate
+    @ContributesAndroidInjector abstract fun contributesDanaRSPacketBasalSetProfileNumber(): DanaRSPacketBasalSetProfileNumber
+    @ContributesAndroidInjector abstract fun contributesDanaRSPacketBasalSetSuspendOff(): DanaRSPacketBasalSetSuspendOff
+    @ContributesAndroidInjector abstract fun contributesDanaRSPacketBasalSetSuspendOn(): DanaRSPacketBasalSetSuspendOn
+    @ContributesAndroidInjector abstract fun contributesDanaRSPacketBasalSetTemporaryBasal(): DanaRSPacketBasalSetTemporaryBasal
+    @ContributesAndroidInjector abstract fun contributesDanaRSPacketBolusGetBolusOption(): DanaRSPacketBolusGetBolusOption
+    @ContributesAndroidInjector abstract fun contributesDanaRSPacketBolusGetCalculationInformation(): DanaRSPacketBolusGetCalculationInformation
+    @ContributesAndroidInjector abstract fun contributesDanaRSPacketBolusGetCIRCFArray(): DanaRSPacketBolusGetCIRCFArray
+    @ContributesAndroidInjector abstract fun contributesDanaRSPacketBolusGetStepBolusInformation(): DanaRSPacketBolusGetStepBolusInformation
+    @ContributesAndroidInjector abstract fun contributesDanaRSPacketBolusSetBolusOption(): DanaRSPacketBolusSetBolusOption
+    @ContributesAndroidInjector abstract fun contributesDanaRSPacketBolusGet24CIRCFArray(): DanaRSPacketBolusGet24CIRCFArray
+    @ContributesAndroidInjector abstract fun contributesDanaRSPacketBolusSet24CIRCFArray(): DanaRSPacketBolusSet24CIRCFArray
+    @ContributesAndroidInjector abstract fun contributesDanaRSPacketBolusSetExtendedBolus(): DanaRSPacketBolusSetExtendedBolus
+    @ContributesAndroidInjector abstract fun contributesDanaRSPacketBolusSetExtendedBolusCancel(): DanaRSPacketBolusSetExtendedBolusCancel
+    @ContributesAndroidInjector abstract fun contributesDanaRSPacketBolusSetStepBolusStart(): DanaRSPacketBolusSetStepBolusStart
+    @ContributesAndroidInjector abstract fun contributesDanaRSPacketBolusSetStepBolusStop(): DanaRSPacketBolusSetStepBolusStop
+    @ContributesAndroidInjector abstract fun contributesDanaRSPacketEtcKeepConnection(): DanaRSPacketEtcKeepConnection
+    @ContributesAndroidInjector abstract fun contributesDanaRSPacketEtcSetHistorySave(): DanaRSPacketEtcSetHistorySave
+    @ContributesAndroidInjector abstract fun contributesDanaRSPacketGeneralInitialScreenInformation(): DanaRSPacketGeneralInitialScreenInformation
+    @ContributesAndroidInjector abstract fun contributesDanaRSPacketNotifyDeliveryRateDisplay(): DanaRSPacketNotifyDeliveryRateDisplay
+    @ContributesAndroidInjector abstract fun contributesDanaRSPacketNotifyAlarm(): DanaRSPacketNotifyAlarm
+    @ContributesAndroidInjector abstract fun contributesDanaRSPacketNotifyDeliveryComplete(): DanaRSPacketNotifyDeliveryComplete
+    @ContributesAndroidInjector abstract fun contributesDanaRSPacketNotifyMissedBolusAlarm(): DanaRSPacketNotifyMissedBolusAlarm
+    @ContributesAndroidInjector abstract fun contributesDanaRSPacketOptionGetPumpTime(): DanaRSPacketOptionGetPumpTime
+    @ContributesAndroidInjector abstract fun contributesDanaRSPacketOptionGetUserOption(): DanaRSPacketOptionGetUserOption
+    @ContributesAndroidInjector abstract fun contributesDanaRSPacketOptionSetPumpTime(): DanaRSPacketOptionSetPumpTime
+    @ContributesAndroidInjector abstract fun contributesDanaRSPacketOptionSetUserOption(): DanaRSPacketOptionSetUserOption
+    @ContributesAndroidInjector abstract fun contributesDanaRSPacketHistory(): DanaRSPacketHistory
+    @ContributesAndroidInjector abstract fun contributesDanaRSPacketHistoryAlarm(): DanaRSPacketHistoryAlarm
+    @ContributesAndroidInjector abstract fun contributesDanaRSPacketHistoryAllHistory(): DanaRSPacketHistoryAllHistory
+    @ContributesAndroidInjector abstract fun contributesDanaRSPacketHistoryBasal(): DanaRSPacketHistoryBasal
+    @ContributesAndroidInjector abstract fun contributesDanaRSPacketHistoryBloodGlucose(): DanaRSPacketHistoryBloodGlucose
+    @ContributesAndroidInjector abstract fun contributesDanaRSPacketHistoryBolus(): DanaRSPacketHistoryBolus
+    @ContributesAndroidInjector abstract fun contributesDanaRSPacketReviewBolusAvg(): DanaRSPacketReviewBolusAvg
+    @ContributesAndroidInjector abstract fun contributesDanaRSPacketHistoryCarbohydrate(): DanaRSPacketHistoryCarbohydrate
+    @ContributesAndroidInjector abstract fun contributesDanaRSPacketHistoryDaily(): DanaRSPacketHistoryDaily
+    @ContributesAndroidInjector abstract fun contributesDanaRSPacketGeneralGetPumpCheck(): DanaRSPacketGeneralGetPumpCheck
+    @ContributesAndroidInjector abstract fun contributesDanaRSPacketGeneralGetShippingInformation(): DanaRSPacketGeneralGetShippingInformation
+    @ContributesAndroidInjector abstract fun contributesDanaRSPacketGeneralGetUserTimeChangeFlag(): DanaRSPacketGeneralGetUserTimeChangeFlag
+    @ContributesAndroidInjector abstract fun contributesDanaRSPacketHistoryPrime(): DanaRSPacketHistoryPrime
+    @ContributesAndroidInjector abstract fun contributesDanaRSPacketHistoryRefill(): DanaRSPacketHistoryRefill
+    @ContributesAndroidInjector abstract fun contributesDanaRSPacketGeneralSetHistoryUploadMode(): DanaRSPacketGeneralSetHistoryUploadMode
+    @ContributesAndroidInjector abstract fun contributesDanaRSPacketGeneralSetUserTimeChangeFlagClear(): DanaRSPacketGeneralSetUserTimeChangeFlagClear
+    @ContributesAndroidInjector abstract fun contributesDanaRSPacketHistorySuspend(): DanaRSPacketHistorySuspend
+    @ContributesAndroidInjector abstract fun contributesDanaRSPacketHistoryTemporary(): DanaRSPacketHistoryTemporary
+    @ContributesAndroidInjector abstract fun contributesDanaRSPacketAPSBasalSetTemporaryBasal(): DanaRSPacketAPSBasalSetTemporaryBasal
+    @ContributesAndroidInjector abstract fun contributesDanaRSPacketAPSHistoryEvents(): DanaRSPacketAPSHistoryEvents
+    @ContributesAndroidInjector abstract fun contributesDanaRSPacketAPSSetEventHistory(): DanaRSPacketAPSSetEventHistory
+    @ContributesAndroidInjector abstract fun contributesDanaRSPacketGeneralGetShippingVersion(): DanaRSPacketGeneralGetShippingVersion
+    @ContributesAndroidInjector abstract fun contributesDanaRSPacketReviewGetPumpDecRatio(): DanaRSPacketReviewGetPumpDecRatio
+    @ContributesAndroidInjector abstract fun contributesDanaRSPacketOptionGetPumpUTCAndTimeZone(): DanaRSPacketOptionGetPumpUTCAndTimeZone
+    @ContributesAndroidInjector abstract fun contributesDanaRSPacketOptionSetPumpUTCAndTimeZone(): DanaRSPacketOptionSetPumpUTCAndTimeZone
 }
\ No newline at end of file
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/services/BLEComm.kt b/danars/src/main/java/info/nightscout/androidaps/danars/services/BLEComm.kt
index 83996f4504..9ae06c3fe3 100644
--- a/danars/src/main/java/info/nightscout/androidaps/danars/services/BLEComm.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/services/BLEComm.kt
@@ -12,12 +12,14 @@ import info.nightscout.androidaps.danars.R
 import info.nightscout.androidaps.danars.activities.EnterPinActivity
 import info.nightscout.androidaps.danars.activities.PairingHelperActivity
 import info.nightscout.androidaps.danars.comm.DanaRSMessageHashTable
-import info.nightscout.androidaps.danars.comm.DanaRS_Packet
-import info.nightscout.androidaps.danars.comm.DanaRS_Packet_Etc_Keep_Connection
+import info.nightscout.androidaps.danars.comm.DanaRSPacket
+import info.nightscout.androidaps.danars.comm.DanaRSPacketEtcKeepConnection
 import info.nightscout.androidaps.danars.encryption.BleEncryption
 import info.nightscout.androidaps.danars.encryption.EncryptionType
 import info.nightscout.androidaps.danars.events.EventDanaRSPairingSuccess
 import info.nightscout.androidaps.events.EventPumpStatusChanged
+import info.nightscout.androidaps.extensions.notify
+import info.nightscout.androidaps.extensions.waitMillis
 import info.nightscout.androidaps.interfaces.PumpSync
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
@@ -28,8 +30,6 @@ import info.nightscout.androidaps.plugins.general.overview.notifications.Notific
 import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.utils.T
 import info.nightscout.androidaps.utils.ToastUtils
-import info.nightscout.androidaps.extensions.notify
-import info.nightscout.androidaps.extensions.waitMillis
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import info.nightscout.androidaps.utils.sharedPreferences.SP
 import java.util.*
@@ -62,10 +62,12 @@ class BLEComm @Inject internal constructor(
 
         private const val PACKET_START_BYTE = 0xA5.toByte()
         private const val PACKET_END_BYTE = 0x5A.toByte()
+        private const val BLE5_PACKET_START_BYTE = 0xAA.toByte()
+        private const val BLE5_PACKET_END_BYTE = 0xEE.toByte()
     }
 
     private var scheduledDisconnection: ScheduledFuture<*>? = null
-    private var processedMessage: DanaRS_Packet? = null
+    private var processedMessage: DanaRSPacket? = null
     private val mSendQueue = ArrayList<ByteArray>()
     private var bluetoothManager: BluetoothManager? = null
     private var bluetoothAdapter: BluetoothAdapter? = null
@@ -88,7 +90,6 @@ class BLEComm @Inject internal constructor(
     private var uartWrite: BluetoothGattCharacteristic? = null
 
     @Synchronized
-    @kotlin.ExperimentalStdlibApi
     fun connect(from: String, address: String?): Boolean {
         aapsLogger.debug(LTag.PUMPBTCOMM, "Initializing BLEComm.")
         if (bluetoothManager == null) {
@@ -124,6 +125,7 @@ class BLEComm @Inject internal constructor(
         encryptedDataRead = false
         encryptedCommandSent = false
         isConnecting = true
+        bufferLength = 0
         aapsLogger.debug(LTag.PUMPBTCOMM, "Trying to create a new connection from: $from")
         connectDeviceName = device.name
         bluetoothGatt = device.connectGatt(context, false, mGattCallback)
@@ -140,6 +142,27 @@ class BLEComm @Inject internal constructor(
     fun disconnect(from: String) {
         aapsLogger.debug(LTag.PUMPBTCOMM, "disconnect from: $from")
 
+        if (!encryptedDataRead && encryptedCommandSent && encryption == EncryptionType.ENCRYPTION_BLE5) {
+            // there was no response from pump after started encryption
+            // assume pairing keys are invalid
+            val lastClearRequest = sp.getLong(R.string.key_rs_last_clear_key_request, 0)
+            if (lastClearRequest != 0L && dateUtil.isOlderThan(lastClearRequest, 5)) {
+                ToastUtils.showToastInUiThread(context, R.string.invalidpairing)
+                danaRSPlugin.changePump()
+                sp.getStringOrNull(R.string.key_danars_address, null)?.let { address ->
+                    bluetoothAdapter?.getRemoteDevice(address)?.let { device ->
+                        try {
+                            device::class.java.getMethod("removeBond").invoke(device)
+                        } catch (e: Exception) {
+                            aapsLogger.error("Removing bond has been failed. ${e.message}")
+                        }
+                    }
+                }
+            } else if (lastClearRequest == 0L) {
+                aapsLogger.error("Clearing pairing keys postponed")
+                sp.putLong(R.string.key_rs_last_clear_key_request, dateUtil.now())
+            }
+        }
         if (!encryptedDataRead && encryptedCommandSent && encryption == EncryptionType.ENCRYPTION_RSv3) {
             // there was no response from pump after started encryption
             // assume pairing keys are invalid
@@ -174,12 +197,35 @@ class BLEComm @Inject internal constructor(
     }
 
     @Synchronized fun close() {
+        /*
+        if (!encryptedDataRead && !encryptedCommandSent) {
+            // there was no response from pump before started encryption
+            // assume pairing is invalid
+            val lastClearRequest = sp.getLong(R.string.key_rs_last_clear_key_request, 0)
+            if (lastClearRequest != 0L && dateUtil.isOlderThan(lastClearRequest, 5)) {
+                ToastUtils.showToastInUiThread(context, R.string.invalidpairing)
+                danaRSPlugin.changePump()
+                sp.getStringOrNull(R.string.key_danars_address, null)?.let { address ->
+                    bluetoothAdapter?.getRemoteDevice(address)?.let { device ->
+                        try {
+                            aapsLogger.debug(LTag.PUMPBTCOMM, "Removing bond")
+                            device::class.java.getMethod("removeBond").invoke(device)
+                        } catch (e: Exception) {
+                            aapsLogger.error("Removing bond has been failed. ${e.message}")
+                        }
+                    }
+                }
+            } else if (lastClearRequest == 0L) {
+                aapsLogger.error("Clearing pairing keys postponed")
+                sp.putLong(R.string.key_rs_last_clear_key_request, dateUtil.now())
+            }
+        }
+        */
         aapsLogger.debug(LTag.PUMPBTCOMM, "BluetoothAdapter close")
         bluetoothGatt?.close()
         bluetoothGatt = null
     }
 
-    @kotlin.ExperimentalStdlibApi
     private val mGattCallback: BluetoothGattCallback = object : BluetoothGattCallback() {
         override fun onConnectionStateChange(gatt: BluetoothGatt, status: Int, newState: Int) {
             onConnectionStateChangeSynchronized(gatt, newState) // call it synchronized
@@ -323,13 +369,12 @@ class BLEComm @Inject internal constructor(
     }
 
     private val readBuffer = ByteArray(1024)
-    private var bufferLength = 0
+    @Volatile private var bufferLength = 0
 
     private fun addToReadBuffer(buffer: ByteArray) {
         //log.debug("addToReadBuffer " + DanaRS_Packet.toHexString(buffer));
-        if (buffer.isEmpty()) {
-            return
-        }
+        if (buffer.isEmpty()) return
+
         synchronized(readBuffer) {
             // Append incoming data to input buffer
             System.arraycopy(buffer, 0, readBuffer, bufferLength, buffer.size)
@@ -337,10 +382,8 @@ class BLEComm @Inject internal constructor(
         }
     }
 
-    @kotlin.ExperimentalStdlibApi
     private fun readDataParsing(receivedData: ByteArray) {
         //aapsLogger.debug(LTag.PUMPBTCOMM, "<<<<< readDataParsing " + DanaRS_Packet.toHexString(receivedData))
-        var startSignatureFound = false
         var packetIsValid = false
         var isProcessing: Boolean
         isProcessing = true
@@ -360,36 +403,37 @@ class BLEComm @Inject internal constructor(
         while (isProcessing) {
             var length = 0
             synchronized(readBuffer) {
-                // Find packet start [A5 A5]
+                // Find packet start [A5 A5] or [AA AA]
                 if (bufferLength >= 6) {
                     for (idxStartByte in 0 until bufferLength - 2) {
-                        if (readBuffer[idxStartByte] == PACKET_START_BYTE && readBuffer[idxStartByte + 1] == PACKET_START_BYTE) {
+                        if (readBuffer[idxStartByte] == PACKET_START_BYTE && readBuffer[idxStartByte + 1] == PACKET_START_BYTE ||
+                            readBuffer[idxStartByte] == BLE5_PACKET_START_BYTE && readBuffer[idxStartByte + 1] == BLE5_PACKET_START_BYTE) {
                             if (idxStartByte > 0) {
                                 // if buffer doesn't start with signature remove the leading trash
                                 aapsLogger.debug(LTag.PUMPBTCOMM, "Shifting the input buffer by $idxStartByte bytes")
                                 System.arraycopy(readBuffer, idxStartByte, readBuffer, 0, bufferLength - idxStartByte)
                                 bufferLength -= idxStartByte
+                                if (bufferLength < 0) bufferLength = 0
+                            }
+                            // A5 A5 LEN TYPE CODE PARAMS CHECKSUM1 CHECKSUM2 5A 5A    or
+                            // AA AA LEN TYPE CODE PARAMS CHECKSUM1 CHECKSUM2 EE EE
+                            //           ^---- LEN -----^
+                            // total packet length 2 + 1 + readBuffer[2] + 2 + 2
+                            length = readBuffer[2].toInt()
+                            // test if there is enough data loaded
+                            if (length + 7 > bufferLength)
+                                return
+                            // Verify packed end [5A 5A]
+                            if (readBuffer[length + 5] == PACKET_END_BYTE && readBuffer[length + 6] == PACKET_END_BYTE ||
+                                readBuffer[length + 5] == BLE5_PACKET_END_BYTE && readBuffer[length + 6] == BLE5_PACKET_END_BYTE) {
+                                packetIsValid = true
+                            } else {
+                                aapsLogger.error(LTag.PUMPBTCOMM, "Error in input data. Resetting buffer.")
+                                bufferLength = 0
                             }
-                            startSignatureFound = true
                             break
                         }
-                    }
-                }
-                // A5 A5 LEN TYPE CODE PARAMS CHECKSUM1 CHECKSUM2 5A 5A
-                //           ^---- LEN -----^
-                // total packet length 2 + 1 + readBuffer[2] + 2 + 2
-                if (startSignatureFound) {
-                    length = readBuffer[2].toInt()
-                    // test if there is enough data loaded
-                    if (length + 7 > bufferLength) return
-                    // Verify packed end [5A 5A]
-                    if (readBuffer[length + 5] == PACKET_END_BYTE && readBuffer[length + 6] == PACKET_END_BYTE) {
-                        packetIsValid = true
-                    } else if (readBuffer[length + 5] == readBuffer[length + 6]) {
-                        // BLE5
-                        packetIsValid = true
-                        readBuffer[length + 5] = PACKET_END_BYTE
-                        readBuffer[length + 6] = PACKET_END_BYTE
+                        break
                     }
                 }
             }
@@ -407,9 +451,9 @@ class BLEComm @Inject internal constructor(
                 bufferLength -= length + 7
                 // now we have encrypted packet in inputBuffer
 
-                //aapsLogger.debug(LTag.PUMPBTCOMM, "<<<<< PROCESSING: " + DanaRS_Packet.toHexString(inputBuffer))
                 // decrypt the packet
-                bleEncryption.getDecryptedPacket(inputBuffer)?.let { decryptedBuffer ->
+                val decrypted = bleEncryption.getDecryptedPacket(inputBuffer)
+                decrypted?.let { decryptedBuffer ->
                     if (decryptedBuffer[0] == BleEncryption.DANAR_PACKET__TYPE_ENCRYPTION_RESPONSE.toByte()) {
                         when (decryptedBuffer[1]) {
                             // 1st packet exchange
@@ -443,8 +487,9 @@ class BLEComm @Inject internal constructor(
                         // Retrieve message code from received buffer and last message sent
                         processMessage(decryptedBuffer)
                     }
-                } ?: throw IllegalStateException("Null decryptedInputBuffer")
-                startSignatureFound = false
+                }
+                if (decrypted == null)
+                    throw IllegalStateException("Null decryptedInputBuffer")
                 packetIsValid = false
                 if (bufferLength < 6) {
                     // stop the loop
@@ -466,16 +511,15 @@ class BLEComm @Inject internal constructor(
             return
         }
         val bytes = bleEncryption.getEncryptedPacket(BleEncryption.DANAR_PACKET__OPCODE_ENCRYPTION__PUMP_CHECK, null, deviceName)
-        aapsLogger.debug(LTag.PUMPBTCOMM, ">>>>> " + "ENCRYPTION__PUMP_CHECK (0x00)" + " " + DanaRS_Packet.toHexString(bytes))
+        aapsLogger.debug(LTag.PUMPBTCOMM, ">>>>> " + "ENCRYPTION__PUMP_CHECK (0x00)" + " " + DanaRSPacket.toHexString(bytes))
         writeCharacteristicNoResponse(uartWriteBTGattChar, bytes)
     }
 
-    @kotlin.ExperimentalStdlibApi
     // 1st packet response
     private fun processConnectResponse(decryptedBuffer: ByteArray) {
         // response OK v1
         if (decryptedBuffer.size == 4 && decryptedBuffer[2] == 'O'.code.toByte() && decryptedBuffer[3] == 'K'.code.toByte()) {
-            aapsLogger.debug(LTag.PUMPBTCOMM, "<<<<< " + "ENCRYPTION__PUMP_CHECK (OK)" + " " + DanaRS_Packet.toHexString(decryptedBuffer))
+            aapsLogger.debug(LTag.PUMPBTCOMM, "<<<<< " + "ENCRYPTION__PUMP_CHECK (OK)" + " " + DanaRSPacket.toHexString(decryptedBuffer))
             encryption = EncryptionType.ENCRYPTION_DEFAULT
             danaPump.ignoreUserPassword = false
             // Grab pairing key from preferences if exists
@@ -498,32 +542,32 @@ class BLEComm @Inject internal constructor(
             sp.putString(resourceHelper.gs(R.string.key_danars_v3_randomsynckey) + danaRSPlugin.mDeviceName, String.format("%02x", decryptedBuffer[decryptedBuffer.size - 1]))
 
             if (danaPump.hwModel == 0x05) {
-                aapsLogger.debug(LTag.PUMPBTCOMM, "<<<<< " + "ENCRYPTION__PUMP_CHECK V3 (OK)" + " " + DanaRS_Packet.toHexString(decryptedBuffer))
+                aapsLogger.debug(LTag.PUMPBTCOMM, "<<<<< " + "ENCRYPTION__PUMP_CHECK V3 (OK)" + " " + DanaRSPacket.toHexString(decryptedBuffer))
                 // Dana RS Pump
                 sendV3PairingInformation()
             } else if (danaPump.hwModel == 0x06) {
-                aapsLogger.debug(LTag.PUMPBTCOMM, "<<<<< " + "ENCRYPTION__PUMP_CHECK V3 EASY (OK)" + " " + DanaRS_Packet.toHexString(decryptedBuffer))
+                aapsLogger.debug(LTag.PUMPBTCOMM, "<<<<< " + "ENCRYPTION__PUMP_CHECK V3 EASY (OK)" + " " + DanaRSPacket.toHexString(decryptedBuffer))
                 // Dana RS Easy
                 sendEasyMenuCheck()
             }
             // response OK BLE5
-        } else if (decryptedBuffer.size == 14 && decryptedBuffer[2] == 'O'.toByte() && decryptedBuffer[3] == 'K'.toByte()) {
+        } else if (decryptedBuffer.size == 14 && decryptedBuffer[2] == 'O'.code.toByte() && decryptedBuffer[3] == 'K'.code.toByte()) {
             // v3 2nd layer encryption
             encryption = EncryptionType.ENCRYPTION_BLE5
             danaPump.ignoreUserPassword = true
             danaPump.hwModel = decryptedBuffer[5].toInt()
             danaPump.protocol = decryptedBuffer[7].toInt()
-            val pairingKey = DanaRS_Packet.asciiStringFromBuff(decryptedBuffer, 8, 6) // used while bonding
+            val pairingKey = DanaRSPacket.asciiStringFromBuff(decryptedBuffer, 8, 6) // used while bonding
 
             if (danaPump.hwModel == 0x09) {
                 bleEncryption.setBle5Key(pairingKey.encodeToByteArray())
-                aapsLogger.debug(LTag.PUMPBTCOMM, "<<<<< " + "ENCRYPTION__PUMP_CHECK BLE5 (OK)" + " " + DanaRS_Packet.toHexString(decryptedBuffer))
+                aapsLogger.debug(LTag.PUMPBTCOMM, "<<<<< " + "ENCRYPTION__PUMP_CHECK BLE5 (OK)" + " " + DanaRSPacket.toHexString(decryptedBuffer))
                 // Dana-i BLE5 Pump
                 sendBLE5PairingInformation()
             }
             // response PUMP : error status
         } else if (decryptedBuffer.size == 6 && decryptedBuffer[2] == 'P'.code.toByte() && decryptedBuffer[3] == 'U'.code.toByte() && decryptedBuffer[4] == 'M'.code.toByte() && decryptedBuffer[5] == 'P'.code.toByte()) {
-            aapsLogger.debug(LTag.PUMPBTCOMM, "<<<<< " + "ENCRYPTION__PUMP_CHECK (PUMP)" + " " + DanaRS_Packet.toHexString(decryptedBuffer))
+            aapsLogger.debug(LTag.PUMPBTCOMM, "<<<<< " + "ENCRYPTION__PUMP_CHECK (PUMP)" + " " + DanaRSPacket.toHexString(decryptedBuffer))
             mSendQueue.clear()
             rxBus.send(EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTED, resourceHelper.gs(R.string.pumperror)))
             pumpSync.insertAnnouncement(resourceHelper.gs(R.string.pumperror), null, danaPump.pumpType(), danaPump.serialNumber)
@@ -531,12 +575,12 @@ class BLEComm @Inject internal constructor(
             rxBus.send(EventNewNotification(n))
             // response BUSY: error status
         } else if (decryptedBuffer.size == 6 && decryptedBuffer[2] == 'B'.code.toByte() && decryptedBuffer[3] == 'U'.code.toByte() && decryptedBuffer[4] == 'S'.code.toByte() && decryptedBuffer[5] == 'Y'.code.toByte()) {
-            aapsLogger.debug(LTag.PUMPBTCOMM, "<<<<< " + "ENCRYPTION__PUMP_CHECK (BUSY)" + " " + DanaRS_Packet.toHexString(decryptedBuffer))
+            aapsLogger.debug(LTag.PUMPBTCOMM, "<<<<< " + "ENCRYPTION__PUMP_CHECK (BUSY)" + " " + DanaRSPacket.toHexString(decryptedBuffer))
             mSendQueue.clear()
             rxBus.send(EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTED, resourceHelper.gs(R.string.pumpbusy)))
         } else {
             // ERROR in response, wrong serial number
-            aapsLogger.debug(LTag.PUMPBTCOMM, "<<<<< " + "ENCRYPTION__PUMP_CHECK (ERROR)" + " " + DanaRS_Packet.toHexString(decryptedBuffer))
+            aapsLogger.debug(LTag.PUMPBTCOMM, "<<<<< " + "ENCRYPTION__PUMP_CHECK (ERROR)" + " " + DanaRSPacket.toHexString(decryptedBuffer))
             mSendQueue.clear()
             rxBus.send(EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTED, resourceHelper.gs(R.string.connectionerror)))
             danaRSPlugin.clearPairing()
@@ -547,15 +591,15 @@ class BLEComm @Inject internal constructor(
 
     // 2nd packet v1 check passkey
     private fun sendPasskeyCheck(pairingKey: String) {
-        val encodedPairingKey = DanaRS_Packet.hexToBytes(pairingKey)
+        val encodedPairingKey = DanaRSPacket.hexToBytes(pairingKey)
         val bytes = bleEncryption.getEncryptedPacket(BleEncryption.DANAR_PACKET__OPCODE_ENCRYPTION__CHECK_PASSKEY, encodedPairingKey, null)
-        aapsLogger.debug(LTag.PUMPBTCOMM, ">>>>> " + "ENCRYPTION__CHECK_PASSKEY" + " " + DanaRS_Packet.toHexString(bytes))
+        aapsLogger.debug(LTag.PUMPBTCOMM, ">>>>> " + "ENCRYPTION__CHECK_PASSKEY" + " " + DanaRSPacket.toHexString(bytes))
         writeCharacteristicNoResponse(uartWriteBTGattChar, bytes)
     }
 
     // 2nd packet v1 response
     private fun processPasskeyCheck(decryptedBuffer: ByteArray) {
-        aapsLogger.debug(LTag.PUMPBTCOMM, "<<<<< " + "ENCRYPTION__CHECK_PASSKEY" + " " + DanaRS_Packet.toHexString(decryptedBuffer))
+        aapsLogger.debug(LTag.PUMPBTCOMM, "<<<<< " + "ENCRYPTION__CHECK_PASSKEY" + " " + DanaRSPacket.toHexString(decryptedBuffer))
         // Paring is not requested, sending time info
         if (decryptedBuffer[2] == 0x00.toByte()) sendTimeInfo()
         // Pairing on pump is requested
@@ -586,20 +630,20 @@ class BLEComm @Inject internal constructor(
     private fun sendBLE5PairingInformation() {
         val params = ByteArray(4) { 0.toByte() }
         val bytes: ByteArray = bleEncryption.getEncryptedPacket(BleEncryption.DANAR_PACKET__OPCODE_ENCRYPTION__TIME_INFORMATION, params, null)
-        aapsLogger.debug(LTag.PUMPBTCOMM, ">>>>> " + "ENCRYPTION__TIME_INFORMATION BLE5" + " " + DanaRS_Packet.toHexString(bytes))
+        aapsLogger.debug(LTag.PUMPBTCOMM, ">>>>> " + "ENCRYPTION__TIME_INFORMATION BLE5" + " " + DanaRSPacket.toHexString(bytes))
         writeCharacteristicNoResponse(uartWriteBTGattChar, bytes)
     }
 
     private fun sendV3PairingInformation(requestNewPairing: Int) {
         val params = byteArrayOf(requestNewPairing.toByte())
         val bytes: ByteArray = bleEncryption.getEncryptedPacket(BleEncryption.DANAR_PACKET__OPCODE_ENCRYPTION__TIME_INFORMATION, params, null)
-        aapsLogger.debug(LTag.PUMPBTCOMM, ">>>>> " + "ENCRYPTION__TIME_INFORMATION" + " " + DanaRS_Packet.toHexString(bytes))
+        aapsLogger.debug(LTag.PUMPBTCOMM, ">>>>> " + "ENCRYPTION__TIME_INFORMATION" + " " + DanaRSPacket.toHexString(bytes))
         writeCharacteristicNoResponse(uartWriteBTGattChar, bytes)
     }
 
     // 2nd packet response
     private fun processEncryptionResponse(decryptedBuffer: ByteArray) {
-        aapsLogger.debug(LTag.PUMPBTCOMM, "<<<<< " + "ENCRYPTION__TIME_INFORMATION " + DanaRS_Packet.toHexString(decryptedBuffer))
+        aapsLogger.debug(LTag.PUMPBTCOMM, "<<<<< " + "ENCRYPTION__TIME_INFORMATION " + DanaRSPacket.toHexString(decryptedBuffer))
         if (encryption == EncryptionType.ENCRYPTION_BLE5) {
             isConnected = true
             isConnecting = false
@@ -647,7 +691,7 @@ class BLEComm @Inject internal constructor(
     // 3rd packet v1 existing pairing
     private fun sendTimeInfo() {
         val bytes = bleEncryption.getEncryptedPacket(BleEncryption.DANAR_PACKET__OPCODE_ENCRYPTION__TIME_INFORMATION, null, null)
-        aapsLogger.debug(LTag.PUMPBTCOMM, ">>>>> " + "ENCRYPTION__TIME_INFORMATION" + " " + DanaRS_Packet.toHexString(bytes))
+        aapsLogger.debug(LTag.PUMPBTCOMM, ">>>>> " + "ENCRYPTION__TIME_INFORMATION" + " " + DanaRSPacket.toHexString(bytes))
         writeCharacteristicNoResponse(uartWriteBTGattChar, bytes)
     }
 
@@ -657,7 +701,7 @@ class BLEComm @Inject internal constructor(
         // On pump pairing request is displayed and is waiting for conformation
         context.startActivity(Intent(context, PairingHelperActivity::class.java).also { it.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK) })
         val bytes = bleEncryption.getEncryptedPacket(BleEncryption.DANAR_PACKET__OPCODE_ENCRYPTION__PASSKEY_REQUEST, null, null)
-        aapsLogger.debug(LTag.PUMPBTCOMM, ">>>>> " + "ENCRYPTION__PASSKEY_REQUEST" + " " + DanaRS_Packet.toHexString(bytes))
+        aapsLogger.debug(LTag.PUMPBTCOMM, ">>>>> " + "ENCRYPTION__PASSKEY_REQUEST" + " " + DanaRSPacket.toHexString(bytes))
         writeCharacteristicNoResponse(uartWriteBTGattChar, bytes)
     }
 
@@ -676,7 +720,7 @@ class BLEComm @Inject internal constructor(
 
     // 2nd or 3rd packet v1 response
     private fun processPairingRequest(decryptedBuffer: ByteArray) {
-        aapsLogger.debug(LTag.PUMPBTCOMM, "<<<<< " + "ENCRYPTION__PASSKEY_REQUEST " + DanaRS_Packet.toHexString(decryptedBuffer))
+        aapsLogger.debug(LTag.PUMPBTCOMM, "<<<<< " + "ENCRYPTION__PASSKEY_REQUEST " + DanaRSPacket.toHexString(decryptedBuffer))
         if (decryptedBuffer[2] != 0x00.toByte()) {
             disconnect("passkey request failed")
         }
@@ -684,14 +728,14 @@ class BLEComm @Inject internal constructor(
 
     // 2nd or 3rd packet v1 response
     private fun processPairingRequest2(decryptedBuffer: ByteArray) {
-        aapsLogger.debug(LTag.PUMPBTCOMM, "<<<<< " + "ENCRYPTION__PASSKEY_RETURN " + DanaRS_Packet.toHexString(decryptedBuffer))
+        aapsLogger.debug(LTag.PUMPBTCOMM, "<<<<< " + "ENCRYPTION__PASSKEY_RETURN " + DanaRSPacket.toHexString(decryptedBuffer))
         // Paring is successful, sending time info
         rxBus.send(EventDanaRSPairingSuccess())
         sendTimeInfo()
         val pairingKey = byteArrayOf(decryptedBuffer[2], decryptedBuffer[3])
         // store pairing key to preferences
-        sp.putString(resourceHelper.gs(R.string.key_danars_pairingkey) + danaRSPlugin.mDeviceName, DanaRS_Packet.bytesToHex(pairingKey))
-        aapsLogger.debug(LTag.PUMPBTCOMM, "Got pairing key: " + DanaRS_Packet.bytesToHex(pairingKey))
+        sp.putString(resourceHelper.gs(R.string.key_danars_pairingkey) + danaRSPlugin.mDeviceName, DanaRSPacket.bytesToHex(pairingKey))
+        aapsLogger.debug(LTag.PUMPBTCOMM, "Got pairing key: " + DanaRSPacket.bytesToHex(pairingKey))
     }
 
     // 3rd packet Easy menu pump
@@ -711,12 +755,16 @@ class BLEComm @Inject internal constructor(
     }
 
     // the rest of packets
-    fun sendMessage(message: DanaRS_Packet) {
+    fun sendMessage(message: DanaRSPacket) {
         encryptedCommandSent = true
         processedMessage = message
         val command = byteArrayOf(message.type.toByte(), message.opCode.toByte())
-        val params = message.requestParams
-        aapsLogger.debug(LTag.PUMPBTCOMM, ">>>>> " + message.friendlyName + " " + DanaRS_Packet.toHexString(command) + " " + DanaRS_Packet.toHexString(params))
+        val params = message.getRequestParams()
+        if (bluetoothGatt == null) {
+            aapsLogger.debug(LTag.PUMPBTCOMM, ">>>>> IGNORING (NOT CONNECTED) " + message.friendlyName + " " + DanaRSPacket.toHexString(command) + " " + DanaRSPacket.toHexString(params))
+            return
+        }
+        aapsLogger.debug(LTag.PUMPBTCOMM, ">>>>> " + message.friendlyName + " " + DanaRSPacket.toHexString(command) + " " + DanaRSPacket.toHexString(params))
         var bytes = bleEncryption.getEncryptedPacket(message.opCode, params, null)
         // aapsLogger.debug(LTag.PUMPBTCOMM, ">>>>> " + DanaRS_Packet.toHexString(bytes))
         if (encryption != EncryptionType.ENCRYPTION_DEFAULT)
@@ -779,16 +827,16 @@ class BLEComm @Inject internal constructor(
             aapsLogger.warn(LTag.PUMPBTCOMM, "Reply not received " + message.friendlyName)
             message.handleMessageNotReceived()
         }
-        // verify encryption for v3
-        if (message is DanaRS_Packet_Etc_Keep_Connection)
+        // verify encryption for v3 & BLE
+        if (message is DanaRSPacketEtcKeepConnection)
             if (!message.isReceived) disconnect("KeepAlive not received")
     }
 
     // process common packet response
     private fun processMessage(decryptedBuffer: ByteArray) {
         val originalCommand = processedMessage?.command ?: 0xFFFF
-        val receivedCommand = DanaRS_Packet(injector).getCommand(decryptedBuffer)
-        val message: DanaRS_Packet? = if (originalCommand == receivedCommand) {
+        val receivedCommand = DanaRSPacket(injector).getCommand(decryptedBuffer)
+        val message: DanaRSPacket? = if (originalCommand == receivedCommand) {
             // it's response to last message
             processedMessage
         } else {
@@ -796,7 +844,7 @@ class BLEComm @Inject internal constructor(
             danaRSMessageHashTable.findMessage(receivedCommand)
         }
         if (message != null) {
-            aapsLogger.debug(LTag.PUMPBTCOMM, "<<<<< " + message.friendlyName + " " + DanaRS_Packet.toHexString(decryptedBuffer))
+            aapsLogger.debug(LTag.PUMPBTCOMM, "<<<<< " + message.friendlyName + " " + DanaRSPacket.toHexString(decryptedBuffer))
             // process received data
             message.handleMessage(decryptedBuffer)
             message.setReceived()
@@ -804,7 +852,7 @@ class BLEComm @Inject internal constructor(
                 // notify to sendMessage
                 message.notify()
             }
-        } else aapsLogger.error("Unknown message received " + DanaRS_Packet.toHexString(decryptedBuffer))
+        } else aapsLogger.error("Unknown message received " + DanaRSPacket.toHexString(decryptedBuffer))
     }
 
 }
\ No newline at end of file
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 43b3b8fa9d..854d8e0b2b 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
@@ -97,7 +97,6 @@ class DanaRSService : DaggerService() {
     val isConnecting: Boolean
         get() = bleComm.isConnecting
 
-    @kotlin.ExperimentalStdlibApi
     fun connect(from: String, address: String): Boolean {
         return bleComm.connect(from, address)
     }
@@ -110,7 +109,7 @@ class DanaRSService : DaggerService() {
         bleComm.disconnect(from)
     }
 
-    fun sendMessage(message: DanaRS_Packet) {
+    fun sendMessage(message: DanaRSPacket) {
         bleComm.sendMessage(message)
     }
 
@@ -118,20 +117,20 @@ class DanaRSService : DaggerService() {
         try {
             val pump = activePlugin.activePump
             rxBus.send(EventPumpStatusChanged(resourceHelper.gs(R.string.gettingpumpsettings)))
-            sendMessage(DanaRS_Packet_Etc_Keep_Connection(injector)) // test encryption for v3
-            sendMessage(DanaRS_Packet_General_Get_Shipping_Information(injector)) // serial no
-            sendMessage(DanaRS_Packet_General_Get_Pump_Check(injector)) // firmware
-            sendMessage(DanaRS_Packet_Basal_Get_Profile_Number(injector))
-            sendMessage(DanaRS_Packet_Bolus_Get_Bolus_Option(injector)) // isExtendedEnabled
-            sendMessage(DanaRS_Packet_Basal_Get_Basal_Rate(injector)) // basal profile, basalStep, maxBasal
-            sendMessage(DanaRS_Packet_Bolus_Get_Calculation_Information(injector)) // target
-            if (danaPump.profile24) sendMessage(DanaRS_Packet_Bolus_Get_24_CIR_CF_Array(injector))
-            else sendMessage(DanaRS_Packet_Bolus_Get_CIR_CF_Array(injector))
-            sendMessage(DanaRS_Packet_Option_Get_User_Option(injector)) // Getting user options
+            sendMessage(DanaRSPacketEtcKeepConnection(injector)) // test encryption for v3 & BLE
+            sendMessage(DanaRSPacketGeneralGetShippingInformation(injector)) // serial no
+            sendMessage(DanaRSPacketGeneralGetPumpCheck(injector)) // firmware
+            sendMessage(DanaRSPacketBasalGetProfileNumber(injector))
+            sendMessage(DanaRSPacketBolusGetBolusOption(injector)) // isExtendedEnabled
+            sendMessage(DanaRSPacketBasalGetBasalRate(injector)) // basal profile, basalStep, maxBasal
+            sendMessage(DanaRSPacketBolusGetCalculationInformation(injector)) // target
+            if (danaPump.profile24) sendMessage(DanaRSPacketBolusGet24CIRCFArray(injector))
+            else sendMessage(DanaRSPacketBolusGetCIRCFArray(injector))
+            sendMessage(DanaRSPacketOptionGetUserOption(injector)) // Getting user options
             rxBus.send(EventPumpStatusChanged(resourceHelper.gs(R.string.gettingpumpstatus)))
-            sendMessage(DanaRS_Packet_General_Initial_Screen_Information(injector))
+            sendMessage(DanaRSPacketGeneralInitialScreenInformation(injector))
             rxBus.send(EventPumpStatusChanged(resourceHelper.gs(R.string.gettingbolusstatus)))
-            sendMessage(DanaRS_Packet_Bolus_Get_Step_Bolus_Information(injector)) // last bolus, bolusStep, maxBolus
+            sendMessage(DanaRSPacketBolusGetStepBolusInformation(injector)) // last bolus, bolusStep, maxBolus
             danaPump.lastConnection = System.currentTimeMillis()
             val profile = profileFunction.getProfile()
             if (profile != null && abs(danaPump.currentBasal - profile.getBasal()) >= pump.pumpDescription.basalStep) {
@@ -141,8 +140,8 @@ class DanaRSService : DaggerService() {
                 }
             }
             rxBus.send(EventPumpStatusChanged(resourceHelper.gs(R.string.gettingpumptime)))
-            if (danaPump.usingUTC) sendMessage(DanaRS_Packet_Option_Get_Pump_UTC_And_TimeZone(injector))
-            else sendMessage(DanaRS_Packet_Option_Get_Pump_Time(injector))
+            if (danaPump.usingUTC) sendMessage(DanaRSPacketOptionGetPumpUTCAndTimeZone(injector))
+            else sendMessage(DanaRSPacketOptionGetPumpTime(injector))
             var timeDiff = (danaPump.getPumpTime() - System.currentTimeMillis()) / 1000L
             if (danaPump.getPumpTime() == 0L) {
                 // initial handshake was not successful
@@ -172,25 +171,26 @@ class DanaRSService : DaggerService() {
                 } else {
                     when {
                         danaPump.usingUTC      -> {
-                            sendMessage(DanaRS_Packet_Option_Set_Pump_UTC_And_TimeZone(injector, dateUtil.now(), offset))
+                            sendMessage(DanaRSPacketOptionSetPumpUTCAndTimeZone(injector, dateUtil.now(), offset))
                         }
 
-                        danaPump.protocol >= 6 -> { // can set seconds
-                            sendMessage(DanaRS_Packet_Option_Set_Pump_Time(injector, dateUtil.now()))
+                        danaPump.protocol >= 5 -> { // can set seconds
+                            sendMessage(DanaRSPacketOptionSetPumpTime(injector, dateUtil.now()))
                         }
 
                         else                   -> {
                             waitForWholeMinute() // Dana can set only whole minute
                             // add 10sec to be sure we are over minute (will be cut off anyway)
-                            sendMessage(DanaRS_Packet_Option_Set_Pump_Time(injector, dateUtil.now() + T.secs(10).msecs()))
+                            sendMessage(DanaRSPacketOptionSetPumpTime(injector, dateUtil.now() + T.secs(10).msecs()))
                         }
                     }
-                    if (danaPump.usingUTC) sendMessage(DanaRS_Packet_Option_Get_Pump_UTC_And_TimeZone(injector))
-                    else sendMessage(DanaRS_Packet_Option_Get_Pump_Time(injector))
+                    if (danaPump.usingUTC) sendMessage(DanaRSPacketOptionGetPumpUTCAndTimeZone(injector))
+                    else sendMessage(DanaRSPacketOptionGetPumpTime(injector))
                     timeDiff = (danaPump.getPumpTime() - System.currentTimeMillis()) / 1000L
                     aapsLogger.debug(LTag.PUMPCOMM, "Pump time difference: $timeDiff seconds")
                 }
             }
+            rxBus.send(EventPumpStatusChanged(resourceHelper.gs(R.string.reading_pump_history)))
             loadEvents()
             // RS doesn't provide exact timestamp = rely on history
             val eb = pumpSync.expectedPumpState().extendedBolus
@@ -221,12 +221,12 @@ class DanaRSService : DaggerService() {
             return result
         }
         SystemClock.sleep(1000)
-        val msg: DanaRS_Packet_APS_History_Events
+        val msg: DanaRSPacketAPSHistoryEvents
         if (danaPump.lastHistoryFetched == 0L) {
-            msg = DanaRS_Packet_APS_History_Events(injector, 0)
+            msg = DanaRSPacketAPSHistoryEvents(injector, 0)
             aapsLogger.debug(LTag.PUMPCOMM, "Loading complete event history")
         } else {
-            msg = DanaRS_Packet_APS_History_Events(injector, danaPump.lastHistoryFetched)
+            msg = DanaRSPacketAPSHistoryEvents(injector, danaPump.lastHistoryFetched)
             aapsLogger.debug(LTag.PUMPCOMM, "Loading event history from: " + dateUtil.dateAndTimeString(danaPump.lastHistoryFetched))
         }
         sendMessage(msg)
@@ -240,7 +240,7 @@ class DanaRSService : DaggerService() {
     }
 
     fun setUserSettings(): PumpEnactResult {
-        val message = DanaRS_Packet_Option_Set_User_Option(injector)
+        val message = DanaRSPacketOptionSetUserOption(injector)
         sendMessage(message)
         return PumpEnactResult(injector).success(message.success())
     }
@@ -256,11 +256,11 @@ class DanaRSService : DaggerService() {
         danaPump.bolusStopped = false
         danaPump.bolusStopForced = false
         danaPump.bolusProgressLastTimeStamp = dateUtil.now()
-        val start = DanaRS_Packet_Bolus_Set_Step_Bolus_Start(injector, insulin, preferencesSpeed)
+        val start = DanaRSPacketBolusSetStepBolusStart(injector, insulin, preferencesSpeed)
         if (carbs > 0) {
 //            MsgSetCarbsEntry msg = new MsgSetCarbsEntry(carbTime, carbs); ####
 //            sendMessage(msg);
-            val msgSetHistoryEntryV2 = DanaRS_Packet_APS_Set_Event_History(injector, DanaPump.CARBS, carbTime, carbs, 0)
+            val msgSetHistoryEntryV2 = DanaRSPacketAPSSetEventHistory(injector, DanaPump.CARBS, carbTime, carbs, 0)
             sendMessage(msgSetHistoryEntryV2)
             danaPump.lastHistoryFetched = min(danaPump.lastHistoryFetched, carbTime - T.mins(1).msecs())
         }
@@ -305,7 +305,7 @@ class DanaRSService : DaggerService() {
             override fun run() {
                 // reread bolus status
                 rxBus.send(EventPumpStatusChanged(resourceHelper.gs(R.string.gettingbolusstatus)))
-                sendMessage(DanaRS_Packet_Bolus_Get_Step_Bolus_Information(injector)) // last bolus
+                sendMessage(DanaRSPacketBolusGetStepBolusInformation(injector)) // last bolus
                 bolusingEvent.percent = 100
                 rxBus.send(EventPumpStatusChanged(resourceHelper.gs(R.string.disconnecting)))
             }
@@ -315,7 +315,7 @@ class DanaRSService : DaggerService() {
 
     fun bolusStop() {
         aapsLogger.debug(LTag.PUMPCOMM, "bolusStop >>>>> @ " + if (danaPump.bolusingTreatment == null) "" else danaPump.bolusingTreatment?.insulin)
-        val stop = DanaRS_Packet_Bolus_Set_Step_Bolus_Stop(injector)
+        val stop = DanaRSPacketBolusSetStepBolusStop(injector)
         danaPump.bolusStopForced = true
         if (isConnected) {
             sendMessage(stop)
@@ -332,11 +332,11 @@ class DanaRSService : DaggerService() {
         if (!isConnected) return false
         if (danaPump.isTempBasalInProgress) {
             rxBus.send(EventPumpStatusChanged(resourceHelper.gs(R.string.stoppingtempbasal)))
-            sendMessage(DanaRS_Packet_Basal_Set_Cancel_Temporary_Basal(injector))
+            sendMessage(DanaRSPacketBasalSetCancelTemporaryBasal(injector))
             SystemClock.sleep(500)
         }
         rxBus.send(EventPumpStatusChanged(resourceHelper.gs(R.string.settingtempbasal)))
-        val msgTBR = DanaRS_Packet_Basal_Set_Temporary_Basal(injector, percent, durationInHours)
+        val msgTBR = DanaRSPacketBasalSetTemporaryBasal(injector, percent, durationInHours)
         sendMessage(msgTBR)
         SystemClock.sleep(200)
         loadEvents()
@@ -349,11 +349,11 @@ class DanaRSService : DaggerService() {
     fun highTempBasal(percent: Int): Boolean {
         if (danaPump.isTempBasalInProgress) {
             rxBus.send(EventPumpStatusChanged(resourceHelper.gs(R.string.stoppingtempbasal)))
-            sendMessage(DanaRS_Packet_Basal_Set_Cancel_Temporary_Basal(injector))
+            sendMessage(DanaRSPacketBasalSetCancelTemporaryBasal(injector))
             SystemClock.sleep(500)
         }
         rxBus.send(EventPumpStatusChanged(resourceHelper.gs(R.string.settingtempbasal)))
-        val msgTBR = DanaRS_Packet_APS_Basal_Set_Temporary_Basal(injector, percent)
+        val msgTBR = DanaRSPacketAPSBasalSetTemporaryBasal(injector, percent)
         sendMessage(msgTBR)
         loadEvents()
         val tbr = pumpSync.expectedPumpState().temporaryBasal
@@ -369,14 +369,15 @@ class DanaRSService : DaggerService() {
         }
         if (danaPump.isTempBasalInProgress) {
             rxBus.send(EventPumpStatusChanged(resourceHelper.gs(R.string.stoppingtempbasal)))
-            sendMessage(DanaRS_Packet_Basal_Set_Cancel_Temporary_Basal(injector))
+            sendMessage(DanaRSPacketBasalSetCancelTemporaryBasal(injector))
             SystemClock.sleep(500)
         }
         rxBus.send(EventPumpStatusChanged(resourceHelper.gs(R.string.settingtempbasal)))
-        val msgTBR = DanaRS_Packet_APS_Basal_Set_Temporary_Basal(injector, percent)
+        val msgTBR = DanaRSPacketAPSBasalSetTemporaryBasal(injector, percent)
         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()
@@ -385,7 +386,7 @@ class DanaRSService : DaggerService() {
     fun tempBasalStop(): Boolean {
         if (!isConnected) return false
         rxBus.send(EventPumpStatusChanged(resourceHelper.gs(R.string.stoppingtempbasal)))
-        val msgCancel = DanaRS_Packet_Basal_Set_Cancel_Temporary_Basal(injector)
+        val msgCancel = DanaRSPacketBasalSetCancelTemporaryBasal(injector)
         sendMessage(msgCancel)
         loadEvents()
         val tbr = pumpSync.expectedPumpState().temporaryBasal
@@ -397,7 +398,7 @@ class DanaRSService : DaggerService() {
     fun extendedBolus(insulin: Double, durationInHalfHours: Int): Boolean {
         if (!isConnected) return false
         rxBus.send(EventPumpStatusChanged(resourceHelper.gs(R.string.settingextendedbolus)))
-        val msgExtended = DanaRS_Packet_Bolus_Set_Extended_Bolus(injector, insulin, durationInHalfHours)
+        val msgExtended = DanaRSPacketBolusSetExtendedBolus(injector, insulin, durationInHalfHours)
         sendMessage(msgExtended)
         SystemClock.sleep(200)
         loadEvents()
@@ -410,7 +411,7 @@ class DanaRSService : DaggerService() {
     fun extendedBolusStop(): Boolean {
         if (!isConnected) return false
         rxBus.send(EventPumpStatusChanged(resourceHelper.gs(R.string.stoppingextendedbolus)))
-        val msgStop = DanaRS_Packet_Bolus_Set_Extended_Bolus_Cancel(injector)
+        val msgStop = DanaRSPacketBolusSetExtendedBolusCancel(injector)
         sendMessage(msgStop)
         loadEvents()
         val eb = pumpSync.expectedPumpState().extendedBolus
@@ -423,12 +424,12 @@ class DanaRSService : DaggerService() {
         if (!isConnected) return false
         rxBus.send(EventPumpStatusChanged(resourceHelper.gs(R.string.updatingbasalrates)))
         val basal = danaPump.buildDanaRProfileRecord(profile)
-        val msgSet = DanaRS_Packet_Basal_Set_Profile_Basal_Rate(injector, 0, basal)
+        val msgSet = DanaRSPacketBasalSetProfileBasalRate(injector, 0, basal)
         sendMessage(msgSet)
-        val msgActivate = DanaRS_Packet_Basal_Set_Profile_Number(injector, 0)
+        val msgActivate = DanaRSPacketBasalSetProfileNumber(injector, 0)
         sendMessage(msgActivate)
         if (danaPump.profile24) {
-            val msgProfile = DanaRS_Packet_Bolus_Set_24_CIR_CF_Array(injector, profile)
+            val msgProfile = DanaRSPacketBolusSet24CIRCFArray(injector, profile)
             sendMessage(msgProfile)
         }
         readPumpStatus()
@@ -439,27 +440,27 @@ class DanaRSService : DaggerService() {
     fun loadHistory(type: Byte): PumpEnactResult {
         val result = PumpEnactResult(injector)
         if (!isConnected) return result
-        var msg: DanaRS_Packet_History_? = null
+        var msg: DanaRSPacketHistory? = null
         when (type) {
-            RecordTypes.RECORD_TYPE_ALARM     -> msg = DanaRS_Packet_History_Alarm(injector)
-            RecordTypes.RECORD_TYPE_PRIME     -> msg = DanaRS_Packet_History_Prime(injector)
-            RecordTypes.RECORD_TYPE_BASALHOUR -> msg = DanaRS_Packet_History_Basal(injector)
-            RecordTypes.RECORD_TYPE_BOLUS     -> msg = DanaRS_Packet_History_Bolus(injector)
-            RecordTypes.RECORD_TYPE_CARBO     -> msg = DanaRS_Packet_History_Carbohydrate(injector)
-            RecordTypes.RECORD_TYPE_DAILY     -> msg = DanaRS_Packet_History_Daily(injector)
-            RecordTypes.RECORD_TYPE_GLUCOSE   -> msg = DanaRS_Packet_History_Blood_Glucose(injector)
-            RecordTypes.RECORD_TYPE_REFILL    -> msg = DanaRS_Packet_History_Refill(injector)
-            RecordTypes.RECORD_TYPE_SUSPEND   -> msg = DanaRS_Packet_History_Suspend(injector)
+            RecordTypes.RECORD_TYPE_ALARM     -> msg = DanaRSPacketHistoryAlarm(injector)
+            RecordTypes.RECORD_TYPE_PRIME     -> msg = DanaRSPacketHistoryPrime(injector)
+            RecordTypes.RECORD_TYPE_BASALHOUR -> msg = DanaRSPacketHistoryBasal(injector)
+            RecordTypes.RECORD_TYPE_BOLUS     -> msg = DanaRSPacketHistoryBolus(injector)
+            RecordTypes.RECORD_TYPE_CARBO     -> msg = DanaRSPacketHistoryCarbohydrate(injector)
+            RecordTypes.RECORD_TYPE_DAILY     -> msg = DanaRSPacketHistoryDaily(injector)
+            RecordTypes.RECORD_TYPE_GLUCOSE   -> msg = DanaRSPacketHistoryBloodGlucose(injector)
+            RecordTypes.RECORD_TYPE_REFILL    -> msg = DanaRSPacketHistoryRefill(injector)
+            RecordTypes.RECORD_TYPE_SUSPEND   -> msg = DanaRSPacketHistorySuspend(injector)
         }
         if (msg != null) {
-            sendMessage(DanaRS_Packet_General_Set_History_Upload_Mode(injector, 1))
+            sendMessage(DanaRSPacketGeneralSetHistoryUploadMode(injector, 1))
             SystemClock.sleep(200)
             sendMessage(msg)
             while (!msg.done && isConnected) {
                 SystemClock.sleep(100)
             }
             SystemClock.sleep(200)
-            sendMessage(DanaRS_Packet_General_Set_History_Upload_Mode(injector, 0))
+            sendMessage(DanaRSPacketGeneralSetHistoryUploadMode(injector, 0))
         }
         result.success = msg?.success() ?: false
         return result
diff --git a/danars/src/main/jniLibs/arm64-v8a/libBleEncryption.so b/danars/src/main/jniLibs/arm64-v8a/libBleEncryption.so
index 7c0c49b7e8..baf9014328 100644
Binary files a/danars/src/main/jniLibs/arm64-v8a/libBleEncryption.so and b/danars/src/main/jniLibs/arm64-v8a/libBleEncryption.so differ
diff --git a/danars/src/main/jniLibs/armeabi-v7a/libBleEncryption.so b/danars/src/main/jniLibs/armeabi-v7a/libBleEncryption.so
index 4778aca663..f5daf1449d 100644
Binary files a/danars/src/main/jniLibs/armeabi-v7a/libBleEncryption.so and b/danars/src/main/jniLibs/armeabi-v7a/libBleEncryption.so differ
diff --git a/danars/src/main/jniLibs/x86/libBleEncryption.so b/danars/src/main/jniLibs/x86/libBleEncryption.so
index e5ef3a17a4..b63dd5a234 100644
Binary files a/danars/src/main/jniLibs/x86/libBleEncryption.so and b/danars/src/main/jniLibs/x86/libBleEncryption.so differ
diff --git a/danars/src/main/jniLibs/x86_64/libBleEncryption.so b/danars/src/main/jniLibs/x86_64/libBleEncryption.so
index e4c02d8842..871e79aad5 100644
Binary files a/danars/src/main/jniLibs/x86_64/libBleEncryption.so and b/danars/src/main/jniLibs/x86_64/libBleEncryption.so differ
diff --git a/danars/src/test/java/info/nightscout/androidaps/TestBaseWithProfile.kt b/danars/src/test/java/info/nightscout/androidaps/TestBaseWithProfile.kt
index 8b145c52a4..bd213d3c8e 100644
--- a/danars/src/test/java/info/nightscout/androidaps/TestBaseWithProfile.kt
+++ b/danars/src/test/java/info/nightscout/androidaps/TestBaseWithProfile.kt
@@ -4,7 +4,11 @@ import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.data.ProfileSealed
 import info.nightscout.androidaps.extensions.pureProfileFromJson
-import info.nightscout.androidaps.interfaces.*
+import info.nightscout.androidaps.interfaces.ActivePlugin
+import info.nightscout.androidaps.interfaces.Config
+import info.nightscout.androidaps.interfaces.Profile
+import info.nightscout.androidaps.interfaces.ProfileFunction
+import info.nightscout.androidaps.interfaces.ProfileStore
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.utils.DefaultValueHelper
@@ -13,15 +17,12 @@ import info.nightscout.androidaps.utils.resources.ResourceHelper
 import org.json.JSONObject
 import org.junit.Before
 import org.mockito.Mock
-import org.powermock.core.classloader.annotations.PrepareForTest
 
 @Suppress("SpellCheckingInspection")
-@PrepareForTest(FabricPrivacy::class)
 open class TestBaseWithProfile : TestBase() {
 
     @Mock lateinit var activePluginProvider: ActivePlugin
     @Mock lateinit var resourceHelper: ResourceHelper
-    @Mock lateinit var treatmentsInterface: TreatmentsInterface
     @Mock lateinit var fabricPrivacy: FabricPrivacy
     @Mock lateinit var profileFunction: ProfileFunction
     @Mock lateinit var defaultValueHelper: DefaultValueHelper
diff --git a/danars/src/test/java/info/nightscout/androidaps/danars/DanaRSPluginTest.kt b/danars/src/test/java/info/nightscout/androidaps/danars/DanaRSPluginTest.kt
index 61f2ea5d53..45fcde6f93 100644
--- a/danars/src/test/java/info/nightscout/androidaps/danars/DanaRSPluginTest.kt
+++ b/danars/src/test/java/info/nightscout/androidaps/danars/DanaRSPluginTest.kt
@@ -7,23 +7,17 @@ import info.nightscout.androidaps.interfaces.CommandQueueProvider
 import info.nightscout.androidaps.interfaces.Constraint
 import info.nightscout.androidaps.interfaces.PluginType
 import info.nightscout.androidaps.interfaces.PumpSync
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
 import info.nightscout.androidaps.plugins.pump.common.bolusInfo.DetailedBolusInfoStorage
 import info.nightscout.androidaps.plugins.pump.common.bolusInfo.TemporaryBasalStorage
 import org.junit.Assert
 import org.junit.Before
 import org.junit.Test
-import org.junit.runner.RunWith
 import org.mockito.ArgumentMatchers.eq
 import org.mockito.Mock
 import org.mockito.Mockito
-import org.powermock.core.classloader.annotations.PrepareForTest
-import org.powermock.modules.junit4.PowerMockRunner
 
 @Suppress("SpellCheckingInspection")
-@RunWith(PowerMockRunner::class)
-@PrepareForTest(ConstraintChecker::class, RxBusWrapper::class, DetailedBolusInfoStorage::class, TemporaryBasalStorage::class)
 class DanaRSPluginTest : DanaRSTestBase() {
 
     @Mock lateinit var context: Context
diff --git a/danars/src/test/java/info/nightscout/androidaps/danars/DanaRSTestBase.kt b/danars/src/test/java/info/nightscout/androidaps/danars/DanaRSTestBase.kt
index 05b06d4fca..b7a6c6a25d 100644
--- a/danars/src/test/java/info/nightscout/androidaps/danars/DanaRSTestBase.kt
+++ b/danars/src/test/java/info/nightscout/androidaps/danars/DanaRSTestBase.kt
@@ -4,7 +4,7 @@ import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.TestBaseWithProfile
 import info.nightscout.androidaps.dana.DanaPump
-import info.nightscout.androidaps.danars.comm.DanaRS_Packet
+import info.nightscout.androidaps.danars.comm.DanaRSPacket
 import info.nightscout.androidaps.utils.sharedPreferences.SP
 import org.junit.Before
 import org.mockito.ArgumentMatchers
@@ -42,13 +42,13 @@ open class DanaRSTestBase : TestBaseWithProfile() {
 
     @Suppress("unused")
     fun putIntToArray(array: ByteArray, position: Int, value: Int): ByteArray {
-        array[DanaRS_Packet.DATA_START + position] = (value and 0xFF).toByte()
-        array[DanaRS_Packet.DATA_START + position + 1] = ((value and 0xFF00) shr 8).toByte()
+        array[DanaRSPacket.DATA_START + position] = (value and 0xFF).toByte()
+        array[DanaRSPacket.DATA_START + position + 1] = ((value and 0xFF00) shr 8).toByte()
         return array
     }
 
     fun putByteToArray(array: ByteArray, position: Int, value: Byte): ByteArray {
-        array[DanaRS_Packet.DATA_START + position] = value
+        array[DanaRSPacket.DATA_START + position] = value
         return array
     }
 
diff --git a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBasalSetTemporaryBasalTest.kt b/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBasalSetTemporaryBasalTest.kt
index 4932678f8b..66adc8ed69 100644
--- a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBasalSetTemporaryBasalTest.kt
+++ b/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRSPacketBasalSetTemporaryBasalTest.kt
@@ -5,24 +5,21 @@ import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.danars.DanaRSTestBase
 import org.junit.Assert
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.powermock.modules.junit4.PowerMockRunner
 
-@RunWith(PowerMockRunner::class)
 class DanaRSPacketBasalSetTemporaryBasalTest : DanaRSTestBase() {
 
     private val packetInjector = HasAndroidInjector {
         AndroidInjector {
-            if (it is DanaRS_Packet_Basal_Set_Temporary_Basal) {
+            if (it is DanaRSPacketBasalSetTemporaryBasal) {
                 it.aapsLogger = aapsLogger
             }
         }
     }
 
     @Test fun runTest() {
-        val testPacket = DanaRS_Packet_Basal_Set_Temporary_Basal(packetInjector, 50, 20)
+        val testPacket = DanaRSPacketBasalSetTemporaryBasal(packetInjector, 50, 20)
         // params
-        val params = testPacket.requestParams
+        val params = testPacket.getRequestParams()
         // is ratio 50
         Assert.assertEquals(50.toByte(), params[0])
         // is duration 20
diff --git a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRSPacketHistoryAlarmTest.kt b/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRSPacketHistoryAlarmTest.kt
index 5993ed2535..a75b665882 100644
--- a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRSPacketHistoryAlarmTest.kt
+++ b/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRSPacketHistoryAlarmTest.kt
@@ -7,23 +7,20 @@ import info.nightscout.androidaps.dana.database.DanaHistoryRecordDao
 import info.nightscout.androidaps.danars.DanaRSTestBase
 import org.junit.Assert
 import org.junit.Test
-import org.junit.runner.RunWith
 import org.mockito.Mock
-import org.powermock.modules.junit4.PowerMockRunner
 import java.util.*
 
-@RunWith(PowerMockRunner::class)
 class DanaRSPacketHistoryAlarmTest : DanaRSTestBase() {
 
     @Mock lateinit var danaHistoryRecordDao: DanaHistoryRecordDao
 
     private val packetInjector = HasAndroidInjector {
         AndroidInjector {
-            if (it is DanaRS_Packet) {
+            if (it is DanaRSPacket) {
                 it.aapsLogger = aapsLogger
                 it.dateUtil = dateUtil
             }
-            if (it is DanaRS_Packet_History_Alarm) {
+            if (it is DanaRSPacketHistoryAlarm) {
                 it.rxBus = rxBus
                 it.danaHistoryRecordDao = danaHistoryRecordDao
             }
@@ -31,9 +28,8 @@ class DanaRSPacketHistoryAlarmTest : DanaRSTestBase() {
     }
 
     @Test
-    @kotlin.ExperimentalStdlibApi
     fun runTest() {
-        val packet = DanaRS_Packet_History_Alarm(packetInjector, 0)
+        val packet = DanaRSPacketHistoryAlarm(packetInjector, 0)
 
         val array = createArray(12, 0.toByte()) // 10 + 2
         putByteToArray(array, 0, 0x0A) // record code alarm
diff --git a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRSPacketNotifyDeliveryCompleteTest.kt b/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRSPacketNotifyDeliveryCompleteTest.kt
index 7bbeef73b6..034df8113e 100644
--- a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRSPacketNotifyDeliveryCompleteTest.kt
+++ b/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRSPacketNotifyDeliveryCompleteTest.kt
@@ -2,30 +2,23 @@ package info.nightscout.androidaps.danars.comm
 
 import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.danars.DanaRSPlugin
 import info.nightscout.androidaps.danars.DanaRSTestBase
 import info.nightscout.androidaps.interfaces.ActivePlugin
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.general.overview.events.EventOverviewBolusProgress
 import org.junit.Assert
 import org.junit.Test
-import org.junit.runner.RunWith
 import org.mockito.Mock
 import org.mockito.Mockito.`when`
 import org.mockito.Mockito.anyDouble
 import org.mockito.Mockito.anyInt
-import org.powermock.core.classloader.annotations.PrepareForTest
-import org.powermock.modules.junit4.PowerMockRunner
 
-@RunWith(PowerMockRunner::class)
-@PrepareForTest(RxBusWrapper::class, DanaRSPlugin::class)
 class DanaRSPacketNotifyDeliveryCompleteTest : DanaRSTestBase() {
 
     @Mock lateinit var activePlugin: ActivePlugin
 
     private val packetInjector = HasAndroidInjector {
         AndroidInjector {
-            if (it is DanaRS_Packet_Notify_Delivery_Complete) {
+            if (it is DanaRSPacketNotifyDeliveryComplete) {
                 it.aapsLogger = aapsLogger
                 it.rxBus = rxBus
                 it.resourceHelper = resourceHelper
@@ -38,9 +31,9 @@ class DanaRSPacketNotifyDeliveryCompleteTest : DanaRSTestBase() {
         `when`(resourceHelper.gs(anyInt(), anyDouble())).thenReturn("SomeString")
 
         danaPump.bolusingTreatment = EventOverviewBolusProgress.Treatment(0.0, 0, true)
-        val packet = DanaRS_Packet_Notify_Delivery_Complete(packetInjector)
+        val packet = DanaRSPacketNotifyDeliveryComplete(packetInjector)
         // test params
-        Assert.assertEquals(null, packet.requestParams)
+        Assert.assertEquals(0, packet.getRequestParams().size)
         // test message decoding
         packet.handleMessage(createArray(17, 0.toByte()))
         Assert.assertEquals(true, danaPump.bolusDone)
diff --git a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRSPacketOptionSetUserOptionTest.kt b/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRSPacketOptionSetUserOptionTest.kt
index dfea5dee2f..d5b2cdd15e 100644
--- a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRSPacketOptionSetUserOptionTest.kt
+++ b/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRSPacketOptionSetUserOptionTest.kt
@@ -5,15 +5,12 @@ import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.danars.DanaRSTestBase
 import org.junit.Assert
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.powermock.modules.junit4.PowerMockRunner
 
-@RunWith(PowerMockRunner::class)
 class DanaRSPacketOptionSetUserOptionTest : DanaRSTestBase() {
 
     private val packetInjector = HasAndroidInjector {
         AndroidInjector {
-            if (it is DanaRS_Packet_Option_Set_User_Option) {
+            if (it is DanaRSPacketOptionSetUserOption) {
                 it.aapsLogger = aapsLogger
                 it.danaPump = danaPump
             }
@@ -21,9 +18,9 @@ class DanaRSPacketOptionSetUserOptionTest : DanaRSTestBase() {
     }
 
     @Test fun runTest() {
-        val packet = DanaRS_Packet_Option_Set_User_Option(packetInjector)
+        val packet = DanaRSPacketOptionSetUserOption(packetInjector)
         // test params
-        val params = packet.requestParams
+        val params = packet.getRequestParams()
         Assert.assertEquals((danaPump.lcdOnTimeSec and 0xff).toByte(), params[3])
         // test message decoding
         packet.handleMessage(createArray(3, 0.toByte()))
diff --git a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsMessageHashTableTest.kt b/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsMessageHashTableTest.kt
index 98c90be4ac..62244b0ba2 100644
--- a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsMessageHashTableTest.kt
+++ b/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsMessageHashTableTest.kt
@@ -2,41 +2,36 @@ package info.nightscout.androidaps.danars.comm
 
 import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.dana.DanaPump
+import info.nightscout.androidaps.danars.DanaRSTestBase
 import info.nightscout.androidaps.danars.encryption.BleEncryption
 import info.nightscout.androidaps.interfaces.ActivePlugin
 import info.nightscout.androidaps.interfaces.Constraint
 import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
 import info.nightscout.androidaps.plugins.pump.common.bolusInfo.DetailedBolusInfoStorage
-import info.nightscout.androidaps.danars.DanaRSTestBase
 import org.junit.Assert
 import org.junit.Test
-import org.junit.runner.RunWith
 import org.mockito.Mock
 import org.mockito.Mockito.`when`
-import org.powermock.core.classloader.annotations.PrepareForTest
-import org.powermock.modules.junit4.PowerMockRunner
 
-@RunWith(PowerMockRunner::class)
-@PrepareForTest(ConstraintChecker::class, DetailedBolusInfoStorage::class)
 class DanaRsMessageHashTableTest : DanaRSTestBase() {
 
     @Mock lateinit var activePlugin: ActivePlugin
     @Mock lateinit var constraintChecker: ConstraintChecker
-    @Mock lateinit var detailedBolusInfoStorage: DetailedBolusInfoStorage
 
     private val packetInjector = HasAndroidInjector {
         AndroidInjector {
-            if (it is DanaRS_Packet) {
+            if (it is DanaRSPacket) {
                 it.aapsLogger = aapsLogger
                 it.dateUtil = dateUtil
             }
-            if (it is DanaRS_Packet_Bolus_Set_Step_Bolus_Start) {
+            if (it is DanaRSPacketBolusSetStepBolusStart) {
                 it.constraintChecker = constraintChecker
             }
-            if (it is DanaRS_Packet_Bolus_Set_Step_Bolus_Start) {
+            if (it is DanaRSPacketBolusSetStepBolusStart) {
                 it.danaPump = danaPump
             }
-            if (it is DanaRS_Packet_APS_History_Events) {
+            if (it is DanaRSPacketAPSHistoryEvents) {
                 it.danaPump = danaPump
             }
         }
@@ -47,8 +42,8 @@ class DanaRsMessageHashTableTest : DanaRSTestBase() {
         `when`(constraintChecker.applyBolusConstraints(anyObject())).thenReturn(Constraint(0.0))
 
         val danaRSMessageHashTable = DanaRSMessageHashTable(packetInjector)
-        val forTesting: DanaRS_Packet = DanaRS_Packet_APS_Set_Event_History(packetInjector, info.nightscout.androidaps.dana.DanaPump.CARBS, 0, 0, 0)
-        val testPacket: DanaRS_Packet = danaRSMessageHashTable.findMessage(forTesting.command)
-        Assert.assertEquals(BleEncryption.DANAR_PACKET__OPCODE__APS_SET_EVENT_HISTORY.toLong(), testPacket.getOpCode().toLong())
+        val forTesting: DanaRSPacket = DanaRSPacketAPSSetEventHistory(packetInjector, DanaPump.CARBS, 0, 0, 0)
+        val testPacket: DanaRSPacket = danaRSMessageHashTable.findMessage(forTesting.command)
+        Assert.assertEquals(BleEncryption.DANAR_PACKET__OPCODE__APS_SET_EVENT_HISTORY.toLong(), testPacket.opCode.toLong())
     }
 }
\ No newline at end of file
diff --git a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketApsBasalSetTemporaryBasalTest.kt b/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketApsBasalSetTemporaryBasalTest.kt
index d7c9afa3fd..5b44730191 100644
--- a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketApsBasalSetTemporaryBasalTest.kt
+++ b/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketApsBasalSetTemporaryBasalTest.kt
@@ -5,15 +5,12 @@ import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.danars.DanaRSTestBase
 import org.junit.Assert
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.powermock.modules.junit4.PowerMockRunner
 
-@RunWith(PowerMockRunner::class)
 class DanaRsPacketApsBasalSetTemporaryBasalTest : DanaRSTestBase() {
 
     private val packetInjector = HasAndroidInjector {
         AndroidInjector {
-            if (it is DanaRS_Packet_APS_Basal_Set_Temporary_Basal) {
+            if (it is DanaRSPacketAPSBasalSetTemporaryBasal) {
                 it.aapsLogger = aapsLogger
             }
         }
@@ -23,32 +20,32 @@ class DanaRsPacketApsBasalSetTemporaryBasalTest : DanaRSTestBase() {
     @Test fun runTest() {
 
         // under 100% should last 30 min
-        var packet = DanaRS_Packet_APS_Basal_Set_Temporary_Basal(packetInjector, 0)
+        var packet = DanaRSPacketAPSBasalSetTemporaryBasal(packetInjector, 0)
         Assert.assertEquals(0, packet.temporaryBasalRatio)
-        Assert.assertEquals(DanaRS_Packet_APS_Basal_Set_Temporary_Basal.PARAM30MIN, packet.temporaryBasalDuration)
+        Assert.assertEquals(DanaRSPacketAPSBasalSetTemporaryBasal.PARAM30MIN, packet.temporaryBasalDuration)
         //constructor with param
-        packet = DanaRS_Packet_APS_Basal_Set_Temporary_Basal(packetInjector, 10)
+        packet = DanaRSPacketAPSBasalSetTemporaryBasal(packetInjector, 10)
         Assert.assertEquals(10, packet.temporaryBasalRatio)
-        Assert.assertEquals(DanaRS_Packet_APS_Basal_Set_Temporary_Basal.PARAM30MIN, packet.temporaryBasalDuration)
+        Assert.assertEquals(DanaRSPacketAPSBasalSetTemporaryBasal.PARAM30MIN, packet.temporaryBasalDuration)
         // over 100% should last 15 min
-        packet = DanaRS_Packet_APS_Basal_Set_Temporary_Basal(packetInjector, 150)
+        packet = DanaRSPacketAPSBasalSetTemporaryBasal(packetInjector, 150)
         Assert.assertEquals(150, packet.temporaryBasalRatio)
-        Assert.assertEquals(DanaRS_Packet_APS_Basal_Set_Temporary_Basal.PARAM15MIN, packet.temporaryBasalDuration)
+        Assert.assertEquals(DanaRSPacketAPSBasalSetTemporaryBasal.PARAM15MIN, packet.temporaryBasalDuration)
         // test low hard limit
-        packet = DanaRS_Packet_APS_Basal_Set_Temporary_Basal(packetInjector, -1)
+        packet = DanaRSPacketAPSBasalSetTemporaryBasal(packetInjector, -1)
         Assert.assertEquals(0, packet.temporaryBasalRatio)
-        Assert.assertEquals(DanaRS_Packet_APS_Basal_Set_Temporary_Basal.PARAM30MIN, packet.temporaryBasalDuration)
+        Assert.assertEquals(DanaRSPacketAPSBasalSetTemporaryBasal.PARAM30MIN, packet.temporaryBasalDuration)
         // test high hard limit
-        packet = DanaRS_Packet_APS_Basal_Set_Temporary_Basal(packetInjector, 550)
+        packet = DanaRSPacketAPSBasalSetTemporaryBasal(packetInjector, 550)
         Assert.assertEquals(500, packet.temporaryBasalRatio)
-        Assert.assertEquals(DanaRS_Packet_APS_Basal_Set_Temporary_Basal.PARAM15MIN, packet.temporaryBasalDuration)
+        Assert.assertEquals(DanaRSPacketAPSBasalSetTemporaryBasal.PARAM15MIN, packet.temporaryBasalDuration)
         // test message generation
-        packet = DanaRS_Packet_APS_Basal_Set_Temporary_Basal(packetInjector, 260)
-        val generatedCode = packet.requestParams
+        packet = DanaRSPacketAPSBasalSetTemporaryBasal(packetInjector, 260)
+        val generatedCode = packet.getRequestParams()
         Assert.assertEquals(3, generatedCode.size.toLong())
         Assert.assertEquals(4.toByte(), generatedCode[0])
         Assert.assertEquals(1.toByte(), generatedCode[1])
-        Assert.assertEquals(DanaRS_Packet_APS_Basal_Set_Temporary_Basal.PARAM15MIN.toUByte(), generatedCode[2].toUByte())
+        Assert.assertEquals(DanaRSPacketAPSBasalSetTemporaryBasal.PARAM15MIN.toUByte(), generatedCode[2].toUByte())
         // test message decoding
         packet.handleMessage(byteArrayOf(0.toByte(), 0.toByte(), 0.toByte()))
         Assert.assertEquals(false, packet.failed)
diff --git a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketApsHistoryEventsTest.kt b/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketApsHistoryEventsTest.kt
index 093adb3fe3..de5f2d7588 100644
--- a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketApsHistoryEventsTest.kt
+++ b/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketApsHistoryEventsTest.kt
@@ -3,23 +3,16 @@ package info.nightscout.androidaps.danars.comm
 import android.content.Context
 import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.danars.DanaRSPlugin
 import info.nightscout.androidaps.danars.DanaRSTestBase
 import info.nightscout.androidaps.interfaces.ActivePlugin
 import info.nightscout.androidaps.interfaces.PumpSync
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.pump.common.bolusInfo.DetailedBolusInfoStorage
 import info.nightscout.androidaps.plugins.pump.common.bolusInfo.TemporaryBasalStorage
 import org.junit.Assert
 import org.junit.Test
-import org.junit.runner.RunWith
 import org.mockito.Mock
-import org.powermock.core.classloader.annotations.PrepareForTest
-import org.powermock.modules.junit4.PowerMockRunner
 import java.util.*
 
-@RunWith(PowerMockRunner::class)
-@PrepareForTest(RxBusWrapper::class, DetailedBolusInfoStorage::class, TemporaryBasalStorage::class, DanaRSPlugin::class)
 class DanaRsPacketApsHistoryEventsTest : DanaRSTestBase() {
 
     @Mock lateinit var context: Context
@@ -30,11 +23,11 @@ class DanaRsPacketApsHistoryEventsTest : DanaRSTestBase() {
 
     private val packetInjector = HasAndroidInjector {
         AndroidInjector {
-            if (it is DanaRS_Packet) {
+            if (it is DanaRSPacket) {
                 it.aapsLogger = aapsLogger
                 it.dateUtil = dateUtil
             }
-            if (it is DanaRS_Packet_APS_History_Events) {
+            if (it is DanaRSPacketAPSHistoryEvents) {
                 it.rxBus = rxBus
                 it.resourceHelper = resourceHelper
                 it.pumpSync = pumpSync
@@ -49,9 +42,9 @@ class DanaRsPacketApsHistoryEventsTest : DanaRSTestBase() {
     @Test fun runTest() {
         val now = dateUtil.now()
 
-        val testPacket = DanaRS_Packet_APS_History_Events(packetInjector, now)
+        val testPacket = DanaRSPacketAPSHistoryEvents(packetInjector, now)
         // test getRequestedParams
-        val returnedValues = testPacket.requestParams
+        val returnedValues = testPacket.getRequestParams()
         val expectedValues = getCalender(now)
         //year
         Assert.assertEquals(expectedValues[0], returnedValues[0])
diff --git a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketApsSetEventHistoryTest.kt b/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketApsSetEventHistoryTest.kt
index 07809e9dc5..584e6da3bb 100644
--- a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketApsSetEventHistoryTest.kt
+++ b/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketApsSetEventHistoryTest.kt
@@ -5,19 +5,16 @@ import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.danars.DanaRSTestBase
 import org.junit.Assert
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.powermock.modules.junit4.PowerMockRunner
 
-@RunWith(PowerMockRunner::class)
 class DanaRsPacketApsSetEventHistoryTest : DanaRSTestBase() {
 
     private val packetInjector = HasAndroidInjector {
         AndroidInjector {
-            if (it is DanaRS_Packet) {
+            if (it is DanaRSPacket) {
                 it.aapsLogger = aapsLogger
                 it.dateUtil = dateUtil
             }
-            if (it is DanaRS_Packet_APS_Set_Event_History) {
+            if (it is DanaRSPacketAPSSetEventHistory) {
                 it.danaPump = danaPump
             }
         }
@@ -25,20 +22,20 @@ class DanaRsPacketApsSetEventHistoryTest : DanaRSTestBase() {
 
     @Test fun runTest() { // test for negative carbs
         val now = dateUtil.now()
-        var historyTest = DanaRS_Packet_APS_Set_Event_History(packetInjector, info.nightscout.androidaps.dana.DanaPump.CARBS, now, -1, 0)
-        var testParams = historyTest.requestParams
+        var historyTest = DanaRSPacketAPSSetEventHistory(packetInjector, info.nightscout.androidaps.dana.DanaPump.CARBS, now, -1, 0)
+        var testParams = historyTest.getRequestParams()
         Assert.assertEquals(0.toByte(), testParams[8])
         // 5g carbs
-        historyTest = DanaRS_Packet_APS_Set_Event_History(packetInjector, info.nightscout.androidaps.dana.DanaPump.CARBS, now, 5, 0)
-        testParams = historyTest.requestParams
+        historyTest = DanaRSPacketAPSSetEventHistory(packetInjector, info.nightscout.androidaps.dana.DanaPump.CARBS, now, 5, 0)
+        testParams = historyTest.getRequestParams()
         Assert.assertEquals(5.toByte(), testParams[8])
         // 150g carbs
-        historyTest = DanaRS_Packet_APS_Set_Event_History(packetInjector, info.nightscout.androidaps.dana.DanaPump.CARBS, now, 150, 0)
-        testParams = historyTest.requestParams
+        historyTest = DanaRSPacketAPSSetEventHistory(packetInjector, info.nightscout.androidaps.dana.DanaPump.CARBS, now, 150, 0)
+        testParams = historyTest.getRequestParams()
         Assert.assertEquals(150.toByte(), testParams[8])
         // test message generation
-        historyTest = DanaRS_Packet_APS_Set_Event_History(packetInjector, info.nightscout.androidaps.dana.DanaPump.CARBS, now, 5, 0)
-        testParams = historyTest.requestParams
+        historyTest = DanaRSPacketAPSSetEventHistory(packetInjector, info.nightscout.androidaps.dana.DanaPump.CARBS, now, 5, 0)
+        testParams = historyTest.getRequestParams()
         Assert.assertEquals(5.toByte(), testParams[8])
         Assert.assertEquals(11, testParams.size)
         Assert.assertEquals(info.nightscout.androidaps.dana.DanaPump.CARBS.toByte(), testParams[0])
diff --git a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketBasalGetBasalRateTest.kt b/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketBasalGetBasalRateTest.kt
index 938e716ba7..f7865fce36 100644
--- a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketBasalGetBasalRateTest.kt
+++ b/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketBasalGetBasalRateTest.kt
@@ -2,21 +2,15 @@ package info.nightscout.androidaps.danars.comm
 
 import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.danars.DanaRSTestBase
 import org.junit.Assert
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.powermock.core.classloader.annotations.PrepareForTest
-import org.powermock.modules.junit4.PowerMockRunner
 
-@RunWith(PowerMockRunner::class)
-@PrepareForTest(RxBusWrapper::class)
 class DanaRsPacketBasalGetBasalRateTest : DanaRSTestBase() {
 
     private val packetInjector = HasAndroidInjector {
         AndroidInjector {
-            if (it is DanaRS_Packet_Basal_Get_Basal_Rate) {
+            if (it is DanaRSPacketBasalGetBasalRate) {
                 it.aapsLogger = aapsLogger
                 it.rxBus = rxBus
                 it.resourceHelper = resourceHelper
@@ -26,7 +20,7 @@ class DanaRsPacketBasalGetBasalRateTest : DanaRSTestBase() {
     }
 
     @Test fun runTest() {
-        val packet = DanaRS_Packet_Basal_Get_Basal_Rate(packetInjector)
+        val packet = DanaRSPacketBasalGetBasalRate(packetInjector)
         // test message decoding
         // rate is 0.01
         val array = ByteArray(100)
diff --git a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketBasalGetProfileBasalRateTest.kt b/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketBasalGetProfileBasalRateTest.kt
deleted file mode 100644
index c1cfd49dcd..0000000000
--- a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketBasalGetProfileBasalRateTest.kt
+++ /dev/null
@@ -1,45 +0,0 @@
-package info.nightscout.androidaps.danars.comm
-
-import dagger.android.AndroidInjector
-import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.danars.DanaRSTestBase
-import org.junit.Assert.assertEquals
-import org.junit.Test
-import org.junit.runner.RunWith
-import org.powermock.modules.junit4.PowerMockRunner
-
-@RunWith(PowerMockRunner::class)
-class DanaRsPacketBasalGetProfileBasalRateTest : DanaRSTestBase() {
-
-    private val packetInjector = HasAndroidInjector {
-        AndroidInjector {
-            if (it is DanaRS_Packet_Basal_Get_Profile_Basal_Rate) {
-                it.aapsLogger = aapsLogger
-                it.danaPump = danaPump
-            }
-        }
-    }
-
-    @Test fun runTest() {
-        val testPacket = DanaRS_Packet_Basal_Get_Profile_Basal_Rate(packetInjector, 1)
-        // test if pumpProfile array is set right
-        val basal01 = DanaRS_Packet.byteArrayToInt(DanaRS_Packet(packetInjector).getBytes(createArray(50, 1.toByte()), 2, 2)) / 100.0
-        val basal05 = DanaRS_Packet.byteArrayToInt(DanaRS_Packet(packetInjector).getBytes(createArray(50, 5.toByte()), 2, 2)) / 100.0
-        val basal12 = DanaRS_Packet.byteArrayToInt(DanaRS_Packet(packetInjector).getBytes(createArray(50, 12.toByte()), 2, 2)) / 100.0
-        // basal rate > 1U/hr
-        val basal120 = DanaRS_Packet.byteArrayToInt(DanaRS_Packet(packetInjector).getBytes(createArray(50, 120.toByte()), 2, 2)) / 100.0
-        val params = testPacket.requestParams
-        assertEquals(1.toByte(), params[0])
-        testPacket.handleMessage(createArray(50, 0.toByte()))
-        assertEquals(0.0, danaPump.pumpProfiles!![1][1], 0.0)
-        testPacket.handleMessage(createArray(50, 1.toByte()))
-        assertEquals(basal01, danaPump.pumpProfiles!![1][2], 0.0)
-        testPacket.handleMessage(createArray(50, 5.toByte()))
-        assertEquals(basal05, danaPump.pumpProfiles!![1][1], 0.0)
-        testPacket.handleMessage(createArray(50, 12.toByte()))
-        assertEquals(basal12, danaPump.pumpProfiles!![1][1], 0.0)
-        testPacket.handleMessage(createArray(50, 120.toByte()))
-        assertEquals(basal120, danaPump.pumpProfiles!![1][1], 0.0)
-        assertEquals("BASAL__GET_PROFILE_BASAL_RATE", testPacket.friendlyName)
-    }
-}
\ No newline at end of file
diff --git a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketBasalGetProfileNumberTest.kt b/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketBasalGetProfileNumberTest.kt
index 9847d2f75c..7af25076a8 100644
--- a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketBasalGetProfileNumberTest.kt
+++ b/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketBasalGetProfileNumberTest.kt
@@ -5,15 +5,12 @@ import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.danars.DanaRSTestBase
 import org.junit.Assert
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.powermock.modules.junit4.PowerMockRunner
 
-@RunWith(PowerMockRunner::class)
 class DanaRsPacketBasalGetProfileNumberTest : DanaRSTestBase() {
 
     private val packetInjector = HasAndroidInjector {
         AndroidInjector {
-            if (it is DanaRS_Packet_Basal_Get_Profile_Number) {
+            if (it is DanaRSPacketBasalGetProfileNumber) {
                 it.aapsLogger = aapsLogger
                 it.danaPump = danaPump
             }
@@ -21,7 +18,7 @@ class DanaRsPacketBasalGetProfileNumberTest : DanaRSTestBase() {
     }
 
     @Test fun runTest() {
-        val packet = DanaRS_Packet_Basal_Get_Profile_Number(packetInjector)
+        val packet = DanaRSPacketBasalGetProfileNumber(packetInjector)
 
         val array = ByteArray(100)
         putByteToArray(array, 0, 1.toByte())
diff --git a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketBasalGetTemporaryBasalStateTest.kt b/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketBasalGetTemporaryBasalStateTest.kt
deleted file mode 100644
index e29ed61b41..0000000000
--- a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketBasalGetTemporaryBasalStateTest.kt
+++ /dev/null
@@ -1,42 +0,0 @@
-package info.nightscout.androidaps.danars.comm
-
-import dagger.android.AndroidInjector
-import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.danars.DanaRSTestBase
-import org.junit.Assert
-import org.junit.Test
-import org.junit.runner.RunWith
-import org.powermock.modules.junit4.PowerMockRunner
-
-@RunWith(PowerMockRunner::class)
-class DanaRsPacketBasalGetTemporaryBasalStateTest : DanaRSTestBase() {
-
-    private val packetInjector = HasAndroidInjector {
-        AndroidInjector {
-            if (it is DanaRS_Packet) {
-                it.aapsLogger = aapsLogger
-                it.dateUtil = dateUtil
-            }
-            if (it is DanaRS_Packet_Basal_Get_Temporary_Basal_State) {
-                it.danaPump = danaPump
-            }
-        }
-    }
-
-    @Test fun runTest() {
-        val packet = DanaRS_Packet_Basal_Get_Temporary_Basal_State(packetInjector)
-        // test message decoding
-        val array = ByteArray(100)
-        putByteToArray(array, 0, 1.toByte())
-        putByteToArray(array, 1, 1.toByte())
-        putByteToArray(array, 2, 230.toByte())
-        putByteToArray(array, 3, 150.toByte())
-        putIntToArray(array, 4, 1)
-        packet.handleMessage(array)
-        Assert.assertTrue(packet.failed)
-        Assert.assertTrue(packet.isTempBasalInProgress)
-        Assert.assertEquals(300, packet.tempBasalPercent)
-        Assert.assertEquals(15 * 60, packet.tempBasalTotalSec)
-        Assert.assertEquals("BASAL__TEMPORARY_BASAL_STATE", packet.friendlyName)
-    }
-}
\ No newline at end of file
diff --git a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketBasalSetBasalRateTest.kt b/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketBasalSetBasalRateTest.kt
deleted file mode 100644
index 765b2f462a..0000000000
--- a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketBasalSetBasalRateTest.kt
+++ /dev/null
@@ -1,36 +0,0 @@
-package info.nightscout.androidaps.danars.comm
-
-import dagger.android.AndroidInjector
-import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.danars.DanaRSTestBase
-import org.junit.Assert
-import org.junit.Test
-import org.junit.runner.RunWith
-import org.powermock.modules.junit4.PowerMockRunner
-
-@RunWith(PowerMockRunner::class)
-class DanaRsPacketBasalSetBasalRateTest : DanaRSTestBase() {
-
-    private val packetInjector = HasAndroidInjector {
-        AndroidInjector {
-            if (it is DanaRS_Packet_Basal_Set_Basal_Rate) {
-                it.aapsLogger = aapsLogger
-            }
-        }
-    }
-
-    @Test fun runTest() {
-        // test message decoding
-        val packet = DanaRS_Packet_Basal_Set_Basal_Rate(packetInjector, createArray(24, 5.0))
-        val requested = packet.requestParams
-        var lookingFor = (5 * 100 and 0xff).toByte()
-        Assert.assertEquals(lookingFor, requested[24])
-        lookingFor = (500 ushr 8 and 0xff).toByte()
-        Assert.assertEquals(lookingFor, requested[25])
-        packet.handleMessage(createArray(3, 0.toByte()))
-        Assert.assertEquals(false, packet.failed)
-        packet.handleMessage(createArray(3, 1.toByte()))
-        Assert.assertEquals(true, packet.failed)
-        Assert.assertEquals("BASAL__SET_BASAL_RATE", packet.friendlyName)
-    }
-}
\ No newline at end of file
diff --git a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketBasalSetCancelTemporaryBasalTest.kt b/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketBasalSetCancelTemporaryBasalTest.kt
index 442fed73cf..febbbe50eb 100644
--- a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketBasalSetCancelTemporaryBasalTest.kt
+++ b/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketBasalSetCancelTemporaryBasalTest.kt
@@ -5,22 +5,19 @@ import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.danars.DanaRSTestBase
 import org.junit.Assert
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.powermock.modules.junit4.PowerMockRunner
 
-@RunWith(PowerMockRunner::class)
 class DanaRsPacketBasalSetCancelTemporaryBasalTest : DanaRSTestBase() {
 
     private val packetInjector = HasAndroidInjector {
         AndroidInjector {
-            if (it is DanaRS_Packet_Basal_Set_Cancel_Temporary_Basal) {
+            if (it is DanaRSPacketBasalSetCancelTemporaryBasal) {
                 it.aapsLogger = aapsLogger
             }
         }
     }
 
     @Test fun runTest() {
-        val packet = DanaRS_Packet_Basal_Set_Cancel_Temporary_Basal(packetInjector)
+        val packet = DanaRSPacketBasalSetCancelTemporaryBasal(packetInjector)
         // test message decoding
         packet.handleMessage(createArray(3, 0.toByte()))
         Assert.assertEquals(false, packet.failed)
diff --git a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketBasalSetProfileBasalRateTest.kt b/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketBasalSetProfileBasalRateTest.kt
index 8c45544aa1..95f75223bd 100644
--- a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketBasalSetProfileBasalRateTest.kt
+++ b/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketBasalSetProfileBasalRateTest.kt
@@ -5,24 +5,21 @@ import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.danars.DanaRSTestBase
 import org.junit.Assert
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.powermock.modules.junit4.PowerMockRunner
 
-@RunWith(PowerMockRunner::class)
 class DanaRsPacketBasalSetProfileBasalRateTest : DanaRSTestBase() {
 
     private val packetInjector = HasAndroidInjector {
         AndroidInjector {
-            if (it is DanaRS_Packet_Basal_Set_Profile_Basal_Rate) {
+            if (it is DanaRSPacketBasalSetProfileBasalRate) {
                 it.aapsLogger = aapsLogger
             }
         }
     }
 
     @Test fun runTest() {
-        val packet = DanaRS_Packet_Basal_Set_Profile_Basal_Rate(packetInjector, 1, createArray(24, 1.0))
+        val packet = DanaRSPacketBasalSetProfileBasalRate(packetInjector, 1, createArray(24, 1.0))
         // test params
-        val testParams = packet.requestParams
+        val testParams = packet.getRequestParams()
         // is profile 1
         Assert.assertEquals(1.toByte(), testParams[0])
         // is value 100
diff --git a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketBasalSetProfileNumberTest.kt b/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketBasalSetProfileNumberTest.kt
index d7f1135fb7..814af18eab 100644
--- a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketBasalSetProfileNumberTest.kt
+++ b/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketBasalSetProfileNumberTest.kt
@@ -5,24 +5,21 @@ import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.danars.DanaRSTestBase
 import org.junit.Assert
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.powermock.modules.junit4.PowerMockRunner
 
-@RunWith(PowerMockRunner::class)
 class DanaRsPacketBasalSetProfileNumberTest : DanaRSTestBase() {
 
     private val packetInjector = HasAndroidInjector {
         AndroidInjector {
-            if (it is DanaRS_Packet_Basal_Set_Profile_Number) {
+            if (it is DanaRSPacketBasalSetProfileNumber) {
                 it.aapsLogger = aapsLogger
             }
         }
     }
 
     @Test fun runTest() {
-        val packet = DanaRS_Packet_Basal_Set_Profile_Number(packetInjector, 1)
+        val packet = DanaRSPacketBasalSetProfileNumber(packetInjector, 1)
         // test params
-        val testParams = packet.requestParams
+        val testParams = packet.getRequestParams()
         // is profile 1
         Assert.assertEquals(1.toByte(), testParams[0])
         // test message decoding
diff --git a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketBasalSetSuspendOffTest.kt b/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketBasalSetSuspendOffTest.kt
index 2ebd63d093..f177c68414 100644
--- a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketBasalSetSuspendOffTest.kt
+++ b/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketBasalSetSuspendOffTest.kt
@@ -5,22 +5,19 @@ import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.danars.DanaRSTestBase
 import org.junit.Assert
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.powermock.modules.junit4.PowerMockRunner
 
-@RunWith(PowerMockRunner::class)
 class DanaRsPacketBasalSetSuspendOffTest : DanaRSTestBase() {
 
     private val packetInjector = HasAndroidInjector {
         AndroidInjector {
-            if (it is DanaRS_Packet_Basal_Set_Suspend_Off) {
+            if (it is DanaRSPacketBasalSetSuspendOff) {
                 it.aapsLogger = aapsLogger
             }
         }
     }
 
     @Test fun runTest() {
-        val packet = DanaRS_Packet_Basal_Set_Suspend_Off(packetInjector)
+        val packet = DanaRSPacketBasalSetSuspendOff(packetInjector)
         // test message decoding
         packet.handleMessage(byteArrayOf(0.toByte(), 0.toByte(), 0.toByte()))
         Assert.assertEquals(false, packet.failed)
diff --git a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketBasalSetSuspendOnTest.kt b/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketBasalSetSuspendOnTest.kt
index 7b31bbbd85..5fa84275c2 100644
--- a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketBasalSetSuspendOnTest.kt
+++ b/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketBasalSetSuspendOnTest.kt
@@ -5,22 +5,19 @@ import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.danars.DanaRSTestBase
 import org.junit.Assert
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.powermock.modules.junit4.PowerMockRunner
 
-@RunWith(PowerMockRunner::class)
 class DanaRsPacketBasalSetSuspendOnTest : DanaRSTestBase() {
 
     private val packetInjector = HasAndroidInjector {
         AndroidInjector {
-            if (it is DanaRS_Packet_Basal_Set_Suspend_On) {
+            if (it is DanaRSPacketBasalSetSuspendOn) {
                 it.aapsLogger = aapsLogger
             }
         }
     }
 
     @Test fun runTest() {
-        val packet = DanaRS_Packet_Basal_Set_Suspend_On(packetInjector)
+        val packet = DanaRSPacketBasalSetSuspendOn(packetInjector)
         // test message decoding
         packet.handleMessage(byteArrayOf(0.toByte(), 0.toByte(), 0.toByte()))
         Assert.assertEquals(false, packet.failed)
diff --git a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketBolusGetBolusOptionTest.kt b/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketBolusGetBolusOptionTest.kt
index a28bfaa32e..76dec68c50 100644
--- a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketBolusGetBolusOptionTest.kt
+++ b/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketBolusGetBolusOptionTest.kt
@@ -2,24 +2,15 @@ package info.nightscout.androidaps.danars.comm
 
 import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.danars.DanaRSTestBase
 import org.junit.Assert
-import org.junit.Before
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.mockito.ArgumentMatchers.anyInt
-import org.mockito.Mockito.`when`
-import org.powermock.core.classloader.annotations.PrepareForTest
-import org.powermock.modules.junit4.PowerMockRunner
 
-@RunWith(PowerMockRunner::class)
-@PrepareForTest(RxBusWrapper::class)
 class DanaRsPacketBolusGetBolusOptionTest : DanaRSTestBase() {
 
     private val packetInjector = HasAndroidInjector {
         AndroidInjector {
-            if (it is DanaRS_Packet_Bolus_Get_Bolus_Option) {
+            if (it is DanaRSPacketBolusGetBolusOption) {
                 it.aapsLogger = aapsLogger
                 it.rxBus = rxBus
                 it.resourceHelper = resourceHelper
@@ -29,7 +20,7 @@ class DanaRsPacketBolusGetBolusOptionTest : DanaRSTestBase() {
     }
 
     @Test fun runTest() {
-        val packet = DanaRS_Packet_Bolus_Get_Bolus_Option(packetInjector)
+        val packet = DanaRSPacketBolusGetBolusOption(packetInjector)
         // test message decoding
         //if dataArray is 1 pump.isExtendedBolusEnabled should be true
         packet.handleMessage(createArray(21, 1.toByte()))
diff --git a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketBolusGetCalculationInformationTest.kt b/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketBolusGetCalculationInformationTest.kt
index a8b887ba45..3705d0d389 100644
--- a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketBolusGetCalculationInformationTest.kt
+++ b/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketBolusGetCalculationInformationTest.kt
@@ -5,15 +5,12 @@ import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.danars.DanaRSTestBase
 import org.junit.Assert
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.powermock.modules.junit4.PowerMockRunner
 
-@RunWith(PowerMockRunner::class)
 class DanaRsPacketBolusGetCalculationInformationTest : DanaRSTestBase() {
 
     private val packetInjector = HasAndroidInjector {
         AndroidInjector {
-            if (it is DanaRS_Packet_Bolus_Get_Calculation_Information) {
+            if (it is DanaRSPacketBolusGetCalculationInformation) {
                 it.aapsLogger = aapsLogger
                 it.danaPump = danaPump
             }
@@ -21,8 +18,8 @@ class DanaRsPacketBolusGetCalculationInformationTest : DanaRSTestBase() {
     }
 
     @Test fun runTest() {
-        val packet = DanaRS_Packet_Bolus_Get_Calculation_Information(packetInjector)
-        Assert.assertEquals(null, packet.requestParams)
+        val packet = DanaRSPacketBolusGetCalculationInformation(packetInjector)
+        Assert.assertEquals(0, packet.getRequestParams().size)
         // test message decoding
         packet.handleMessage(createArray(24, 0.toByte()))
         Assert.assertEquals(false, packet.failed)
diff --git a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketBolusGetCarbohydrateCalculationInformationTest.kt b/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketBolusGetCarbohydrateCalculationInformationTest.kt
deleted file mode 100644
index 9a5627c42c..0000000000
--- a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketBolusGetCarbohydrateCalculationInformationTest.kt
+++ /dev/null
@@ -1,33 +0,0 @@
-package info.nightscout.androidaps.danars.comm
-
-import dagger.android.AndroidInjector
-import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.danars.DanaRSTestBase
-import org.junit.Assert
-import org.junit.Test
-import org.junit.runner.RunWith
-import org.powermock.modules.junit4.PowerMockRunner
-
-@RunWith(PowerMockRunner::class)
-class DanaRsPacketBolusGetCarbohydrateCalculationInformationTest : DanaRSTestBase() {
-
-    private val packetInjector = HasAndroidInjector {
-        AndroidInjector {
-            if (it is DanaRS_Packet_Bolus_Get_Carbohydrate_Calculation_Information) {
-                it.aapsLogger = aapsLogger
-                it.danaPump = danaPump
-            }
-        }
-    }
-
-    @Test fun runTest() {
-        val packet = DanaRS_Packet_Bolus_Get_Carbohydrate_Calculation_Information(packetInjector)
-        Assert.assertEquals(null, packet.requestParams)
-        // test message decoding
-        packet.handleMessage(createArray(24, 0.toByte()))
-        Assert.assertEquals(false, packet.failed)
-        packet.handleMessage(createArray(24, 1.toByte()))
-        Assert.assertEquals(true, packet.failed)
-        Assert.assertEquals("BOLUS__GET_CARBOHYDRATE_CALCULATION_INFORMATION", packet.friendlyName)
-    }
-}
\ No newline at end of file
diff --git a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketBolusGetCirCfArrayTest.kt b/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketBolusGetCirCfArrayTest.kt
index b56e1a5426..4c9cd8754e 100644
--- a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketBolusGetCirCfArrayTest.kt
+++ b/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketBolusGetCirCfArrayTest.kt
@@ -6,15 +6,12 @@ import info.nightscout.androidaps.dana.DanaPump
 import info.nightscout.androidaps.danars.DanaRSTestBase
 import org.junit.Assert
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.powermock.modules.junit4.PowerMockRunner
 
-@RunWith(PowerMockRunner::class)
 class DanaRsPacketBolusGetCirCfArrayTest : DanaRSTestBase() {
 
     private val packetInjector = HasAndroidInjector {
         AndroidInjector {
-            if (it is DanaRS_Packet_Bolus_Get_CIR_CF_Array) {
+            if (it is DanaRSPacketBolusGetCIRCFArray) {
                 it.aapsLogger = aapsLogger
                 it.danaPump = danaPump
             }
@@ -22,9 +19,9 @@ class DanaRsPacketBolusGetCirCfArrayTest : DanaRSTestBase() {
     }
 
     @Test fun runTest() {
-        val packet = DanaRS_Packet_Bolus_Get_CIR_CF_Array(packetInjector)
+        val packet = DanaRSPacketBolusGetCIRCFArray(packetInjector)
         // test params
-        Assert.assertEquals(null, packet.requestParams)
+        Assert.assertEquals(0, packet.getRequestParams().size)
         // test message decoding
         packet.handleMessage(createArray(34, 0.toByte()))
         // are pump units MG/DL ???
diff --git a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketBolusGetDualBolusTest.kt b/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketBolusGetDualBolusTest.kt
deleted file mode 100644
index 9de5e53cb8..0000000000
--- a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketBolusGetDualBolusTest.kt
+++ /dev/null
@@ -1,40 +0,0 @@
-package info.nightscout.androidaps.danars.comm
-
-import dagger.android.AndroidInjector
-import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.danars.DanaRSTestBase
-import org.junit.Assert
-import org.junit.Test
-import org.junit.runner.RunWith
-import org.powermock.modules.junit4.PowerMockRunner
-
-@RunWith(PowerMockRunner::class)
-class DanaRsPacketBolusGetDualBolusTest : DanaRSTestBase() {
-
-    private val packetInjector = HasAndroidInjector {
-        AndroidInjector {
-            if (it is DanaRS_Packet_Bolus_Get_Dual_Bolus) {
-                it.aapsLogger = aapsLogger
-                it.danaPump = danaPump
-            }
-        }
-    }
-
-    @Test fun runTest() {
-        val packet = DanaRS_Packet_Bolus_Get_Dual_Bolus(packetInjector)
-        // test params
-        Assert.assertEquals(null, packet.requestParams)
-
-        val array = ByteArray(20)
-        putByteToArray(array, 0, 1)
-        putIntToArray(array, 1, (1.0 * 100).toInt())
-        putIntToArray(array, 3, (0.55 * 100).toInt())
-        putIntToArray(array, 5, (40.0 * 100).toInt())
-        packet.handleMessage(array)
-        Assert.assertTrue(packet.failed)
-        Assert.assertEquals(1.0, danaPump.bolusStep, 0.0)
-        Assert.assertEquals(40.0, danaPump.maxBolus, 0.0)
-
-        Assert.assertEquals("BOLUS__GET_DUAL_BOLUS", packet.friendlyName)
-    }
-}
\ No newline at end of file
diff --git a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketBolusGetExtendedBolusStateTest.kt b/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketBolusGetExtendedBolusStateTest.kt
deleted file mode 100644
index 759b35e527..0000000000
--- a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketBolusGetExtendedBolusStateTest.kt
+++ /dev/null
@@ -1,38 +0,0 @@
-package info.nightscout.androidaps.danars.comm
-
-import dagger.android.AndroidInjector
-import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.danars.DanaRSTestBase
-import org.junit.Assert
-import org.junit.Test
-import org.junit.runner.RunWith
-import org.powermock.modules.junit4.PowerMockRunner
-
-@RunWith(PowerMockRunner::class)
-class DanaRsPacketBolusGetExtendedBolusStateTest : DanaRSTestBase() {
-
-    private val packetInjector = HasAndroidInjector {
-        AndroidInjector {
-            if (it is DanaRS_Packet_Bolus_Get_Extended_Bolus_State) {
-                it.aapsLogger = aapsLogger
-                it.danaPump = danaPump
-            }
-        }
-    }
-
-    @Test fun runTest() {
-        val packet = DanaRS_Packet_Bolus_Get_Extended_Bolus_State(packetInjector)
-        // test params
-        Assert.assertEquals(null, packet.requestParams)
-        // test message decoding
-        var testValue = 0.0
-        packet.handleMessage(createArray(11, testValue.toInt().toByte()))
-        Assert.assertEquals(testValue != 0.0, packet.failed)
-        testValue = 1.0
-        packet.handleMessage(createArray(11, testValue.toInt().toByte()))
-        // is extended bolus in progress
-        Assert.assertEquals(testValue == 1.0, packet.isExtendedInProgress)
-        Assert.assertEquals(testValue != 0.0, packet.failed)
-        Assert.assertEquals("BOLUS__GET_EXTENDED_BOLUS_STATE", packet.friendlyName)
-    }
-}
\ No newline at end of file
diff --git a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketBolusGetExtendedBolusTest.kt b/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketBolusGetExtendedBolusTest.kt
deleted file mode 100644
index 4da5e4ea6c..0000000000
--- a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketBolusGetExtendedBolusTest.kt
+++ /dev/null
@@ -1,38 +0,0 @@
-package info.nightscout.androidaps.danars.comm
-
-import dagger.android.AndroidInjector
-import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.danars.DanaRSTestBase
-import org.junit.Assert
-import org.junit.Test
-import org.junit.runner.RunWith
-import org.powermock.modules.junit4.PowerMockRunner
-
-@RunWith(PowerMockRunner::class)
-class DanaRsPacketBolusGetExtendedBolusTest : DanaRSTestBase() {
-
-    private val packetInjector = HasAndroidInjector {
-        AndroidInjector {
-            if (it is DanaRS_Packet_Bolus_Get_Extended_Bolus) {
-                it.aapsLogger = aapsLogger
-                it.danaPump = danaPump
-            }
-        }
-    }
-
-    @Test fun runTest() {
-        val packet = DanaRS_Packet_Bolus_Get_Extended_Bolus(packetInjector)
-        // test params
-        Assert.assertEquals(null, packet.requestParams)
-        // test message decoding
-        var testValue = 0.0
-        packet.handleMessage(createArray(10, testValue.toInt().toByte()))
-        Assert.assertEquals(testValue != 0.0, packet.failed)
-        testValue = 1.0
-        packet.handleMessage(createArray(10, testValue.toInt().toByte()))
-        // is pump.bolusStep set to 1
-        Assert.assertEquals(testValue / 100.0, danaPump.bolusStep, 0.0)
-        Assert.assertEquals(testValue != 0.0, packet.failed)
-        Assert.assertEquals("BOLUS__GET_EXTENDED_BOLUS", packet.friendlyName)
-    }
-}
\ No newline at end of file
diff --git a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketBolusGetExtendedMenuOptionStateTest.kt b/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketBolusGetExtendedMenuOptionStateTest.kt
deleted file mode 100644
index 50921c5ea5..0000000000
--- a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketBolusGetExtendedMenuOptionStateTest.kt
+++ /dev/null
@@ -1,35 +0,0 @@
-package info.nightscout.androidaps.danars.comm
-
-import dagger.android.AndroidInjector
-import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.danars.DanaRSTestBase
-import org.junit.Assert
-import org.junit.Test
-import org.junit.runner.RunWith
-import org.powermock.modules.junit4.PowerMockRunner
-
-@RunWith(PowerMockRunner::class)
-class DanaRsPacketBolusGetExtendedMenuOptionStateTest : DanaRSTestBase() {
-
-    private val packetInjector = HasAndroidInjector {
-        AndroidInjector {
-            if (it is DanaRS_Packet_Bolus_Get_Extended_Menu_Option_State) {
-                it.aapsLogger = aapsLogger
-                it.danaPump = danaPump
-            }
-        }
-    }
-
-    @Test fun runTest() {
-        val packet = DanaRS_Packet_Bolus_Get_Extended_Menu_Option_State(packetInjector)
-        Assert.assertEquals(null, packet.requestParams)
-        // test message decoding
-        packet.handleMessage(createArray(34, 0.toByte()))
-        // isExtendedInProgress should be false
-        Assert.assertEquals(false, packet.isExtendedInProgress)
-        //        assertEquals(false, packet.failed);
-        packet.handleMessage(createArray(34, 1.toByte()))
-        Assert.assertEquals(true, packet.isExtendedInProgress)
-        Assert.assertEquals("BOLUS__GET_EXTENDED_MENU_OPTION_STATE", packet.friendlyName)
-    }
-}
\ No newline at end of file
diff --git a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketBolusGetInitialBolusTest.kt b/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketBolusGetInitialBolusTest.kt
deleted file mode 100644
index 883205431c..0000000000
--- a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketBolusGetInitialBolusTest.kt
+++ /dev/null
@@ -1,33 +0,0 @@
-package info.nightscout.androidaps.danars.comm
-
-import dagger.android.AndroidInjector
-import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.danars.DanaRSTestBase
-import org.junit.Assert
-import org.junit.Test
-import org.junit.runner.RunWith
-import org.powermock.modules.junit4.PowerMockRunner
-
-@RunWith(PowerMockRunner::class)
-class DanaRsPacketBolusGetInitialBolusTest : DanaRSTestBase() {
-
-    private val packetInjector = HasAndroidInjector {
-        AndroidInjector {
-            if (it is DanaRS_Packet_Bolus_Get_Initial_Bolus) {
-                it.aapsLogger = aapsLogger
-            }
-        }
-    }
-
-    @Test fun runTest() {
-        val packet = DanaRS_Packet_Bolus_Get_Initial_Bolus(packetInjector)
-        Assert.assertEquals(null, packet.requestParams)
-        // test message decoding
-        packet.handleMessage(createArray(34, 0.toByte()))
-        // should fail only if all the initial boluses are 0
-        Assert.assertEquals(false, !packet.failed)
-        packet.handleMessage(createArray(34, 1.toByte()))
-        Assert.assertEquals(true, !packet.failed)
-        Assert.assertEquals("BOLUS__GET_BOLUS_RATE", packet.friendlyName)
-    }
-}
\ No newline at end of file
diff --git a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketBolusGetStepBolusInformationTest.kt b/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketBolusGetStepBolusInformationTest.kt
index b1e4721db8..a244998923 100644
--- a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketBolusGetStepBolusInformationTest.kt
+++ b/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketBolusGetStepBolusInformationTest.kt
@@ -5,27 +5,24 @@ import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.danars.DanaRSTestBase
 import org.junit.Assert
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.powermock.modules.junit4.PowerMockRunner
 import java.util.*
 
-@RunWith(PowerMockRunner::class)
 class DanaRsPacketBolusGetStepBolusInformationTest : DanaRSTestBase() {
 
     private val packetInjector = HasAndroidInjector {
         AndroidInjector {
-            if (it is DanaRS_Packet) {
+            if (it is DanaRSPacket) {
                 it.aapsLogger = aapsLogger
                 it.dateUtil = dateUtil
             }
-            if (it is DanaRS_Packet_Bolus_Get_Step_Bolus_Information) {
+            if (it is DanaRSPacketBolusGetStepBolusInformation) {
                 it.danaPump = danaPump
             }
         }
     }
 
     @Test fun runTest() {
-        val packet = DanaRS_Packet_Bolus_Get_Step_Bolus_Information(packetInjector)
+        val packet = DanaRSPacketBolusGetStepBolusInformation(packetInjector)
 
         val array = createArray(13, 0.toByte()) // 11 + 2
         putByteToArray(array, 0, 2) // error 2
diff --git a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketBolusSetBolusOptionTest.kt b/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketBolusSetBolusOptionTest.kt
index 450e0d17f8..703ff208bd 100644
--- a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketBolusSetBolusOptionTest.kt
+++ b/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketBolusSetBolusOptionTest.kt
@@ -5,24 +5,21 @@ import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.danars.DanaRSTestBase
 import org.junit.Assert
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.powermock.modules.junit4.PowerMockRunner
 
-@RunWith(PowerMockRunner::class)
 class DanaRsPacketBolusSetBolusOptionTest : DanaRSTestBase() {
 
     private val packetInjector = HasAndroidInjector {
         AndroidInjector {
-            if (it is DanaRS_Packet_Bolus_Set_Bolus_Option) {
+            if (it is DanaRSPacketBolusSetBolusOption) {
                 it.aapsLogger = aapsLogger
             }
         }
     }
 
     @Test fun runTest() {
-        val packet = DanaRS_Packet_Bolus_Set_Bolus_Option(packetInjector, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0)
+        val packet = DanaRSPacketBolusSetBolusOption(packetInjector, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0)
         // test params
-        val testParams = packet.requestParams
+        val testParams = packet.getRequestParams()
         Assert.assertEquals(0.toByte(), testParams[0])
         Assert.assertEquals(0.toByte(), testParams[18])
         // test message decoding
diff --git a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketBolusSetCirCfArrayTest.kt b/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketBolusSetCirCfArrayTest.kt
deleted file mode 100644
index 2987a11fb0..0000000000
--- a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketBolusSetCirCfArrayTest.kt
+++ /dev/null
@@ -1,38 +0,0 @@
-package info.nightscout.androidaps.danars.comm
-
-import dagger.android.AndroidInjector
-import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.danars.DanaRSTestBase
-import org.junit.Assert
-import org.junit.Test
-import org.junit.runner.RunWith
-import org.powermock.modules.junit4.PowerMockRunner
-
-@RunWith(PowerMockRunner::class)
-class DanaRsPacketBolusSetCirCfArrayTest : DanaRSTestBase() {
-
-    private val packetInjector = HasAndroidInjector {
-        AndroidInjector {
-            if (it is DanaRS_Packet_Bolus_Set_CIR_CF_Array) {
-                it.aapsLogger = aapsLogger
-            }
-        }
-    }
-
-    @Test fun runTest() {
-        val packet = DanaRS_Packet_Bolus_Set_CIR_CF_Array(packetInjector, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0)
-        // test params
-        val testParams = packet.requestParams
-        Assert.assertEquals(0.toByte(), testParams[0])
-        Assert.assertEquals(0.toByte(), testParams[18])
-        // test message decoding
-        packet.handleMessage(createArray(34, 0.toByte()))
-        //        DanaRPump testPump = DanaRPump.getInstance();
-        Assert.assertEquals(false, packet.failed)
-        packet.handleMessage(createArray(34, 1.toByte()))
-        //        int valueRequested = (((byte) 1 & 0x000000FF) << 8) + (((byte) 1) & 0x000000FF);
-//        assertEquals(valueRequested /100d, testPump.lastBolusAmount, 0);
-        Assert.assertEquals(true, packet.failed)
-        Assert.assertEquals("BOLUS__SET_CIR_CF_ARRAY", packet.friendlyName)
-    }
-}
\ No newline at end of file
diff --git a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketBolusSetDualBolusTest.kt b/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketBolusSetDualBolusTest.kt
deleted file mode 100644
index bd15873509..0000000000
--- a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketBolusSetDualBolusTest.kt
+++ /dev/null
@@ -1,38 +0,0 @@
-package info.nightscout.androidaps.danars.comm
-
-import dagger.android.AndroidInjector
-import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.danars.DanaRSTestBase
-import org.junit.Assert
-import org.junit.Test
-import org.junit.runner.RunWith
-import org.powermock.modules.junit4.PowerMockRunner
-
-@RunWith(PowerMockRunner::class)
-class DanaRsPacketBolusSetDualBolusTest : DanaRSTestBase() {
-
-    private val packetInjector = HasAndroidInjector {
-        AndroidInjector {
-            if (it is DanaRS_Packet_Bolus_Set_Dual_Bolus) {
-                it.aapsLogger = aapsLogger
-            }
-        }
-    }
-
-    @Test fun runTest() {
-        val packet = DanaRS_Packet_Bolus_Set_Dual_Bolus(packetInjector, 0.0, 0.0, 1)
-        // test params
-        val testParams = packet.requestParams
-        Assert.assertEquals(0.toByte(), testParams[0])
-        Assert.assertEquals(1.toByte(), testParams[4])
-        // test message decoding
-        packet.handleMessage(createArray(34, 0.toByte()))
-        //        DanaRPump testPump = DanaRPump.getInstance();
-        Assert.assertEquals(false, packet.failed)
-        packet.handleMessage(createArray(34, 1.toByte()))
-        //        int valueRequested = (((byte) 1 & 0x000000FF) << 8) + (((byte) 1) & 0x000000FF);
-//        assertEquals(valueRequested /100d, testPump.lastBolusAmount, 0);
-        Assert.assertEquals(true, packet.failed)
-        Assert.assertEquals("BOLUS__SET_DUAL_BOLUS", packet.friendlyName)
-    }
-}
\ No newline at end of file
diff --git a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketBolusSetExtendedBolusCancelTest.kt b/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketBolusSetExtendedBolusCancelTest.kt
index 02893dc262..1b6e49d08e 100644
--- a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketBolusSetExtendedBolusCancelTest.kt
+++ b/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketBolusSetExtendedBolusCancelTest.kt
@@ -5,23 +5,20 @@ import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.danars.DanaRSTestBase
 import org.junit.Assert
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.powermock.modules.junit4.PowerMockRunner
 
-@RunWith(PowerMockRunner::class)
 class DanaRsPacketBolusSetExtendedBolusCancelTest : DanaRSTestBase() {
 
     private val packetInjector = HasAndroidInjector {
         AndroidInjector {
-            if (it is DanaRS_Packet_Bolus_Set_Extended_Bolus_Cancel) {
+            if (it is DanaRSPacketBolusSetExtendedBolusCancel) {
                 it.aapsLogger = aapsLogger
             }
         }
     }
 
     @Test fun runTest() {
-        val packet = DanaRS_Packet_Bolus_Set_Extended_Bolus_Cancel(packetInjector)
-        Assert.assertEquals(null, packet.requestParams)
+        val packet = DanaRSPacketBolusSetExtendedBolusCancel(packetInjector)
+        Assert.assertEquals(0, packet.getRequestParams().size)
         // test message decoding
         packet.handleMessage(createArray(34, 0.toByte()))
         Assert.assertEquals(false, packet.failed)
diff --git a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketBolusSetExtendedBolusTest.kt b/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketBolusSetExtendedBolusTest.kt
index 055bbf3582..28f60b33be 100644
--- a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketBolusSetExtendedBolusTest.kt
+++ b/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketBolusSetExtendedBolusTest.kt
@@ -5,24 +5,21 @@ import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.danars.DanaRSTestBase
 import org.junit.Assert
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.powermock.modules.junit4.PowerMockRunner
 
-@RunWith(PowerMockRunner::class)
 class DanaRsPacketBolusSetExtendedBolusTest : DanaRSTestBase() {
 
     private val packetInjector = HasAndroidInjector {
         AndroidInjector {
-            if (it is DanaRS_Packet_Bolus_Set_Extended_Bolus) {
+            if (it is DanaRSPacketBolusSetExtendedBolus) {
                 it.aapsLogger = aapsLogger
             }
         }
     }
 
     @Test fun runTest() {
-        val packet = DanaRS_Packet_Bolus_Set_Extended_Bolus(packetInjector, 1.0, 1)
+        val packet = DanaRSPacketBolusSetExtendedBolus(packetInjector, 1.0, 1)
         // test params
-        val testparams = packet.requestParams
+        val testparams = packet.getRequestParams()
         Assert.assertEquals(100.toByte(), testparams[0])
         Assert.assertEquals(1.toByte(), testparams[2])
         // test message decoding
diff --git a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketBolusSetInitialBolusTest.kt b/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketBolusSetInitialBolusTest.kt
deleted file mode 100644
index f3510221ff..0000000000
--- a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketBolusSetInitialBolusTest.kt
+++ /dev/null
@@ -1,35 +0,0 @@
-package info.nightscout.androidaps.danars.comm
-
-import dagger.android.AndroidInjector
-import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.danars.DanaRSTestBase
-import org.junit.Assert
-import org.junit.Test
-import org.junit.runner.RunWith
-import org.powermock.modules.junit4.PowerMockRunner
-
-@RunWith(PowerMockRunner::class)
-class DanaRsPacketBolusSetInitialBolusTest : DanaRSTestBase() {
-
-    private val packetInjector = HasAndroidInjector {
-        AndroidInjector {
-            if (it is DanaRS_Packet_Bolus_Set_Initial_Bolus) {
-                it.aapsLogger = aapsLogger
-            }
-        }
-    }
-
-    @Test fun runTest() {
-        val packet = DanaRS_Packet_Bolus_Set_Initial_Bolus(packetInjector, 0, 0, 0, 100)
-        // test params
-        val testParams = packet.requestParams
-        Assert.assertEquals(0.toByte(), testParams[0])
-        Assert.assertEquals(100.toByte(), testParams[6])
-        // test message decoding
-        packet.handleMessage(createArray(34, 0.toByte()))
-        Assert.assertEquals(false, packet.failed)
-        packet.handleMessage(createArray(34, 1.toByte()))
-        Assert.assertEquals(true, packet.failed)
-        Assert.assertEquals("BOLUS__SET_BOLUS_RATE", packet.friendlyName)
-    }
-}
\ No newline at end of file
diff --git a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketBolusSetStepBolusStartTest.kt b/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketBolusSetStepBolusStartTest.kt
index 224dd6fee2..c1a9ea46b5 100644
--- a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketBolusSetStepBolusStartTest.kt
+++ b/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketBolusSetStepBolusStartTest.kt
@@ -14,14 +14,9 @@ import info.nightscout.androidaps.plugins.pump.common.bolusInfo.TemporaryBasalSt
 import org.junit.Assert
 import org.junit.Before
 import org.junit.Test
-import org.junit.runner.RunWith
 import org.mockito.Mock
 import org.mockito.Mockito
-import org.powermock.core.classloader.annotations.PrepareForTest
-import org.powermock.modules.junit4.PowerMockRunner
 
-@RunWith(PowerMockRunner::class)
-@PrepareForTest(ConstraintChecker::class, DetailedBolusInfoStorage::class, TemporaryBasalStorage::class)
 class DanaRsPacketBolusSetStepBolusStartTest : DanaRSTestBase() {
 
     @Mock lateinit var constraintChecker: ConstraintChecker
@@ -35,7 +30,7 @@ class DanaRsPacketBolusSetStepBolusStartTest : DanaRSTestBase() {
 
     private val packetInjector = HasAndroidInjector {
         AndroidInjector {
-            if (it is DanaRS_Packet_Bolus_Set_Step_Bolus_Start) {
+            if (it is DanaRSPacketBolusSetStepBolusStart) {
                 it.aapsLogger = aapsLogger
                 it.danaPump = danaPump
                 it.constraintChecker = constraintChecker
@@ -44,9 +39,9 @@ class DanaRsPacketBolusSetStepBolusStartTest : DanaRSTestBase() {
     }
 
     @Test fun runTest() {
-        val packet = DanaRS_Packet_Bolus_Set_Step_Bolus_Start(packetInjector)
+        val packet = DanaRSPacketBolusSetStepBolusStart(packetInjector)
         // test params
-        val testParams = packet.requestParams
+        val testParams = packet.getRequestParams()
         Assert.assertEquals(0.toByte(), testParams[0])
         Assert.assertEquals(0.toByte(), testParams[2])
         // test message decoding
diff --git a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketBolusSetStepBolusStopTest.kt b/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketBolusSetStepBolusStopTest.kt
index 840f9c6b42..9ef433e555 100644
--- a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketBolusSetStepBolusStopTest.kt
+++ b/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketBolusSetStepBolusStopTest.kt
@@ -2,29 +2,22 @@ package info.nightscout.androidaps.danars.comm
 
 import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.danars.DanaRSPlugin
 import info.nightscout.androidaps.danars.DanaRSTestBase
 import info.nightscout.androidaps.interfaces.ActivePlugin
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.general.overview.events.EventOverviewBolusProgress
 import org.junit.Assert
 import org.junit.Test
-import org.junit.runner.RunWith
 import org.mockito.Mock
 import org.mockito.Mockito
 import org.mockito.Mockito.`when`
-import org.powermock.core.classloader.annotations.PrepareForTest
-import org.powermock.modules.junit4.PowerMockRunner
 
-@RunWith(PowerMockRunner::class)
-@PrepareForTest(RxBusWrapper::class, DanaRSPlugin::class)
 class DanaRsPacketBolusSetStepBolusStopTest : DanaRSTestBase() {
 
     @Mock lateinit var activePlugin: ActivePlugin
 
     private val packetInjector = HasAndroidInjector {
         AndroidInjector {
-            if (it is DanaRS_Packet_Bolus_Set_Step_Bolus_Stop) {
+            if (it is DanaRSPacketBolusSetStepBolusStop) {
                 it.aapsLogger = aapsLogger
                 it.rxBus = rxBus
                 it.resourceHelper = resourceHelper
@@ -37,7 +30,7 @@ class DanaRsPacketBolusSetStepBolusStopTest : DanaRSTestBase() {
         `when`(resourceHelper.gs(Mockito.anyInt())).thenReturn("SomeString")
 
         danaPump.bolusingTreatment = EventOverviewBolusProgress.Treatment(0.0, 0, true)
-        val testPacket = DanaRS_Packet_Bolus_Set_Step_Bolus_Stop(packetInjector)
+        val testPacket = DanaRSPacketBolusSetStepBolusStop(packetInjector)
         // test message decoding
         testPacket.handleMessage(byteArrayOf(0.toByte(), 0.toByte(), 0.toByte()))
         Assert.assertEquals(false, testPacket.failed)
diff --git a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketEtcKeepConnectionTest.kt b/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketEtcKeepConnectionTest.kt
index ecc02cc85b..972344d5be 100644
--- a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketEtcKeepConnectionTest.kt
+++ b/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketEtcKeepConnectionTest.kt
@@ -5,23 +5,20 @@ import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.danars.DanaRSTestBase
 import org.junit.Assert
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.powermock.modules.junit4.PowerMockRunner
 
-@RunWith(PowerMockRunner::class)
 class DanaRsPacketEtcKeepConnectionTest : DanaRSTestBase() {
 
     private val packetInjector = HasAndroidInjector {
         AndroidInjector {
-            if (it is DanaRS_Packet_Etc_Keep_Connection) {
+            if (it is DanaRSPacketEtcKeepConnection) {
                 it.aapsLogger = aapsLogger
             }
         }
     }
 
     @Test fun runTest() {
-        val packet = DanaRS_Packet_Etc_Keep_Connection(packetInjector)
-        Assert.assertEquals(null, packet.requestParams)
+        val packet = DanaRSPacketEtcKeepConnection(packetInjector)
+        Assert.assertEquals(0, packet.getRequestParams().size)
         // test message decoding
         packet.handleMessage(byteArrayOf(0.toByte(), 0.toByte(), 0.toByte()))
         Assert.assertEquals(false, packet.failed)
diff --git a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketEtcSetHistorySaveTest.kt b/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketEtcSetHistorySaveTest.kt
index a239281ad3..4daf32e231 100644
--- a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketEtcSetHistorySaveTest.kt
+++ b/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketEtcSetHistorySaveTest.kt
@@ -5,24 +5,21 @@ import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.danars.DanaRSTestBase
 import org.junit.Assert
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.powermock.modules.junit4.PowerMockRunner
 
-@RunWith(PowerMockRunner::class)
 class DanaRsPacketEtcSetHistorySaveTest : DanaRSTestBase() {
 
     private val packetInjector = HasAndroidInjector {
         AndroidInjector {
-            if (it is DanaRS_Packet_Etc_Set_History_Save) {
+            if (it is DanaRSPacketEtcSetHistorySave) {
                 it.aapsLogger = aapsLogger
             }
         }
     }
 
     @Test fun runTest() {
-        val packet = DanaRS_Packet_Etc_Set_History_Save(packetInjector, 0, 0, 0, 0, 0, 0, 0, 0, 2)
+        val packet = DanaRSPacketEtcSetHistorySave(packetInjector, 0, 0, 0, 0, 0, 0, 0, 0, 2)
         // test params
-        val testParams = packet.requestParams
+        val testParams = packet.getRequestParams()
         Assert.assertEquals(2.toByte(), testParams[8])
         Assert.assertEquals((2 ushr 8).toByte(), testParams[9])
         // test message decoding
diff --git a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketGeneralDeliveryStatusTest.kt b/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketGeneralDeliveryStatusTest.kt
deleted file mode 100644
index c1a758daee..0000000000
--- a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketGeneralDeliveryStatusTest.kt
+++ /dev/null
@@ -1,32 +0,0 @@
-package info.nightscout.androidaps.danars.comm
-
-import dagger.android.AndroidInjector
-import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.danars.DanaRSTestBase
-import org.junit.Assert
-import org.junit.Test
-import org.junit.runner.RunWith
-import org.powermock.modules.junit4.PowerMockRunner
-
-@RunWith(PowerMockRunner::class)
-class DanaRsPacketGeneralDeliveryStatusTest : DanaRSTestBase() {
-
-    private val packetInjector = HasAndroidInjector {
-        AndroidInjector {
-            if (it is DanaRS_Packet_General_Delivery_Status) {
-                it.aapsLogger = aapsLogger
-            }
-        }
-    }
-
-    @Test fun runTest() {
-        val packet = DanaRS_Packet_General_Delivery_Status(packetInjector)
-        Assert.assertEquals(null, packet.requestParams)
-        // test message decoding
-        packet.handleMessage(createArray(15, 0.toByte()))
-        Assert.assertEquals(false, packet.failed)
-        packet.handleMessage(createArray(15, 161.toByte()))
-        Assert.assertEquals(true, packet.failed)
-        Assert.assertEquals("REVIEW__DELIVERY_STATUS", packet.friendlyName)
-    }
-}
\ No newline at end of file
diff --git a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketGeneralGetMoreInformationTest.kt b/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketGeneralGetMoreInformationTest.kt
deleted file mode 100644
index 957553475f..0000000000
--- a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketGeneralGetMoreInformationTest.kt
+++ /dev/null
@@ -1,55 +0,0 @@
-package info.nightscout.androidaps.danars.comm
-
-import dagger.android.AndroidInjector
-import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.danars.DanaRSTestBase
-import org.junit.Assert
-import org.junit.Test
-import org.junit.runner.RunWith
-import org.powermock.modules.junit4.PowerMockRunner
-import java.util.*
-
-@RunWith(PowerMockRunner::class)
-class DanaRsPacketGeneralGetMoreInformationTest : DanaRSTestBase() {
-
-    private val packetInjector = HasAndroidInjector {
-        AndroidInjector {
-            if (it is DanaRS_Packet) {
-                it.aapsLogger = aapsLogger
-                it.dateUtil = dateUtil
-            }
-            if (it is DanaRS_Packet_General_Get_More_Information) {
-                it.danaPump = danaPump
-            }
-        }
-    }
-
-    @Test fun runTest() {
-        var packet = DanaRS_Packet_General_Get_More_Information(packetInjector)
-
-        packet.handleMessage(createArray(14, 0.toByte()))
-        Assert.assertTrue(packet.failed)
-
-        packet = DanaRS_Packet_General_Get_More_Information(packetInjector)
-        val array = createArray(15, 0.toByte()) // 13 + 2
-        putIntToArray(array, 0, 600) // iob 6
-        putIntToArray(array, 2, 1250) // daily units 12.5
-        putByteToArray(array, 4, 1) // is extended in progress
-        putIntToArray(array, 5, 150) // extended remaining minutes 150
-        putByteToArray(array, 9, 15) // hours 15
-        putByteToArray(array, 10, 25) // minutes 25
-        putIntToArray(array, 11, 170) // last bolus amount 1.70
-
-        packet.handleMessage(array)
-        Assert.assertFalse(packet.failed)
-        Assert.assertEquals(6.0, danaPump.iob, 0.01)
-        Assert.assertEquals(12.5, danaPump.dailyTotalUnits, 0.01)
-        val lastBolus = Calendar.getInstance()
-        lastBolus.timeInMillis = danaPump.lastBolusTime
-        Assert.assertEquals(15, lastBolus.get(Calendar.HOUR_OF_DAY))
-        Assert.assertEquals(25, lastBolus.get(Calendar.MINUTE))
-        Assert.assertEquals(1.7, danaPump.lastBolusAmount, 0.01)
-
-        Assert.assertEquals("REVIEW__GET_MORE_INFORMATION", packet.friendlyName)
-    }
-}
\ No newline at end of file
diff --git a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketGeneralGetPasswordTest.kt b/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketGeneralGetPasswordTest.kt
deleted file mode 100644
index 9fe3e2a8ec..0000000000
--- a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketGeneralGetPasswordTest.kt
+++ /dev/null
@@ -1,35 +0,0 @@
-package info.nightscout.androidaps.danars.comm
-
-import dagger.android.AndroidInjector
-import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.danars.DanaRSTestBase
-import org.junit.Assert
-import org.junit.Test
-import org.junit.runner.RunWith
-import org.powermock.modules.junit4.PowerMockRunner
-
-@RunWith(PowerMockRunner::class)
-class DanaRsPacketGeneralGetPasswordTest : DanaRSTestBase() {
-
-    private val packetInjector = HasAndroidInjector {
-        AndroidInjector {
-            if (it is DanaRS_Packet_General_Get_Password) {
-                it.aapsLogger = aapsLogger
-                it.danaPump = danaPump
-            }
-        }
-    }
-
-    @Test fun runTest() {
-        var packet = DanaRS_Packet_General_Get_Password(packetInjector)
-        Assert.assertEquals(null, packet.requestParams)
-        // test message decoding
-        // test for the length message
-        packet.handleMessage(createArray(1, 0.toByte()))
-        Assert.assertEquals(true, packet.failed)
-        packet = DanaRS_Packet_General_Get_Password(packetInjector)
-        packet.handleMessage(createArray(15, 0.toByte()))
-        Assert.assertEquals(false, packet.failed)
-        Assert.assertEquals("REVIEW__GET_PASSWORD", packet.friendlyName)
-    }
-}
\ No newline at end of file
diff --git a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketGeneralGetPumpCheckTest.kt b/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketGeneralGetPumpCheckTest.kt
index b3c7b5df8f..a3ba829cb9 100644
--- a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketGeneralGetPumpCheckTest.kt
+++ b/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketGeneralGetPumpCheckTest.kt
@@ -3,20 +3,14 @@ package info.nightscout.androidaps.danars.comm
 import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.danars.DanaRSTestBase
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import org.junit.Assert
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.powermock.core.classloader.annotations.PrepareForTest
-import org.powermock.modules.junit4.PowerMockRunner
 
-@RunWith(PowerMockRunner::class)
-@PrepareForTest(RxBusWrapper::class)
 class DanaRsPacketGeneralGetPumpCheckTest : DanaRSTestBase() {
 
     private val packetInjector = HasAndroidInjector {
         AndroidInjector {
-            if (it is DanaRS_Packet_General_Get_Pump_Check) {
+            if (it is DanaRSPacketGeneralGetPumpCheck) {
                 it.aapsLogger = aapsLogger
                 it.rxBus = rxBus
                 it.resourceHelper = resourceHelper
@@ -26,13 +20,13 @@ class DanaRsPacketGeneralGetPumpCheckTest : DanaRSTestBase() {
     }
 
     @Test fun runTest() {
-        var packet = DanaRS_Packet_General_Get_Pump_Check(packetInjector)
-        Assert.assertEquals(null, packet.requestParams)
+        var packet = DanaRSPacketGeneralGetPumpCheck(packetInjector)
+        Assert.assertEquals(0, packet.getRequestParams().size)
         // test message decoding
         // test for the length message
         packet.handleMessage(createArray(1, 0.toByte()))
         Assert.assertEquals(true, packet.failed)
-        packet = DanaRS_Packet_General_Get_Pump_Check(packetInjector)
+        packet = DanaRSPacketGeneralGetPumpCheck(packetInjector)
         packet.handleMessage(createArray(15, 0.toByte()))
         Assert.assertEquals(false, packet.failed)
         Assert.assertEquals("REVIEW__GET_PUMP_CHECK", packet.friendlyName)
diff --git a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketGeneralGetShippingInformationTest.kt b/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketGeneralGetShippingInformationTest.kt
index 07201595db..2da38b4410 100644
--- a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketGeneralGetShippingInformationTest.kt
+++ b/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketGeneralGetShippingInformationTest.kt
@@ -5,33 +5,30 @@ import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.danars.DanaRSTestBase
 import org.junit.Assert
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.powermock.modules.junit4.PowerMockRunner
 
-@RunWith(PowerMockRunner::class)
 class DanaRsPacketGeneralGetShippingInformationTest : DanaRSTestBase() {
 
     private val packetInjector = HasAndroidInjector {
         AndroidInjector {
-            if (it is DanaRS_Packet) {
+            if (it is DanaRSPacket) {
                 it.aapsLogger = aapsLogger
                 it.dateUtil = dateUtil
             }
-            if (it is DanaRS_Packet_General_Get_Shipping_Information) {
+            if (it is DanaRSPacketGeneralGetShippingInformation) {
                 it.danaPump = danaPump
             }
         }
     }
 
     @Test fun runTest() {
-        var packet = DanaRS_Packet_General_Get_Shipping_Information(packetInjector)
-        Assert.assertEquals(null, packet.requestParams)
+        var packet = DanaRSPacketGeneralGetShippingInformation(packetInjector)
+        Assert.assertEquals(0, packet.getRequestParams().size)
         // test message decoding
         // test for the length message
         packet.handleMessage(createArray(1, 0.toByte()))
         Assert.assertEquals(true, packet.failed)
         // everything ok :)
-        packet = DanaRS_Packet_General_Get_Shipping_Information(packetInjector)
+        packet = DanaRSPacketGeneralGetShippingInformation(packetInjector)
         Assert.assertEquals("REVIEW__GET_SHIPPING_INFORMATION", packet.friendlyName)
     }
 }
\ No newline at end of file
diff --git a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketGeneralGetShippingVerisonTest.kt b/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketGeneralGetShippingVerisonTest.kt
index 3a63508855..1d2ba4af37 100644
--- a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketGeneralGetShippingVerisonTest.kt
+++ b/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketGeneralGetShippingVerisonTest.kt
@@ -5,15 +5,12 @@ import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.danars.DanaRSTestBase
 import org.junit.Assert
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.powermock.modules.junit4.PowerMockRunner
 
-@RunWith(PowerMockRunner::class)
-class DanaRsPacketGeneralGetShippingVerisonTest : DanaRSTestBase() {
+class DanaRsPacketGeneralGetShippingVersionTest : DanaRSTestBase() {
 
     private val packetInjector = HasAndroidInjector {
         AndroidInjector {
-            if (it is DanaRS_Packet_General_Get_Shipping_Version) {
+            if (it is DanaRSPacketGeneralGetShippingVersion) {
                 it.aapsLogger = aapsLogger
                 it.danaPump = danaPump
             }
@@ -21,7 +18,7 @@ class DanaRsPacketGeneralGetShippingVerisonTest : DanaRSTestBase() {
     }
 
     @Test fun runTest() {
-        val packet = DanaRS_Packet_General_Get_Shipping_Version(packetInjector)
+        val packet = DanaRSPacketGeneralGetShippingVersion(packetInjector)
         // test message decoding
         val ver = byteArrayOf((-78).toByte(), (-127).toByte(), (66).toByte(), (80).toByte(), (78).toByte(), (45).toByte(), (51).toByte(), (46).toByte(), (48).toByte(), (46).toByte(), (48).toByte())
         packet.handleMessage(ver)
diff --git a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketGeneralGetTodayDeliveryTotalTest.kt b/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketGeneralGetTodayDeliveryTotalTest.kt
deleted file mode 100644
index 4497e3dc90..0000000000
--- a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketGeneralGetTodayDeliveryTotalTest.kt
+++ /dev/null
@@ -1,37 +0,0 @@
-package info.nightscout.androidaps.danars.comm
-
-import dagger.android.AndroidInjector
-import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.danars.DanaRSTestBase
-import org.junit.Assert
-import org.junit.Test
-import org.junit.runner.RunWith
-import org.powermock.modules.junit4.PowerMockRunner
-
-@RunWith(PowerMockRunner::class)
-class DanaRsPacketGeneralGetTodayDeliveryTotalTest : DanaRSTestBase() {
-
-    private val packetInjector = HasAndroidInjector {
-        AndroidInjector {
-            if (it is DanaRS_Packet_General_Get_Today_Delivery_Total) {
-                it.aapsLogger = aapsLogger
-                it.danaPump = danaPump
-            }
-        }
-    }
-
-    @Test fun runTest() {
-        var packet = DanaRS_Packet_General_Get_Today_Delivery_Total(packetInjector)
-        Assert.assertEquals(null, packet.requestParams)
-        // test message decoding
-        // test for the length message
-        packet.handleMessage(createArray(1, 0.toByte()))
-        Assert.assertEquals(true, packet.failed)
-        packet = DanaRS_Packet_General_Get_Today_Delivery_Total(packetInjector)
-        packet.handleMessage(createArray(18, 0.toByte()))
-        Assert.assertEquals(false, packet.failed)
-        packet.handleMessage(createArray(15, 1.toByte()))
-        Assert.assertEquals(((1 and 0x000000FF shl 8) + (1 and 0x000000FF)) / 100.0, danaPump.dailyTotalUnits, 0.0)
-        Assert.assertEquals("REVIEW__GET_TODAY_DELIVERY_TOTAL", packet.friendlyName)
-    }
-}
\ No newline at end of file
diff --git a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketGeneralGetUserTimeChangeFlagTest.kt b/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketGeneralGetUserTimeChangeFlagTest.kt
index 0f901ca6e8..996bdc8b5b 100644
--- a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketGeneralGetUserTimeChangeFlagTest.kt
+++ b/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketGeneralGetUserTimeChangeFlagTest.kt
@@ -5,28 +5,25 @@ import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.danars.DanaRSTestBase
 import org.junit.Assert
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.powermock.modules.junit4.PowerMockRunner
 
-@RunWith(PowerMockRunner::class)
 class DanaRsPacketGeneralGetUserTimeChangeFlagTest : DanaRSTestBase() {
 
     private val packetInjector = HasAndroidInjector {
         AndroidInjector {
-            if (it is DanaRS_Packet_General_Get_User_Time_Change_Flag) {
+            if (it is DanaRSPacketGeneralGetUserTimeChangeFlag) {
                 it.aapsLogger = aapsLogger
             }
         }
     }
 
     @Test fun runTest() {
-        var packet = DanaRS_Packet_General_Get_User_Time_Change_Flag(packetInjector)
-        Assert.assertEquals(null, packet.requestParams)
+        var packet = DanaRSPacketGeneralGetUserTimeChangeFlag(packetInjector)
+        Assert.assertEquals(0, packet.getRequestParams().size)
         // test message decoding
         // test for the length message
         packet.handleMessage(createArray(1, 0.toByte()))
         Assert.assertEquals(true, packet.failed)
-        packet = DanaRS_Packet_General_Get_User_Time_Change_Flag(packetInjector)
+        packet = DanaRSPacketGeneralGetUserTimeChangeFlag(packetInjector)
         packet.handleMessage(createArray(18, 0.toByte()))
         Assert.assertEquals(false, packet.failed)
         Assert.assertEquals("REVIEW__GET_USER_TIME_CHANGE_FLAG", packet.friendlyName)
diff --git a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketGeneralInitialScreenInformationTest.kt b/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketGeneralInitialScreenInformationTest.kt
index a67535ea5e..e402a7fa8f 100644
--- a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketGeneralInitialScreenInformationTest.kt
+++ b/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketGeneralInitialScreenInformationTest.kt
@@ -5,15 +5,12 @@ import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.danars.DanaRSTestBase
 import org.junit.Assert
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.powermock.modules.junit4.PowerMockRunner
 
-@RunWith(PowerMockRunner::class)
 class DanaRsPacketGeneralInitialScreenInformationTest : DanaRSTestBase() {
 
     private val packetInjector = HasAndroidInjector {
         AndroidInjector {
-            if (it is DanaRS_Packet_General_Initial_Screen_Information) {
+            if (it is DanaRSPacketGeneralInitialScreenInformation) {
                 it.aapsLogger = aapsLogger
                 it.danaPump = danaPump
             }
@@ -21,13 +18,13 @@ class DanaRsPacketGeneralInitialScreenInformationTest : DanaRSTestBase() {
     }
 
     @Test fun runTest() {
-        var packet = DanaRS_Packet_General_Initial_Screen_Information(packetInjector)
-        Assert.assertEquals(null, packet.requestParams)
+        var packet = DanaRSPacketGeneralInitialScreenInformation(packetInjector)
+        Assert.assertEquals(0, packet.getRequestParams().size)
         // test message decoding
         // test for the length message
         packet.handleMessage(createArray(1, 0.toByte()))
         Assert.assertEquals(true, packet.failed)
-        packet = DanaRS_Packet_General_Initial_Screen_Information(packetInjector)
+        packet = DanaRSPacketGeneralInitialScreenInformation(packetInjector)
         packet.handleMessage(createArray(17, 1.toByte()))
         Assert.assertEquals(false, packet.failed)
         Assert.assertEquals(true, danaPump.pumpSuspended)
diff --git a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketGeneralSetHistoryUploadModeTest.kt b/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketGeneralSetHistoryUploadModeTest.kt
index 4a2061bce1..18a8ae0db9 100644
--- a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketGeneralSetHistoryUploadModeTest.kt
+++ b/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketGeneralSetHistoryUploadModeTest.kt
@@ -5,24 +5,21 @@ import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.danars.DanaRSTestBase
 import org.junit.Assert
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.powermock.modules.junit4.PowerMockRunner
 
-@RunWith(PowerMockRunner::class)
 class DanaRsPacketGeneralSetHistoryUploadModeTest : DanaRSTestBase() {
 
     private val packetInjector = HasAndroidInjector {
         AndroidInjector {
-            if (it is DanaRS_Packet_General_Set_History_Upload_Mode) {
+            if (it is DanaRSPacketGeneralSetHistoryUploadMode) {
                 it.aapsLogger = aapsLogger
             }
         }
     }
 
     @Test fun runTest() {
-        val packet = DanaRS_Packet_General_Set_History_Upload_Mode(packetInjector, 1)
+        val packet = DanaRSPacketGeneralSetHistoryUploadMode(packetInjector, 1)
         // test params
-        Assert.assertEquals(1.toByte(), packet.requestParams[0])
+        Assert.assertEquals(1.toByte(), packet.getRequestParams()[0])
         // test message decoding
         packet.handleMessage(createArray(3, 0.toByte()))
         Assert.assertEquals(false, packet.failed)
diff --git a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketGeneralSetUserTimeChangeFlagClearTest.kt b/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketGeneralSetUserTimeChangeFlagClearTest.kt
index 2e6e170be5..2a99d997f2 100644
--- a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketGeneralSetUserTimeChangeFlagClearTest.kt
+++ b/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketGeneralSetUserTimeChangeFlagClearTest.kt
@@ -5,24 +5,21 @@ import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.danars.DanaRSTestBase
 import org.junit.Assert
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.powermock.modules.junit4.PowerMockRunner
 
-@RunWith(PowerMockRunner::class)
 class DanaRsPacketGeneralSetUserTimeChangeFlagClearTest : DanaRSTestBase() {
 
     private val packetInjector = HasAndroidInjector {
         AndroidInjector {
-            if (it is DanaRS_Packet_General_Set_User_Time_Change_Flag_Clear) {
+            if (it is DanaRSPacketGeneralSetUserTimeChangeFlagClear) {
                 it.aapsLogger = aapsLogger
             }
         }
     }
 
     @Test fun runTest() {
-        val packet = DanaRS_Packet_General_Set_User_Time_Change_Flag_Clear(packetInjector)
+        val packet = DanaRSPacketGeneralSetUserTimeChangeFlagClear(packetInjector)
         // test params
-        Assert.assertEquals(null, packet.requestParams)
+        Assert.assertEquals(0, packet.getRequestParams().size)
         // test message decoding
         packet.handleMessage(createArray(3, 0.toByte()))
         Assert.assertEquals(false, packet.failed)
diff --git a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketHistoryAllHistoryTest.kt b/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketHistoryAllHistoryTest.kt
index 8135997298..036d58b32d 100644
--- a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketHistoryAllHistoryTest.kt
+++ b/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketHistoryAllHistoryTest.kt
@@ -5,26 +5,23 @@ import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.danars.DanaRSTestBase
 import org.junit.Assert
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.powermock.modules.junit4.PowerMockRunner
 
-@RunWith(PowerMockRunner::class)
 class DanaRsPacketHistoryAllHistoryTest : DanaRSTestBase() {
 
     private val packetInjector = HasAndroidInjector {
         AndroidInjector {
-            if (it is DanaRS_Packet) {
+            if (it is DanaRSPacket) {
                 it.aapsLogger = aapsLogger
                 it.dateUtil = dateUtil
             }
-            if (it is DanaRS_Packet_History_All_History) {
+            if (it is DanaRSPacketHistoryAllHistory) {
                 it.rxBus = rxBus
             }
         }
     }
 
     @Test fun runTest() {
-        val packet = DanaRS_Packet_History_All_History(packetInjector, System.currentTimeMillis())
+        val packet = DanaRSPacketHistoryAllHistory(packetInjector, System.currentTimeMillis())
         Assert.assertEquals("REVIEW__ALL_HISTORY", packet.friendlyName)
     }
 }
\ No newline at end of file
diff --git a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketHistoryBasalTest.kt b/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketHistoryBasalTest.kt
index 1d0f7f978d..91714c3855 100644
--- a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketHistoryBasalTest.kt
+++ b/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketHistoryBasalTest.kt
@@ -5,26 +5,23 @@ import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.danars.DanaRSTestBase
 import org.junit.Assert
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.powermock.modules.junit4.PowerMockRunner
 
-@RunWith(PowerMockRunner::class)
 class DanaRsPacketHistoryBasalTest : DanaRSTestBase() {
 
     private val packetInjector = HasAndroidInjector {
         AndroidInjector {
-            if (it is DanaRS_Packet) {
+            if (it is DanaRSPacket) {
                 it.aapsLogger = aapsLogger
                 it.dateUtil = dateUtil
             }
-            if (it is DanaRS_Packet_History_Basal) {
+            if (it is DanaRSPacketHistoryBasal) {
                 it.rxBus = rxBus
             }
         }
     }
 
     @Test fun runTest() {
-        val packet = DanaRS_Packet_History_Basal(packetInjector, System.currentTimeMillis())
+        val packet = DanaRSPacketHistoryBasal(packetInjector, System.currentTimeMillis())
         Assert.assertEquals("REVIEW__BASAL", packet.friendlyName)
     }
 }
\ No newline at end of file
diff --git a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketHistoryBloodGlucoseTest.kt b/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketHistoryBloodGlucoseTest.kt
index 683298ff8b..f37f3b80ee 100644
--- a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketHistoryBloodGlucoseTest.kt
+++ b/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketHistoryBloodGlucoseTest.kt
@@ -5,26 +5,23 @@ import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.danars.DanaRSTestBase
 import org.junit.Assert
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.powermock.modules.junit4.PowerMockRunner
 
-@RunWith(PowerMockRunner::class)
 class DanaRsPacketHistoryBloodGlucoseTest : DanaRSTestBase() {
 
     private val packetInjector = HasAndroidInjector {
         AndroidInjector {
-            if (it is DanaRS_Packet) {
+            if (it is DanaRSPacket) {
                 it.aapsLogger = aapsLogger
                 it.dateUtil = dateUtil
             }
-            if (it is DanaRS_Packet_History_Blood_Glucose) {
+            if (it is DanaRSPacketHistoryBloodGlucose) {
                 it.rxBus = rxBus
             }
         }
     }
 
     @Test fun runTest() {
-        val packet = DanaRS_Packet_History_Blood_Glucose(packetInjector, System.currentTimeMillis())
+        val packet = DanaRSPacketHistoryBloodGlucose(packetInjector, System.currentTimeMillis())
         Assert.assertEquals("REVIEW__BLOOD_GLUCOSE", packet.friendlyName)
     }
 }
\ No newline at end of file
diff --git a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketHistoryBolusTest.kt b/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketHistoryBolusTest.kt
index 94b8f19777..e571ab62d4 100644
--- a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketHistoryBolusTest.kt
+++ b/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketHistoryBolusTest.kt
@@ -5,26 +5,23 @@ import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.danars.DanaRSTestBase
 import org.junit.Assert
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.powermock.modules.junit4.PowerMockRunner
 
-@RunWith(PowerMockRunner::class)
 class DanaRsPacketHistoryBolusTest : DanaRSTestBase() {
 
     private val packetInjector = HasAndroidInjector {
         AndroidInjector {
-            if (it is DanaRS_Packet) {
+            if (it is DanaRSPacket) {
                 it.aapsLogger = aapsLogger
                 it.dateUtil = dateUtil
             }
-            if (it is DanaRS_Packet_History_Bolus) {
+            if (it is DanaRSPacketHistoryBolus) {
                 it.rxBus = rxBus
             }
         }
     }
 
     @Test fun runTest() {
-        val packet = DanaRS_Packet_History_Bolus(packetInjector, System.currentTimeMillis())
+        val packet = DanaRSPacketHistoryBolus(packetInjector, System.currentTimeMillis())
         Assert.assertEquals("REVIEW__BOLUS", packet.friendlyName)
     }
 }
\ No newline at end of file
diff --git a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketHistoryCarbohydrateTest.kt b/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketHistoryCarbohydrateTest.kt
index cfa447fa89..5054c7bf04 100644
--- a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketHistoryCarbohydrateTest.kt
+++ b/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketHistoryCarbohydrateTest.kt
@@ -5,26 +5,23 @@ import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.danars.DanaRSTestBase
 import org.junit.Assert
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.powermock.modules.junit4.PowerMockRunner
 
-@RunWith(PowerMockRunner::class)
 class DanaRsPacketHistoryCarbohydrateTest : DanaRSTestBase() {
 
     private val packetInjector = HasAndroidInjector {
         AndroidInjector {
-            if (it is DanaRS_Packet) {
+            if (it is DanaRSPacket) {
                 it.aapsLogger = aapsLogger
                 it.dateUtil = dateUtil
             }
-            if (it is DanaRS_Packet_History_Carbohydrate) {
+            if (it is DanaRSPacketHistoryCarbohydrate) {
                 it.rxBus = rxBus
             }
         }
     }
 
     @Test fun runTest() {
-        val packet = DanaRS_Packet_History_Carbohydrate(packetInjector, System.currentTimeMillis())
+        val packet = DanaRSPacketHistoryCarbohydrate(packetInjector, System.currentTimeMillis())
         Assert.assertEquals("REVIEW__CARBOHYDRATE", packet.friendlyName)
     }
 }
\ No newline at end of file
diff --git a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketHistoryDailyTest.kt b/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketHistoryDailyTest.kt
index a98894c6e7..8179ed8b8d 100644
--- a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketHistoryDailyTest.kt
+++ b/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketHistoryDailyTest.kt
@@ -5,26 +5,23 @@ import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.danars.DanaRSTestBase
 import org.junit.Assert
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.powermock.modules.junit4.PowerMockRunner
 
-@RunWith(PowerMockRunner::class)
 class DanaRsPacketHistoryDailyTest : DanaRSTestBase() {
 
     private val packetInjector = HasAndroidInjector {
         AndroidInjector {
-            if (it is DanaRS_Packet) {
+            if (it is DanaRSPacket) {
                 it.aapsLogger = aapsLogger
                 it.dateUtil = dateUtil
             }
-            if (it is DanaRS_Packet_History_Daily) {
+            if (it is DanaRSPacketHistoryDaily) {
                 it.rxBus = rxBus
             }
         }
     }
 
     @Test fun runTest() {
-        val packet = DanaRS_Packet_History_Daily(packetInjector, System.currentTimeMillis())
+        val packet = DanaRSPacketHistoryDaily(packetInjector, System.currentTimeMillis())
         Assert.assertEquals("REVIEW__DAILY", packet.friendlyName)
     }
 }
\ No newline at end of file
diff --git a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketHistoryPrimeTest.kt b/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketHistoryPrimeTest.kt
index a651910802..1658519465 100644
--- a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketHistoryPrimeTest.kt
+++ b/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketHistoryPrimeTest.kt
@@ -5,26 +5,23 @@ import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.danars.DanaRSTestBase
 import org.junit.Assert
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.powermock.modules.junit4.PowerMockRunner
 
-@RunWith(PowerMockRunner::class)
 class DanaRsPacketHistoryPrimeTest : DanaRSTestBase() {
 
     private val packetInjector = HasAndroidInjector {
         AndroidInjector {
-            if (it is DanaRS_Packet) {
+            if (it is DanaRSPacket) {
                 it.aapsLogger = aapsLogger
                 it.dateUtil = dateUtil
             }
-            if (it is DanaRS_Packet_History_Prime) {
+            if (it is DanaRSPacketHistoryPrime) {
                 it.rxBus = rxBus
             }
         }
     }
 
     @Test fun runTest() {
-        val packet = DanaRS_Packet_History_Prime(packetInjector, System.currentTimeMillis())
+        val packet = DanaRSPacketHistoryPrime(packetInjector, System.currentTimeMillis())
         Assert.assertEquals("REVIEW__PRIME", packet.friendlyName)
     }
 }
\ No newline at end of file
diff --git a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketHistoryRefillTest.kt b/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketHistoryRefillTest.kt
index 65d484aa77..ebb1787050 100644
--- a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketHistoryRefillTest.kt
+++ b/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketHistoryRefillTest.kt
@@ -5,26 +5,23 @@ import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.danars.DanaRSTestBase
 import org.junit.Assert
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.powermock.modules.junit4.PowerMockRunner
 
-@RunWith(PowerMockRunner::class)
 class DanaRsPacketHistoryRefillTest : DanaRSTestBase() {
 
     private val packetInjector = HasAndroidInjector {
         AndroidInjector {
-            if (it is DanaRS_Packet) {
+            if (it is DanaRSPacket) {
                 it.aapsLogger = aapsLogger
                 it.dateUtil = dateUtil
             }
-            if (it is DanaRS_Packet_History_Refill) {
+            if (it is DanaRSPacketHistoryRefill) {
                 it.rxBus = rxBus
             }
         }
     }
 
     @Test fun runTest() {
-        val packet = DanaRS_Packet_History_Refill(packetInjector, System.currentTimeMillis())
+        val packet = DanaRSPacketHistoryRefill(packetInjector, System.currentTimeMillis())
         Assert.assertEquals("REVIEW__REFILL", packet.friendlyName)
     }
 }
\ No newline at end of file
diff --git a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketHistorySuspendTest.kt b/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketHistorySuspendTest.kt
index 04fba763ee..bcdfc7e85c 100644
--- a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketHistorySuspendTest.kt
+++ b/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketHistorySuspendTest.kt
@@ -5,26 +5,23 @@ import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.danars.DanaRSTestBase
 import org.junit.Assert
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.powermock.modules.junit4.PowerMockRunner
 
-@RunWith(PowerMockRunner::class)
 class DanaRsPacketHistorySuspendTest : DanaRSTestBase() {
 
     private val packetInjector = HasAndroidInjector {
         AndroidInjector {
-            if (it is DanaRS_Packet) {
+            if (it is DanaRSPacket) {
                 it.aapsLogger = aapsLogger
                 it.dateUtil = dateUtil
             }
-            if (it is DanaRS_Packet_History_Suspend) {
+            if (it is DanaRSPacketHistorySuspend) {
                 it.rxBus = rxBus
             }
         }
     }
 
     @Test fun runTest() {
-        val packet = DanaRS_Packet_History_Suspend(packetInjector, System.currentTimeMillis())
+        val packet = DanaRSPacketHistorySuspend(packetInjector, System.currentTimeMillis())
         Assert.assertEquals("REVIEW__SUSPEND", packet.friendlyName)
     }
 }
\ No newline at end of file
diff --git a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketHistoryTemporaryTest.kt b/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketHistoryTemporaryTest.kt
index c8eed86284..ff2836e7ec 100644
--- a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketHistoryTemporaryTest.kt
+++ b/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketHistoryTemporaryTest.kt
@@ -5,26 +5,23 @@ import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.danars.DanaRSTestBase
 import org.junit.Assert
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.powermock.modules.junit4.PowerMockRunner
 
-@RunWith(PowerMockRunner::class)
 class DanaRsPacketHistoryTemporaryTest : DanaRSTestBase() {
 
     private val packetInjector = HasAndroidInjector {
         AndroidInjector {
-            if (it is DanaRS_Packet) {
+            if (it is DanaRSPacket) {
                 it.aapsLogger = aapsLogger
                 it.dateUtil = dateUtil
             }
-            if (it is DanaRS_Packet_History_Temporary) {
+            if (it is DanaRSPacketHistoryTemporary) {
                 it.rxBus = rxBus
             }
         }
     }
 
     @Test fun runTest() {
-        val packet = DanaRS_Packet_History_Temporary(packetInjector, System.currentTimeMillis())
+        val packet = DanaRSPacketHistoryTemporary(packetInjector, System.currentTimeMillis())
         Assert.assertEquals("REVIEW__TEMPORARY", packet.friendlyName)
     }
 }
\ No newline at end of file
diff --git a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketNotifyAlarmTest.kt b/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketNotifyAlarmTest.kt
index 9df91c6c38..371cbb6811 100644
--- a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketNotifyAlarmTest.kt
+++ b/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketNotifyAlarmTest.kt
@@ -6,18 +6,15 @@ import info.nightscout.androidaps.danars.DanaRSTestBase
 import info.nightscout.androidaps.interfaces.PumpSync
 import org.junit.Assert
 import org.junit.Test
-import org.junit.runner.RunWith
 import org.mockito.Mock
-import org.powermock.modules.junit4.PowerMockRunner
 
-@RunWith(PowerMockRunner::class)
 class DanaRsPacketNotifyAlarmTest : DanaRSTestBase() {
 
     @Mock lateinit var pumpSync: PumpSync
 
     private val packetInjector = HasAndroidInjector {
         AndroidInjector {
-            if (it is DanaRS_Packet_Notify_Alarm) {
+            if (it is DanaRSPacketNotifyAlarm) {
                 it.aapsLogger = aapsLogger
                 it.rxBus = rxBus
                 it.resourceHelper = resourceHelper
@@ -28,9 +25,9 @@ class DanaRsPacketNotifyAlarmTest : DanaRSTestBase() {
     }
 
     @Test fun runTest() {
-        val packet = DanaRS_Packet_Notify_Alarm(packetInjector)
+        val packet = DanaRSPacketNotifyAlarm(packetInjector)
         // test params
-        Assert.assertEquals(null, packet.requestParams)
+        Assert.assertEquals(0, packet.getRequestParams().size)
         // test message decoding
         packet.handleMessage(createArray(17, 0x01.toByte()))
         Assert.assertEquals(false, packet.failed)
diff --git a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketNotifyDeliveryRateDisplayTest.kt b/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketNotifyDeliveryRateDisplayTest.kt
index ab9b803ad9..2bb10b963c 100644
--- a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketNotifyDeliveryRateDisplayTest.kt
+++ b/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketNotifyDeliveryRateDisplayTest.kt
@@ -8,7 +8,6 @@ import info.nightscout.androidaps.danars.DanaRSTestBase
 import info.nightscout.androidaps.interfaces.ActivePlugin
 import info.nightscout.androidaps.interfaces.CommandQueueProvider
 import info.nightscout.androidaps.interfaces.PumpSync
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
 import info.nightscout.androidaps.plugins.general.overview.events.EventOverviewBolusProgress
 import info.nightscout.androidaps.plugins.pump.common.bolusInfo.DetailedBolusInfoStorage
@@ -16,15 +15,10 @@ import info.nightscout.androidaps.plugins.pump.common.bolusInfo.TemporaryBasalSt
 import org.junit.Assert
 import org.junit.Before
 import org.junit.Test
-import org.junit.runner.RunWith
 import org.mockito.ArgumentMatchers
 import org.mockito.Mock
 import org.mockito.Mockito.`when`
-import org.powermock.core.classloader.annotations.PrepareForTest
-import org.powermock.modules.junit4.PowerMockRunner
 
-@RunWith(PowerMockRunner::class)
-@PrepareForTest(ConstraintChecker::class, RxBusWrapper::class, DetailedBolusInfoStorage::class, TemporaryBasalStorage::class)
 class DanaRsPacketNotifyDeliveryRateDisplayTest : DanaRSTestBase() {
 
     @Mock lateinit var activePlugin: ActivePlugin
@@ -39,7 +33,7 @@ class DanaRsPacketNotifyDeliveryRateDisplayTest : DanaRSTestBase() {
 
     private val packetInjector = HasAndroidInjector {
         AndroidInjector {
-            if (it is DanaRS_Packet_Notify_Delivery_Rate_Display) {
+            if (it is DanaRSPacketNotifyDeliveryRateDisplay) {
                 it.aapsLogger = aapsLogger
                 it.rxBus = rxBus
                 it.resourceHelper = resourceHelper
@@ -51,11 +45,11 @@ class DanaRsPacketNotifyDeliveryRateDisplayTest : DanaRSTestBase() {
     @Test fun runTest() {
         `when`(resourceHelper.gs(ArgumentMatchers.anyInt(), anyObject())).thenReturn("SomeString")
         // val packet = DanaRS_Packet_Notify_Delivery_Rate_Display(1.0, Treatment(treatmentInjector))
-        val packet = DanaRS_Packet_Notify_Delivery_Rate_Display(packetInjector)
+        val packet = DanaRSPacketNotifyDeliveryRateDisplay(packetInjector)
         // test params
-        Assert.assertEquals(null, packet.requestParams)
+        Assert.assertEquals(0, packet.getRequestParams().size)
         // test message decoding
-// 0% delivered
+        // 0% delivered
         packet.handleMessage(createArray(17, 0.toByte()))
         Assert.assertEquals(true, packet.failed)
         // 100 % delivered
diff --git a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketNotifyMissedBolusAlarmTest.kt b/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketNotifyMissedBolusAlarmTest.kt
index 0a25ea13e9..dd74cf4962 100644
--- a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketNotifyMissedBolusAlarmTest.kt
+++ b/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketNotifyMissedBolusAlarmTest.kt
@@ -5,24 +5,21 @@ import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.danars.DanaRSTestBase
 import org.junit.Assert
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.powermock.modules.junit4.PowerMockRunner
 
-@RunWith(PowerMockRunner::class)
 class DanaRsPacketNotifyMissedBolusAlarmTest : DanaRSTestBase() {
 
     private val packetInjector = HasAndroidInjector {
         AndroidInjector {
-            if (it is DanaRS_Packet_Notify_Missed_Bolus_Alarm) {
+            if (it is DanaRSPacketNotifyMissedBolusAlarm) {
                 it.aapsLogger = aapsLogger
             }
         }
     }
 
     @Test fun runTest() {
-        val packet = DanaRS_Packet_Notify_Missed_Bolus_Alarm(packetInjector)
+        val packet = DanaRSPacketNotifyMissedBolusAlarm(packetInjector)
         // test params
-        Assert.assertEquals(null, packet.requestParams)
+        Assert.assertEquals(0, packet.getRequestParams().size)
         // test message decoding
         packet.handleMessage(createArray(6, 0.toByte()))
         Assert.assertEquals(false, packet.failed)
diff --git a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketOptionGetPumpTimeTest.kt b/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketOptionGetPumpTimeTest.kt
index 5efaeb9812..f4297dc7d2 100644
--- a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketOptionGetPumpTimeTest.kt
+++ b/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketOptionGetPumpTimeTest.kt
@@ -6,26 +6,23 @@ import info.nightscout.androidaps.danars.DanaRSTestBase
 import org.joda.time.DateTime
 import org.junit.Assert
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.powermock.modules.junit4.PowerMockRunner
 
-@RunWith(PowerMockRunner::class)
 class DanaRsPacketOptionGetPumpTimeTest : DanaRSTestBase() {
 
     private val packetInjector = HasAndroidInjector {
         AndroidInjector {
-            if (it is DanaRS_Packet) {
+            if (it is DanaRSPacket) {
                 it.aapsLogger = aapsLogger
                 it.dateUtil = dateUtil
             }
-            if (it is DanaRS_Packet_Option_Get_Pump_Time) {
+            if (it is DanaRSPacketOptionGetPumpTime) {
                 it.danaPump = danaPump
             }
         }
     }
 
     @Test fun runTest() {
-        val packet = DanaRS_Packet_Option_Get_Pump_Time(packetInjector)
+        val packet = DanaRSPacketOptionGetPumpTime(packetInjector)
         val array = createArray(8, 0.toByte()) // 6 + 2
         putByteToArray(array, 0, 19) // year 2019
         putByteToArray(array, 1, 2) // month february
diff --git a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketOptionGetUserOptionTest.kt b/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketOptionGetUserOptionTest.kt
index fb55d3c58b..dfadad5108 100644
--- a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketOptionGetUserOptionTest.kt
+++ b/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketOptionGetUserOptionTest.kt
@@ -5,15 +5,12 @@ import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.danars.DanaRSTestBase
 import org.junit.Assert
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.powermock.modules.junit4.PowerMockRunner
 
-@RunWith(PowerMockRunner::class)
 class DanaRsPacketOptionGetUserOptionTest : DanaRSTestBase() {
 
     private val packetInjector = HasAndroidInjector {
         AndroidInjector {
-            if (it is DanaRS_Packet_Option_Get_User_Option) {
+            if (it is DanaRSPacketOptionGetUserOption) {
                 it.aapsLogger = aapsLogger
                 it.danaPump = danaPump
             }
@@ -21,9 +18,9 @@ class DanaRsPacketOptionGetUserOptionTest : DanaRSTestBase() {
     }
 
     @Test fun runTest() {
-        val packet = DanaRS_Packet_Option_Get_User_Option(packetInjector)
+        val packet = DanaRSPacketOptionGetUserOption(packetInjector)
         // test params
-        Assert.assertEquals(null, packet.requestParams)
+        Assert.assertEquals(0, packet.getRequestParams().size)
         // test message decoding
         packet.handleMessage(createArray(20, 0.toByte()))
         Assert.assertEquals(true, packet.failed)
diff --git a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketOptionSetPumpTimeTest.kt b/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketOptionSetPumpTimeTest.kt
index 2b39688f61..0cedf8b8c5 100644
--- a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketOptionSetPumpTimeTest.kt
+++ b/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketOptionSetPumpTimeTest.kt
@@ -6,15 +6,12 @@ import info.nightscout.androidaps.danars.DanaRSTestBase
 import org.joda.time.DateTime
 import org.junit.Assert
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.powermock.modules.junit4.PowerMockRunner
 
-@RunWith(PowerMockRunner::class)
 class DanaRsPacketOptionSetPumpTimeTest : DanaRSTestBase() {
 
     private val packetInjector = HasAndroidInjector {
         AndroidInjector {
-            if (it is DanaRS_Packet) {
+            if (it is DanaRSPacket) {
                 it.aapsLogger = aapsLogger
                 it.dateUtil = dateUtil
             }
@@ -23,9 +20,9 @@ class DanaRsPacketOptionSetPumpTimeTest : DanaRSTestBase() {
 
     @Test fun runTest() {
         val date = DateTime()
-        val packet = DanaRS_Packet_Option_Set_Pump_Time(packetInjector, date.millis)
+        val packet = DanaRSPacketOptionSetPumpTime(packetInjector, date.millis)
         // test params
-        val params = packet.requestParams
+        val params = packet.getRequestParams()
         Assert.assertEquals((date.year - 2000 and 0xff).toByte(), params[0]) // 2019 -> 19
         Assert.assertEquals((date.monthOfYear and 0xff).toByte(), params[1])
         Assert.assertEquals((date.dayOfMonth and 0xff).toByte(), params[2])
diff --git a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketReviewBolusAvgTest.kt b/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketReviewBolusAvgTest.kt
index c4b7219a41..1e75515225 100644
--- a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketReviewBolusAvgTest.kt
+++ b/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketReviewBolusAvgTest.kt
@@ -5,24 +5,21 @@ import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.danars.DanaRSTestBase
 import org.junit.Assert
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.powermock.modules.junit4.PowerMockRunner
 
-@RunWith(PowerMockRunner::class)
 class DanaRsPacketReviewBolusAvgTest : DanaRSTestBase() {
 
     private val packetInjector = HasAndroidInjector {
         AndroidInjector {
-            if (it is DanaRS_Packet_Review_Bolus_Avg) {
+            if (it is DanaRSPacketReviewBolusAvg) {
                 it.aapsLogger = aapsLogger
             }
         }
     }
 
     @Test fun runTest() {
-        val packet = DanaRS_Packet_Review_Bolus_Avg(packetInjector)
+        val packet = DanaRSPacketReviewBolusAvg(packetInjector)
         // test params
-        Assert.assertEquals(null, packet.requestParams)
+        Assert.assertEquals(0, packet.getRequestParams().size)
         // test message decoding
         packet.handleMessage(createArray(12, 0.toByte()))
         Assert.assertEquals(false, packet.failed)
diff --git a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketReviewGetPumpDecRatioTest.kt b/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketReviewGetPumpDecRatioTest.kt
index 43c56c9496..beb0cb7256 100644
--- a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketReviewGetPumpDecRatioTest.kt
+++ b/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketReviewGetPumpDecRatioTest.kt
@@ -5,15 +5,12 @@ import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.danars.DanaRSTestBase
 import org.junit.Assert
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.powermock.modules.junit4.PowerMockRunner
 
-@RunWith(PowerMockRunner::class)
 class DanaRsPacketReviewGetPumpDecRatioTest : DanaRSTestBase() {
 
     private val packetInjector = HasAndroidInjector {
         AndroidInjector {
-            if (it is DanaRS_Packet_Review_Get_Pump_Dec_Ratio) {
+            if (it is DanaRSPacketReviewGetPumpDecRatio) {
                 it.aapsLogger = aapsLogger
                 it.danaPump = danaPump
             }
@@ -21,7 +18,7 @@ class DanaRsPacketReviewGetPumpDecRatioTest : DanaRSTestBase() {
     }
 
     @Test fun runTest() {
-        val packet = DanaRS_Packet_Review_Get_Pump_Dec_Ratio(packetInjector)
+        val packet = DanaRSPacketReviewGetPumpDecRatio(packetInjector)
 
         val array = ByteArray(100)
         putByteToArray(array, 0, 4.toByte())
diff --git a/database/build.gradle b/database/build.gradle
index 2a52ba112d..af81fc73ac 100644
--- a/database/build.gradle
+++ b/database/build.gradle
@@ -1,14 +1,13 @@
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-kapt'
+apply plugin: 'kotlin-allopen'
 
 apply from: "${project.rootDir}/gradle/android_dependencies.gradle"
 apply from: "${project.rootDir}/gradle/android_module_dependencies.gradle"
 
 android {
     defaultConfig {
-        versionCode 1
-        versionName "1.0"
         kapt {
             arguments {
                 arg("room.incremental", "true")
@@ -26,7 +25,7 @@ dependencies {
     implementation "io.reactivex.rxjava2:rxandroid:$rxandroid_version"
     implementation("io.reactivex.rxjava2:rxkotlin:$rxkotlin_version")
 
-    implementation "com.google.code.gson:gson:2.8.6"
+    implementation "com.google.code.gson:gson:2.8.8"
 
     api "androidx.room:room-runtime:$room_version"
     kapt "androidx.room:room-compiler:$room_version"
@@ -41,3 +40,8 @@ dependencies {
     implementation "com.google.dagger:dagger-android-support:$dagger_version"
     api "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
 }
+
+allOpen {
+    // allows mocking for classes w/o directly opening them for release builds
+    annotation 'info.nightscout.androidaps.annotations.OpenForTesting'
+}
\ No newline at end of file
diff --git a/database/schemas/info.nightscout.androidaps.database.AppDatabase/21.json b/database/schemas/info.nightscout.androidaps.database.AppDatabase/21.json
new file mode 100644
index 0000000000..383ec7b2ae
--- /dev/null
+++ b/database/schemas/info.nightscout.androidaps.database.AppDatabase/21.json
@@ -0,0 +1,3593 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 21,
+    "identityHash": "e3558dc3bb3136c37dba4f90c97e8bdd",
+    "entities": [
+      {
+        "tableName": "apsResults",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `version` INTEGER NOT NULL, `dateCreated` INTEGER NOT NULL, `isValid` INTEGER NOT NULL, `referenceId` INTEGER, `timestamp` INTEGER NOT NULL, `utcOffset` INTEGER NOT NULL, `algorithm` TEXT NOT NULL, `glucoseStatusJson` TEXT NOT NULL, `currentTempJson` TEXT NOT NULL, `iobDataJson` TEXT NOT NULL, `profileJson` TEXT NOT NULL, `autosensDataJson` TEXT, `mealDataJson` TEXT NOT NULL, `isMicroBolusAllowed` INTEGER, `resultJson` TEXT NOT NULL, `nightscoutSystemId` TEXT, `nightscoutId` TEXT, `pumpType` TEXT, `pumpSerial` TEXT, `temporaryId` INTEGER, `pumpId` INTEGER, `startId` INTEGER, `endId` INTEGER, FOREIGN KEY(`referenceId`) REFERENCES `apsResults`(`id`) ON UPDATE NO ACTION ON DELETE NO ACTION )",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "version",
+            "columnName": "version",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "dateCreated",
+            "columnName": "dateCreated",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isValid",
+            "columnName": "isValid",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "referenceId",
+            "columnName": "referenceId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "timestamp",
+            "columnName": "timestamp",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "utcOffset",
+            "columnName": "utcOffset",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "algorithm",
+            "columnName": "algorithm",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "glucoseStatusJson",
+            "columnName": "glucoseStatusJson",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "currentTempJson",
+            "columnName": "currentTempJson",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "iobDataJson",
+            "columnName": "iobDataJson",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "profileJson",
+            "columnName": "profileJson",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "autosensDataJson",
+            "columnName": "autosensDataJson",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "mealDataJson",
+            "columnName": "mealDataJson",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isMicroBolusAllowed",
+            "columnName": "isMicroBolusAllowed",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "resultJson",
+            "columnName": "resultJson",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "interfaceIDs_backing.nightscoutSystemId",
+            "columnName": "nightscoutSystemId",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "interfaceIDs_backing.nightscoutId",
+            "columnName": "nightscoutId",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "interfaceIDs_backing.pumpType",
+            "columnName": "pumpType",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "interfaceIDs_backing.pumpSerial",
+            "columnName": "pumpSerial",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "interfaceIDs_backing.temporaryId",
+            "columnName": "temporaryId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "interfaceIDs_backing.pumpId",
+            "columnName": "pumpId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "interfaceIDs_backing.startId",
+            "columnName": "startId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "interfaceIDs_backing.endId",
+            "columnName": "endId",
+            "affinity": "INTEGER",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [
+          {
+            "name": "index_apsResults_referenceId",
+            "unique": false,
+            "columnNames": [
+              "referenceId"
+            ],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_apsResults_referenceId` ON `${TABLE_NAME}` (`referenceId`)"
+          },
+          {
+            "name": "index_apsResults_timestamp",
+            "unique": false,
+            "columnNames": [
+              "timestamp"
+            ],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_apsResults_timestamp` ON `${TABLE_NAME}` (`timestamp`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "apsResults",
+            "onDelete": "NO ACTION",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "referenceId"
+            ],
+            "referencedColumns": [
+              "id"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "boluses",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `version` INTEGER NOT NULL, `dateCreated` INTEGER NOT NULL, `isValid` INTEGER NOT NULL, `referenceId` INTEGER, `timestamp` INTEGER NOT NULL, `utcOffset` INTEGER NOT NULL, `amount` REAL NOT NULL, `type` TEXT NOT NULL, `isBasalInsulin` INTEGER NOT NULL, `nightscoutSystemId` TEXT, `nightscoutId` TEXT, `pumpType` TEXT, `pumpSerial` TEXT, `temporaryId` INTEGER, `pumpId` INTEGER, `startId` INTEGER, `endId` INTEGER, `insulinLabel` TEXT, `insulinEndTime` INTEGER, `peak` INTEGER, FOREIGN KEY(`referenceId`) REFERENCES `boluses`(`id`) ON UPDATE NO ACTION ON DELETE NO ACTION )",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "version",
+            "columnName": "version",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "dateCreated",
+            "columnName": "dateCreated",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isValid",
+            "columnName": "isValid",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "referenceId",
+            "columnName": "referenceId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "timestamp",
+            "columnName": "timestamp",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "utcOffset",
+            "columnName": "utcOffset",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "amount",
+            "columnName": "amount",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isBasalInsulin",
+            "columnName": "isBasalInsulin",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "interfaceIDs_backing.nightscoutSystemId",
+            "columnName": "nightscoutSystemId",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "interfaceIDs_backing.nightscoutId",
+            "columnName": "nightscoutId",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "interfaceIDs_backing.pumpType",
+            "columnName": "pumpType",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "interfaceIDs_backing.pumpSerial",
+            "columnName": "pumpSerial",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "interfaceIDs_backing.temporaryId",
+            "columnName": "temporaryId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "interfaceIDs_backing.pumpId",
+            "columnName": "pumpId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "interfaceIDs_backing.startId",
+            "columnName": "startId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "interfaceIDs_backing.endId",
+            "columnName": "endId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "insulinConfiguration.insulinLabel",
+            "columnName": "insulinLabel",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "insulinConfiguration.insulinEndTime",
+            "columnName": "insulinEndTime",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "insulinConfiguration.peak",
+            "columnName": "peak",
+            "affinity": "INTEGER",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [
+          {
+            "name": "index_boluses_id",
+            "unique": false,
+            "columnNames": [
+              "id"
+            ],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_boluses_id` ON `${TABLE_NAME}` (`id`)"
+          },
+          {
+            "name": "index_boluses_isValid",
+            "unique": false,
+            "columnNames": [
+              "isValid"
+            ],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_boluses_isValid` ON `${TABLE_NAME}` (`isValid`)"
+          },
+          {
+            "name": "index_boluses_temporaryId",
+            "unique": false,
+            "columnNames": [
+              "temporaryId"
+            ],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_boluses_temporaryId` ON `${TABLE_NAME}` (`temporaryId`)"
+          },
+          {
+            "name": "index_boluses_pumpId",
+            "unique": false,
+            "columnNames": [
+              "pumpId"
+            ],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_boluses_pumpId` ON `${TABLE_NAME}` (`pumpId`)"
+          },
+          {
+            "name": "index_boluses_pumpSerial",
+            "unique": false,
+            "columnNames": [
+              "pumpSerial"
+            ],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_boluses_pumpSerial` ON `${TABLE_NAME}` (`pumpSerial`)"
+          },
+          {
+            "name": "index_boluses_pumpType",
+            "unique": false,
+            "columnNames": [
+              "pumpType"
+            ],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_boluses_pumpType` ON `${TABLE_NAME}` (`pumpType`)"
+          },
+          {
+            "name": "index_boluses_referenceId",
+            "unique": false,
+            "columnNames": [
+              "referenceId"
+            ],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_boluses_referenceId` ON `${TABLE_NAME}` (`referenceId`)"
+          },
+          {
+            "name": "index_boluses_timestamp",
+            "unique": false,
+            "columnNames": [
+              "timestamp"
+            ],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_boluses_timestamp` ON `${TABLE_NAME}` (`timestamp`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "boluses",
+            "onDelete": "NO ACTION",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "referenceId"
+            ],
+            "referencedColumns": [
+              "id"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "bolusCalculatorResults",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `version` INTEGER NOT NULL, `dateCreated` INTEGER NOT NULL, `isValid` INTEGER NOT NULL, `referenceId` INTEGER, `timestamp` INTEGER NOT NULL, `utcOffset` INTEGER NOT NULL, `targetBGLow` REAL NOT NULL, `targetBGHigh` REAL NOT NULL, `isf` REAL NOT NULL, `ic` REAL NOT NULL, `bolusIOB` REAL NOT NULL, `wasBolusIOBUsed` INTEGER NOT NULL, `basalIOB` REAL NOT NULL, `wasBasalIOBUsed` INTEGER NOT NULL, `glucoseValue` REAL NOT NULL, `wasGlucoseUsed` INTEGER NOT NULL, `glucoseDifference` REAL NOT NULL, `glucoseInsulin` REAL NOT NULL, `glucoseTrend` REAL NOT NULL, `wasTrendUsed` INTEGER NOT NULL, `trendInsulin` REAL NOT NULL, `cob` REAL NOT NULL, `wasCOBUsed` INTEGER NOT NULL, `cobInsulin` REAL NOT NULL, `carbs` REAL NOT NULL, `wereCarbsUsed` INTEGER NOT NULL, `carbsInsulin` REAL NOT NULL, `otherCorrection` REAL NOT NULL, `wasSuperbolusUsed` INTEGER NOT NULL, `superbolusInsulin` REAL NOT NULL, `wasTempTargetUsed` INTEGER NOT NULL, `totalInsulin` REAL NOT NULL, `percentageCorrection` INTEGER NOT NULL, `profileName` TEXT NOT NULL, `note` TEXT NOT NULL, `nightscoutSystemId` TEXT, `nightscoutId` TEXT, `pumpType` TEXT, `pumpSerial` TEXT, `temporaryId` INTEGER, `pumpId` INTEGER, `startId` INTEGER, `endId` INTEGER, FOREIGN KEY(`referenceId`) REFERENCES `bolusCalculatorResults`(`id`) ON UPDATE NO ACTION ON DELETE NO ACTION )",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "version",
+            "columnName": "version",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "dateCreated",
+            "columnName": "dateCreated",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isValid",
+            "columnName": "isValid",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "referenceId",
+            "columnName": "referenceId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "timestamp",
+            "columnName": "timestamp",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "utcOffset",
+            "columnName": "utcOffset",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "targetBGLow",
+            "columnName": "targetBGLow",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "targetBGHigh",
+            "columnName": "targetBGHigh",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isf",
+            "columnName": "isf",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "ic",
+            "columnName": "ic",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "bolusIOB",
+            "columnName": "bolusIOB",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "wasBolusIOBUsed",
+            "columnName": "wasBolusIOBUsed",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "basalIOB",
+            "columnName": "basalIOB",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "wasBasalIOBUsed",
+            "columnName": "wasBasalIOBUsed",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "glucoseValue",
+            "columnName": "glucoseValue",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "wasGlucoseUsed",
+            "columnName": "wasGlucoseUsed",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "glucoseDifference",
+            "columnName": "glucoseDifference",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "glucoseInsulin",
+            "columnName": "glucoseInsulin",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "glucoseTrend",
+            "columnName": "glucoseTrend",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "wasTrendUsed",
+            "columnName": "wasTrendUsed",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "trendInsulin",
+            "columnName": "trendInsulin",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "cob",
+            "columnName": "cob",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "wasCOBUsed",
+            "columnName": "wasCOBUsed",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "cobInsulin",
+            "columnName": "cobInsulin",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "carbs",
+            "columnName": "carbs",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "wereCarbsUsed",
+            "columnName": "wereCarbsUsed",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "carbsInsulin",
+            "columnName": "carbsInsulin",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "otherCorrection",
+            "columnName": "otherCorrection",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "wasSuperbolusUsed",
+            "columnName": "wasSuperbolusUsed",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "superbolusInsulin",
+            "columnName": "superbolusInsulin",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "wasTempTargetUsed",
+            "columnName": "wasTempTargetUsed",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "totalInsulin",
+            "columnName": "totalInsulin",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "percentageCorrection",
+            "columnName": "percentageCorrection",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "profileName",
+            "columnName": "profileName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "note",
+            "columnName": "note",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "interfaceIDs_backing.nightscoutSystemId",
+            "columnName": "nightscoutSystemId",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "interfaceIDs_backing.nightscoutId",
+            "columnName": "nightscoutId",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "interfaceIDs_backing.pumpType",
+            "columnName": "pumpType",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "interfaceIDs_backing.pumpSerial",
+            "columnName": "pumpSerial",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "interfaceIDs_backing.temporaryId",
+            "columnName": "temporaryId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "interfaceIDs_backing.pumpId",
+            "columnName": "pumpId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "interfaceIDs_backing.startId",
+            "columnName": "startId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "interfaceIDs_backing.endId",
+            "columnName": "endId",
+            "affinity": "INTEGER",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [
+          {
+            "name": "index_bolusCalculatorResults_referenceId",
+            "unique": false,
+            "columnNames": [
+              "referenceId"
+            ],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_bolusCalculatorResults_referenceId` ON `${TABLE_NAME}` (`referenceId`)"
+          },
+          {
+            "name": "index_bolusCalculatorResults_timestamp",
+            "unique": false,
+            "columnNames": [
+              "timestamp"
+            ],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_bolusCalculatorResults_timestamp` ON `${TABLE_NAME}` (`timestamp`)"
+          },
+          {
+            "name": "index_bolusCalculatorResults_id",
+            "unique": false,
+            "columnNames": [
+              "id"
+            ],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_bolusCalculatorResults_id` ON `${TABLE_NAME}` (`id`)"
+          },
+          {
+            "name": "index_bolusCalculatorResults_isValid",
+            "unique": false,
+            "columnNames": [
+              "isValid"
+            ],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_bolusCalculatorResults_isValid` ON `${TABLE_NAME}` (`isValid`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "bolusCalculatorResults",
+            "onDelete": "NO ACTION",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "referenceId"
+            ],
+            "referencedColumns": [
+              "id"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "carbs",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `version` INTEGER NOT NULL, `dateCreated` INTEGER NOT NULL, `isValid` INTEGER NOT NULL, `referenceId` INTEGER, `timestamp` INTEGER NOT NULL, `utcOffset` INTEGER NOT NULL, `duration` INTEGER NOT NULL, `amount` REAL NOT NULL, `nightscoutSystemId` TEXT, `nightscoutId` TEXT, `pumpType` TEXT, `pumpSerial` TEXT, `temporaryId` INTEGER, `pumpId` INTEGER, `startId` INTEGER, `endId` INTEGER, FOREIGN KEY(`referenceId`) REFERENCES `carbs`(`id`) ON UPDATE NO ACTION ON DELETE NO ACTION )",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "version",
+            "columnName": "version",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "dateCreated",
+            "columnName": "dateCreated",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isValid",
+            "columnName": "isValid",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "referenceId",
+            "columnName": "referenceId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "timestamp",
+            "columnName": "timestamp",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "utcOffset",
+            "columnName": "utcOffset",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "duration",
+            "columnName": "duration",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "amount",
+            "columnName": "amount",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "interfaceIDs_backing.nightscoutSystemId",
+            "columnName": "nightscoutSystemId",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "interfaceIDs_backing.nightscoutId",
+            "columnName": "nightscoutId",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "interfaceIDs_backing.pumpType",
+            "columnName": "pumpType",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "interfaceIDs_backing.pumpSerial",
+            "columnName": "pumpSerial",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "interfaceIDs_backing.temporaryId",
+            "columnName": "temporaryId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "interfaceIDs_backing.pumpId",
+            "columnName": "pumpId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "interfaceIDs_backing.startId",
+            "columnName": "startId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "interfaceIDs_backing.endId",
+            "columnName": "endId",
+            "affinity": "INTEGER",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [
+          {
+            "name": "index_carbs_id",
+            "unique": false,
+            "columnNames": [
+              "id"
+            ],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_carbs_id` ON `${TABLE_NAME}` (`id`)"
+          },
+          {
+            "name": "index_carbs_isValid",
+            "unique": false,
+            "columnNames": [
+              "isValid"
+            ],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_carbs_isValid` ON `${TABLE_NAME}` (`isValid`)"
+          },
+          {
+            "name": "index_carbs_nightscoutId",
+            "unique": false,
+            "columnNames": [
+              "nightscoutId"
+            ],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_carbs_nightscoutId` ON `${TABLE_NAME}` (`nightscoutId`)"
+          },
+          {
+            "name": "index_carbs_referenceId",
+            "unique": false,
+            "columnNames": [
+              "referenceId"
+            ],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_carbs_referenceId` ON `${TABLE_NAME}` (`referenceId`)"
+          },
+          {
+            "name": "index_carbs_timestamp",
+            "unique": false,
+            "columnNames": [
+              "timestamp"
+            ],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_carbs_timestamp` ON `${TABLE_NAME}` (`timestamp`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "carbs",
+            "onDelete": "NO ACTION",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "referenceId"
+            ],
+            "referencedColumns": [
+              "id"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "effectiveProfileSwitches",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `version` INTEGER NOT NULL, `dateCreated` INTEGER NOT NULL, `isValid` INTEGER NOT NULL, `referenceId` INTEGER, `timestamp` INTEGER NOT NULL, `utcOffset` INTEGER NOT NULL, `basalBlocks` TEXT NOT NULL, `isfBlocks` TEXT NOT NULL, `icBlocks` TEXT NOT NULL, `targetBlocks` TEXT NOT NULL, `glucoseUnit` TEXT NOT NULL, `originalProfileName` TEXT NOT NULL, `originalCustomizedName` TEXT NOT NULL, `originalTimeshift` INTEGER NOT NULL, `originalPercentage` INTEGER NOT NULL, `originalDuration` INTEGER NOT NULL, `originalEnd` INTEGER NOT NULL, `nightscoutSystemId` TEXT, `nightscoutId` TEXT, `pumpType` TEXT, `pumpSerial` TEXT, `temporaryId` INTEGER, `pumpId` INTEGER, `startId` INTEGER, `endId` INTEGER, `insulinLabel` TEXT NOT NULL, `insulinEndTime` INTEGER NOT NULL, `peak` INTEGER NOT NULL, FOREIGN KEY(`referenceId`) REFERENCES `effectiveProfileSwitches`(`id`) ON UPDATE NO ACTION ON DELETE NO ACTION )",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "version",
+            "columnName": "version",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "dateCreated",
+            "columnName": "dateCreated",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isValid",
+            "columnName": "isValid",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "referenceId",
+            "columnName": "referenceId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "timestamp",
+            "columnName": "timestamp",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "utcOffset",
+            "columnName": "utcOffset",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "basalBlocks",
+            "columnName": "basalBlocks",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isfBlocks",
+            "columnName": "isfBlocks",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "icBlocks",
+            "columnName": "icBlocks",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "targetBlocks",
+            "columnName": "targetBlocks",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "glucoseUnit",
+            "columnName": "glucoseUnit",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "originalProfileName",
+            "columnName": "originalProfileName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "originalCustomizedName",
+            "columnName": "originalCustomizedName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "originalTimeshift",
+            "columnName": "originalTimeshift",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "originalPercentage",
+            "columnName": "originalPercentage",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "originalDuration",
+            "columnName": "originalDuration",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "originalEnd",
+            "columnName": "originalEnd",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "interfaceIDs_backing.nightscoutSystemId",
+            "columnName": "nightscoutSystemId",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "interfaceIDs_backing.nightscoutId",
+            "columnName": "nightscoutId",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "interfaceIDs_backing.pumpType",
+            "columnName": "pumpType",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "interfaceIDs_backing.pumpSerial",
+            "columnName": "pumpSerial",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "interfaceIDs_backing.temporaryId",
+            "columnName": "temporaryId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "interfaceIDs_backing.pumpId",
+            "columnName": "pumpId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "interfaceIDs_backing.startId",
+            "columnName": "startId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "interfaceIDs_backing.endId",
+            "columnName": "endId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "insulinConfiguration.insulinLabel",
+            "columnName": "insulinLabel",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "insulinConfiguration.insulinEndTime",
+            "columnName": "insulinEndTime",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "insulinConfiguration.peak",
+            "columnName": "peak",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [
+          {
+            "name": "index_effectiveProfileSwitches_id",
+            "unique": false,
+            "columnNames": [
+              "id"
+            ],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_effectiveProfileSwitches_id` ON `${TABLE_NAME}` (`id`)"
+          },
+          {
+            "name": "index_effectiveProfileSwitches_referenceId",
+            "unique": false,
+            "columnNames": [
+              "referenceId"
+            ],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_effectiveProfileSwitches_referenceId` ON `${TABLE_NAME}` (`referenceId`)"
+          },
+          {
+            "name": "index_effectiveProfileSwitches_timestamp",
+            "unique": false,
+            "columnNames": [
+              "timestamp"
+            ],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_effectiveProfileSwitches_timestamp` ON `${TABLE_NAME}` (`timestamp`)"
+          },
+          {
+            "name": "index_effectiveProfileSwitches_isValid",
+            "unique": false,
+            "columnNames": [
+              "isValid"
+            ],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_effectiveProfileSwitches_isValid` ON `${TABLE_NAME}` (`isValid`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "effectiveProfileSwitches",
+            "onDelete": "NO ACTION",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "referenceId"
+            ],
+            "referencedColumns": [
+              "id"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "extendedBoluses",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `version` INTEGER NOT NULL, `dateCreated` INTEGER NOT NULL, `isValid` INTEGER NOT NULL, `referenceId` INTEGER, `timestamp` INTEGER NOT NULL, `utcOffset` INTEGER NOT NULL, `duration` INTEGER NOT NULL, `amount` REAL NOT NULL, `isEmulatingTempBasal` INTEGER NOT NULL, `nightscoutSystemId` TEXT, `nightscoutId` TEXT, `pumpType` TEXT, `pumpSerial` TEXT, `temporaryId` INTEGER, `pumpId` INTEGER, `startId` INTEGER, `endId` INTEGER, FOREIGN KEY(`referenceId`) REFERENCES `extendedBoluses`(`id`) ON UPDATE NO ACTION ON DELETE NO ACTION )",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "version",
+            "columnName": "version",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "dateCreated",
+            "columnName": "dateCreated",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isValid",
+            "columnName": "isValid",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "referenceId",
+            "columnName": "referenceId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "timestamp",
+            "columnName": "timestamp",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "utcOffset",
+            "columnName": "utcOffset",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "duration",
+            "columnName": "duration",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "amount",
+            "columnName": "amount",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isEmulatingTempBasal",
+            "columnName": "isEmulatingTempBasal",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "interfaceIDs_backing.nightscoutSystemId",
+            "columnName": "nightscoutSystemId",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "interfaceIDs_backing.nightscoutId",
+            "columnName": "nightscoutId",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "interfaceIDs_backing.pumpType",
+            "columnName": "pumpType",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "interfaceIDs_backing.pumpSerial",
+            "columnName": "pumpSerial",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "interfaceIDs_backing.temporaryId",
+            "columnName": "temporaryId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "interfaceIDs_backing.pumpId",
+            "columnName": "pumpId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "interfaceIDs_backing.startId",
+            "columnName": "startId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "interfaceIDs_backing.endId",
+            "columnName": "endId",
+            "affinity": "INTEGER",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [
+          {
+            "name": "index_extendedBoluses_id",
+            "unique": false,
+            "columnNames": [
+              "id"
+            ],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_extendedBoluses_id` ON `${TABLE_NAME}` (`id`)"
+          },
+          {
+            "name": "index_extendedBoluses_isValid",
+            "unique": false,
+            "columnNames": [
+              "isValid"
+            ],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_extendedBoluses_isValid` ON `${TABLE_NAME}` (`isValid`)"
+          },
+          {
+            "name": "index_extendedBoluses_endId",
+            "unique": false,
+            "columnNames": [
+              "endId"
+            ],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_extendedBoluses_endId` ON `${TABLE_NAME}` (`endId`)"
+          },
+          {
+            "name": "index_extendedBoluses_pumpSerial",
+            "unique": false,
+            "columnNames": [
+              "pumpSerial"
+            ],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_extendedBoluses_pumpSerial` ON `${TABLE_NAME}` (`pumpSerial`)"
+          },
+          {
+            "name": "index_extendedBoluses_pumpId",
+            "unique": false,
+            "columnNames": [
+              "pumpId"
+            ],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_extendedBoluses_pumpId` ON `${TABLE_NAME}` (`pumpId`)"
+          },
+          {
+            "name": "index_extendedBoluses_pumpType",
+            "unique": false,
+            "columnNames": [
+              "pumpType"
+            ],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_extendedBoluses_pumpType` ON `${TABLE_NAME}` (`pumpType`)"
+          },
+          {
+            "name": "index_extendedBoluses_referenceId",
+            "unique": false,
+            "columnNames": [
+              "referenceId"
+            ],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_extendedBoluses_referenceId` ON `${TABLE_NAME}` (`referenceId`)"
+          },
+          {
+            "name": "index_extendedBoluses_timestamp",
+            "unique": false,
+            "columnNames": [
+              "timestamp"
+            ],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_extendedBoluses_timestamp` ON `${TABLE_NAME}` (`timestamp`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "extendedBoluses",
+            "onDelete": "NO ACTION",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "referenceId"
+            ],
+            "referencedColumns": [
+              "id"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "glucoseValues",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `version` INTEGER NOT NULL, `dateCreated` INTEGER NOT NULL, `isValid` INTEGER NOT NULL, `referenceId` INTEGER, `timestamp` INTEGER NOT NULL, `utcOffset` INTEGER NOT NULL, `raw` REAL, `value` REAL NOT NULL, `trendArrow` TEXT NOT NULL, `noise` REAL, `sourceSensor` TEXT NOT NULL, `nightscoutSystemId` TEXT, `nightscoutId` TEXT, `pumpType` TEXT, `pumpSerial` TEXT, `temporaryId` INTEGER, `pumpId` INTEGER, `startId` INTEGER, `endId` INTEGER, FOREIGN KEY(`referenceId`) REFERENCES `glucoseValues`(`id`) ON UPDATE NO ACTION ON DELETE NO ACTION )",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "version",
+            "columnName": "version",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "dateCreated",
+            "columnName": "dateCreated",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isValid",
+            "columnName": "isValid",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "referenceId",
+            "columnName": "referenceId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "timestamp",
+            "columnName": "timestamp",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "utcOffset",
+            "columnName": "utcOffset",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "raw",
+            "columnName": "raw",
+            "affinity": "REAL",
+            "notNull": false
+          },
+          {
+            "fieldPath": "value",
+            "columnName": "value",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "trendArrow",
+            "columnName": "trendArrow",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "noise",
+            "columnName": "noise",
+            "affinity": "REAL",
+            "notNull": false
+          },
+          {
+            "fieldPath": "sourceSensor",
+            "columnName": "sourceSensor",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "interfaceIDs_backing.nightscoutSystemId",
+            "columnName": "nightscoutSystemId",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "interfaceIDs_backing.nightscoutId",
+            "columnName": "nightscoutId",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "interfaceIDs_backing.pumpType",
+            "columnName": "pumpType",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "interfaceIDs_backing.pumpSerial",
+            "columnName": "pumpSerial",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "interfaceIDs_backing.temporaryId",
+            "columnName": "temporaryId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "interfaceIDs_backing.pumpId",
+            "columnName": "pumpId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "interfaceIDs_backing.startId",
+            "columnName": "startId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "interfaceIDs_backing.endId",
+            "columnName": "endId",
+            "affinity": "INTEGER",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [
+          {
+            "name": "index_glucoseValues_id",
+            "unique": false,
+            "columnNames": [
+              "id"
+            ],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_glucoseValues_id` ON `${TABLE_NAME}` (`id`)"
+          },
+          {
+            "name": "index_glucoseValues_nightscoutId",
+            "unique": false,
+            "columnNames": [
+              "nightscoutId"
+            ],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_glucoseValues_nightscoutId` ON `${TABLE_NAME}` (`nightscoutId`)"
+          },
+          {
+            "name": "index_glucoseValues_sourceSensor",
+            "unique": false,
+            "columnNames": [
+              "sourceSensor"
+            ],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_glucoseValues_sourceSensor` ON `${TABLE_NAME}` (`sourceSensor`)"
+          },
+          {
+            "name": "index_glucoseValues_referenceId",
+            "unique": false,
+            "columnNames": [
+              "referenceId"
+            ],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_glucoseValues_referenceId` ON `${TABLE_NAME}` (`referenceId`)"
+          },
+          {
+            "name": "index_glucoseValues_timestamp",
+            "unique": false,
+            "columnNames": [
+              "timestamp"
+            ],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_glucoseValues_timestamp` ON `${TABLE_NAME}` (`timestamp`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "glucoseValues",
+            "onDelete": "NO ACTION",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "referenceId"
+            ],
+            "referencedColumns": [
+              "id"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "profileSwitches",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `version` INTEGER NOT NULL, `dateCreated` INTEGER NOT NULL, `isValid` INTEGER NOT NULL, `referenceId` INTEGER, `timestamp` INTEGER NOT NULL, `utcOffset` INTEGER NOT NULL, `basalBlocks` TEXT NOT NULL, `isfBlocks` TEXT NOT NULL, `icBlocks` TEXT NOT NULL, `targetBlocks` TEXT NOT NULL, `glucoseUnit` TEXT NOT NULL, `profileName` TEXT NOT NULL, `timeshift` INTEGER NOT NULL, `percentage` INTEGER NOT NULL, `duration` INTEGER NOT NULL, `nightscoutSystemId` TEXT, `nightscoutId` TEXT, `pumpType` TEXT, `pumpSerial` TEXT, `temporaryId` INTEGER, `pumpId` INTEGER, `startId` INTEGER, `endId` INTEGER, `insulinLabel` TEXT NOT NULL, `insulinEndTime` INTEGER NOT NULL, `peak` INTEGER NOT NULL, FOREIGN KEY(`referenceId`) REFERENCES `profileSwitches`(`id`) ON UPDATE NO ACTION ON DELETE NO ACTION )",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "version",
+            "columnName": "version",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "dateCreated",
+            "columnName": "dateCreated",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isValid",
+            "columnName": "isValid",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "referenceId",
+            "columnName": "referenceId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "timestamp",
+            "columnName": "timestamp",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "utcOffset",
+            "columnName": "utcOffset",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "basalBlocks",
+            "columnName": "basalBlocks",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isfBlocks",
+            "columnName": "isfBlocks",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "icBlocks",
+            "columnName": "icBlocks",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "targetBlocks",
+            "columnName": "targetBlocks",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "glucoseUnit",
+            "columnName": "glucoseUnit",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "profileName",
+            "columnName": "profileName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "timeshift",
+            "columnName": "timeshift",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "percentage",
+            "columnName": "percentage",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "duration",
+            "columnName": "duration",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "interfaceIDs_backing.nightscoutSystemId",
+            "columnName": "nightscoutSystemId",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "interfaceIDs_backing.nightscoutId",
+            "columnName": "nightscoutId",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "interfaceIDs_backing.pumpType",
+            "columnName": "pumpType",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "interfaceIDs_backing.pumpSerial",
+            "columnName": "pumpSerial",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "interfaceIDs_backing.temporaryId",
+            "columnName": "temporaryId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "interfaceIDs_backing.pumpId",
+            "columnName": "pumpId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "interfaceIDs_backing.startId",
+            "columnName": "startId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "interfaceIDs_backing.endId",
+            "columnName": "endId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "insulinConfiguration.insulinLabel",
+            "columnName": "insulinLabel",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "insulinConfiguration.insulinEndTime",
+            "columnName": "insulinEndTime",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "insulinConfiguration.peak",
+            "columnName": "peak",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [
+          {
+            "name": "index_profileSwitches_referenceId",
+            "unique": false,
+            "columnNames": [
+              "referenceId"
+            ],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_profileSwitches_referenceId` ON `${TABLE_NAME}` (`referenceId`)"
+          },
+          {
+            "name": "index_profileSwitches_timestamp",
+            "unique": false,
+            "columnNames": [
+              "timestamp"
+            ],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_profileSwitches_timestamp` ON `${TABLE_NAME}` (`timestamp`)"
+          },
+          {
+            "name": "index_profileSwitches_isValid",
+            "unique": false,
+            "columnNames": [
+              "isValid"
+            ],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_profileSwitches_isValid` ON `${TABLE_NAME}` (`isValid`)"
+          },
+          {
+            "name": "index_profileSwitches_id",
+            "unique": false,
+            "columnNames": [
+              "id"
+            ],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_profileSwitches_id` ON `${TABLE_NAME}` (`id`)"
+          },
+          {
+            "name": "index_profileSwitches_nightscoutId",
+            "unique": false,
+            "columnNames": [
+              "nightscoutId"
+            ],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_profileSwitches_nightscoutId` ON `${TABLE_NAME}` (`nightscoutId`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "profileSwitches",
+            "onDelete": "NO ACTION",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "referenceId"
+            ],
+            "referencedColumns": [
+              "id"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "temporaryBasals",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `version` INTEGER NOT NULL, `dateCreated` INTEGER NOT NULL, `isValid` INTEGER NOT NULL, `referenceId` INTEGER, `timestamp` INTEGER NOT NULL, `utcOffset` INTEGER NOT NULL, `type` TEXT NOT NULL, `isAbsolute` INTEGER NOT NULL, `rate` REAL NOT NULL, `duration` INTEGER NOT NULL, `nightscoutSystemId` TEXT, `nightscoutId` TEXT, `pumpType` TEXT, `pumpSerial` TEXT, `temporaryId` INTEGER, `pumpId` INTEGER, `startId` INTEGER, `endId` INTEGER, FOREIGN KEY(`referenceId`) REFERENCES `temporaryBasals`(`id`) ON UPDATE NO ACTION ON DELETE NO ACTION )",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "version",
+            "columnName": "version",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "dateCreated",
+            "columnName": "dateCreated",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isValid",
+            "columnName": "isValid",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "referenceId",
+            "columnName": "referenceId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "timestamp",
+            "columnName": "timestamp",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "utcOffset",
+            "columnName": "utcOffset",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isAbsolute",
+            "columnName": "isAbsolute",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "rate",
+            "columnName": "rate",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "duration",
+            "columnName": "duration",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "interfaceIDs_backing.nightscoutSystemId",
+            "columnName": "nightscoutSystemId",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "interfaceIDs_backing.nightscoutId",
+            "columnName": "nightscoutId",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "interfaceIDs_backing.pumpType",
+            "columnName": "pumpType",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "interfaceIDs_backing.pumpSerial",
+            "columnName": "pumpSerial",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "interfaceIDs_backing.temporaryId",
+            "columnName": "temporaryId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "interfaceIDs_backing.pumpId",
+            "columnName": "pumpId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "interfaceIDs_backing.startId",
+            "columnName": "startId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "interfaceIDs_backing.endId",
+            "columnName": "endId",
+            "affinity": "INTEGER",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [
+          {
+            "name": "index_temporaryBasals_id",
+            "unique": false,
+            "columnNames": [
+              "id"
+            ],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_temporaryBasals_id` ON `${TABLE_NAME}` (`id`)"
+          },
+          {
+            "name": "index_temporaryBasals_isValid",
+            "unique": false,
+            "columnNames": [
+              "isValid"
+            ],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_temporaryBasals_isValid` ON `${TABLE_NAME}` (`isValid`)"
+          },
+          {
+            "name": "index_temporaryBasals_nightscoutId",
+            "unique": false,
+            "columnNames": [
+              "nightscoutId"
+            ],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_temporaryBasals_nightscoutId` ON `${TABLE_NAME}` (`nightscoutId`)"
+          },
+          {
+            "name": "index_temporaryBasals_pumpType",
+            "unique": false,
+            "columnNames": [
+              "pumpType"
+            ],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_temporaryBasals_pumpType` ON `${TABLE_NAME}` (`pumpType`)"
+          },
+          {
+            "name": "index_temporaryBasals_endId",
+            "unique": false,
+            "columnNames": [
+              "endId"
+            ],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_temporaryBasals_endId` ON `${TABLE_NAME}` (`endId`)"
+          },
+          {
+            "name": "index_temporaryBasals_pumpSerial",
+            "unique": false,
+            "columnNames": [
+              "pumpSerial"
+            ],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_temporaryBasals_pumpSerial` ON `${TABLE_NAME}` (`pumpSerial`)"
+          },
+          {
+            "name": "index_temporaryBasals_temporaryId",
+            "unique": false,
+            "columnNames": [
+              "temporaryId"
+            ],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_temporaryBasals_temporaryId` ON `${TABLE_NAME}` (`temporaryId`)"
+          },
+          {
+            "name": "index_temporaryBasals_referenceId",
+            "unique": false,
+            "columnNames": [
+              "referenceId"
+            ],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_temporaryBasals_referenceId` ON `${TABLE_NAME}` (`referenceId`)"
+          },
+          {
+            "name": "index_temporaryBasals_timestamp",
+            "unique": false,
+            "columnNames": [
+              "timestamp"
+            ],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_temporaryBasals_timestamp` ON `${TABLE_NAME}` (`timestamp`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "temporaryBasals",
+            "onDelete": "NO ACTION",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "referenceId"
+            ],
+            "referencedColumns": [
+              "id"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "temporaryTargets",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `version` INTEGER NOT NULL, `dateCreated` INTEGER NOT NULL, `isValid` INTEGER NOT NULL, `referenceId` INTEGER, `timestamp` INTEGER NOT NULL, `utcOffset` INTEGER NOT NULL, `reason` TEXT NOT NULL, `highTarget` REAL NOT NULL, `lowTarget` REAL NOT NULL, `duration` INTEGER NOT NULL, `nightscoutSystemId` TEXT, `nightscoutId` TEXT, `pumpType` TEXT, `pumpSerial` TEXT, `temporaryId` INTEGER, `pumpId` INTEGER, `startId` INTEGER, `endId` INTEGER, FOREIGN KEY(`referenceId`) REFERENCES `temporaryTargets`(`id`) ON UPDATE NO ACTION ON DELETE NO ACTION )",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "version",
+            "columnName": "version",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "dateCreated",
+            "columnName": "dateCreated",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isValid",
+            "columnName": "isValid",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "referenceId",
+            "columnName": "referenceId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "timestamp",
+            "columnName": "timestamp",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "utcOffset",
+            "columnName": "utcOffset",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "reason",
+            "columnName": "reason",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "highTarget",
+            "columnName": "highTarget",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "lowTarget",
+            "columnName": "lowTarget",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "duration",
+            "columnName": "duration",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "interfaceIDs_backing.nightscoutSystemId",
+            "columnName": "nightscoutSystemId",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "interfaceIDs_backing.nightscoutId",
+            "columnName": "nightscoutId",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "interfaceIDs_backing.pumpType",
+            "columnName": "pumpType",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "interfaceIDs_backing.pumpSerial",
+            "columnName": "pumpSerial",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "interfaceIDs_backing.temporaryId",
+            "columnName": "temporaryId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "interfaceIDs_backing.pumpId",
+            "columnName": "pumpId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "interfaceIDs_backing.startId",
+            "columnName": "startId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "interfaceIDs_backing.endId",
+            "columnName": "endId",
+            "affinity": "INTEGER",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [
+          {
+            "name": "index_temporaryTargets_id",
+            "unique": false,
+            "columnNames": [
+              "id"
+            ],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_temporaryTargets_id` ON `${TABLE_NAME}` (`id`)"
+          },
+          {
+            "name": "index_temporaryTargets_isValid",
+            "unique": false,
+            "columnNames": [
+              "isValid"
+            ],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_temporaryTargets_isValid` ON `${TABLE_NAME}` (`isValid`)"
+          },
+          {
+            "name": "index_temporaryTargets_nightscoutId",
+            "unique": false,
+            "columnNames": [
+              "nightscoutId"
+            ],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_temporaryTargets_nightscoutId` ON `${TABLE_NAME}` (`nightscoutId`)"
+          },
+          {
+            "name": "index_temporaryTargets_referenceId",
+            "unique": false,
+            "columnNames": [
+              "referenceId"
+            ],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_temporaryTargets_referenceId` ON `${TABLE_NAME}` (`referenceId`)"
+          },
+          {
+            "name": "index_temporaryTargets_timestamp",
+            "unique": false,
+            "columnNames": [
+              "timestamp"
+            ],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_temporaryTargets_timestamp` ON `${TABLE_NAME}` (`timestamp`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "temporaryTargets",
+            "onDelete": "NO ACTION",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "referenceId"
+            ],
+            "referencedColumns": [
+              "id"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "therapyEvents",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `version` INTEGER NOT NULL, `dateCreated` INTEGER NOT NULL, `isValid` INTEGER NOT NULL, `referenceId` INTEGER, `timestamp` INTEGER NOT NULL, `utcOffset` INTEGER NOT NULL, `duration` INTEGER NOT NULL, `type` TEXT NOT NULL, `note` TEXT, `enteredBy` TEXT, `glucose` REAL, `glucoseType` TEXT, `glucoseUnit` TEXT NOT NULL, `nightscoutSystemId` TEXT, `nightscoutId` TEXT, `pumpType` TEXT, `pumpSerial` TEXT, `temporaryId` INTEGER, `pumpId` INTEGER, `startId` INTEGER, `endId` INTEGER, FOREIGN KEY(`referenceId`) REFERENCES `therapyEvents`(`id`) ON UPDATE NO ACTION ON DELETE NO ACTION )",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "version",
+            "columnName": "version",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "dateCreated",
+            "columnName": "dateCreated",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isValid",
+            "columnName": "isValid",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "referenceId",
+            "columnName": "referenceId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "timestamp",
+            "columnName": "timestamp",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "utcOffset",
+            "columnName": "utcOffset",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "duration",
+            "columnName": "duration",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "note",
+            "columnName": "note",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "enteredBy",
+            "columnName": "enteredBy",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "glucose",
+            "columnName": "glucose",
+            "affinity": "REAL",
+            "notNull": false
+          },
+          {
+            "fieldPath": "glucoseType",
+            "columnName": "glucoseType",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "glucoseUnit",
+            "columnName": "glucoseUnit",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "interfaceIDs_backing.nightscoutSystemId",
+            "columnName": "nightscoutSystemId",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "interfaceIDs_backing.nightscoutId",
+            "columnName": "nightscoutId",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "interfaceIDs_backing.pumpType",
+            "columnName": "pumpType",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "interfaceIDs_backing.pumpSerial",
+            "columnName": "pumpSerial",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "interfaceIDs_backing.temporaryId",
+            "columnName": "temporaryId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "interfaceIDs_backing.pumpId",
+            "columnName": "pumpId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "interfaceIDs_backing.startId",
+            "columnName": "startId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "interfaceIDs_backing.endId",
+            "columnName": "endId",
+            "affinity": "INTEGER",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [
+          {
+            "name": "index_therapyEvents_id",
+            "unique": false,
+            "columnNames": [
+              "id"
+            ],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_therapyEvents_id` ON `${TABLE_NAME}` (`id`)"
+          },
+          {
+            "name": "index_therapyEvents_type",
+            "unique": false,
+            "columnNames": [
+              "type"
+            ],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_therapyEvents_type` ON `${TABLE_NAME}` (`type`)"
+          },
+          {
+            "name": "index_therapyEvents_nightscoutId",
+            "unique": false,
+            "columnNames": [
+              "nightscoutId"
+            ],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_therapyEvents_nightscoutId` ON `${TABLE_NAME}` (`nightscoutId`)"
+          },
+          {
+            "name": "index_therapyEvents_isValid",
+            "unique": false,
+            "columnNames": [
+              "isValid"
+            ],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_therapyEvents_isValid` ON `${TABLE_NAME}` (`isValid`)"
+          },
+          {
+            "name": "index_therapyEvents_referenceId",
+            "unique": false,
+            "columnNames": [
+              "referenceId"
+            ],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_therapyEvents_referenceId` ON `${TABLE_NAME}` (`referenceId`)"
+          },
+          {
+            "name": "index_therapyEvents_timestamp",
+            "unique": false,
+            "columnNames": [
+              "timestamp"
+            ],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_therapyEvents_timestamp` ON `${TABLE_NAME}` (`timestamp`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "therapyEvents",
+            "onDelete": "NO ACTION",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "referenceId"
+            ],
+            "referencedColumns": [
+              "id"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "totalDailyDoses",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `version` INTEGER NOT NULL, `dateCreated` INTEGER NOT NULL, `isValid` INTEGER NOT NULL, `referenceId` INTEGER, `timestamp` INTEGER NOT NULL, `utcOffset` INTEGER NOT NULL, `basalAmount` REAL NOT NULL, `bolusAmount` REAL NOT NULL, `totalAmount` REAL NOT NULL, `carbs` REAL NOT NULL, `nightscoutSystemId` TEXT, `nightscoutId` TEXT, `pumpType` TEXT, `pumpSerial` TEXT, `temporaryId` INTEGER, `pumpId` INTEGER, `startId` INTEGER, `endId` INTEGER, FOREIGN KEY(`referenceId`) REFERENCES `totalDailyDoses`(`id`) ON UPDATE NO ACTION ON DELETE NO ACTION )",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "version",
+            "columnName": "version",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "dateCreated",
+            "columnName": "dateCreated",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isValid",
+            "columnName": "isValid",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "referenceId",
+            "columnName": "referenceId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "timestamp",
+            "columnName": "timestamp",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "utcOffset",
+            "columnName": "utcOffset",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "basalAmount",
+            "columnName": "basalAmount",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "bolusAmount",
+            "columnName": "bolusAmount",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "totalAmount",
+            "columnName": "totalAmount",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "carbs",
+            "columnName": "carbs",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "interfaceIDs_backing.nightscoutSystemId",
+            "columnName": "nightscoutSystemId",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "interfaceIDs_backing.nightscoutId",
+            "columnName": "nightscoutId",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "interfaceIDs_backing.pumpType",
+            "columnName": "pumpType",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "interfaceIDs_backing.pumpSerial",
+            "columnName": "pumpSerial",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "interfaceIDs_backing.temporaryId",
+            "columnName": "temporaryId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "interfaceIDs_backing.pumpId",
+            "columnName": "pumpId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "interfaceIDs_backing.startId",
+            "columnName": "startId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "interfaceIDs_backing.endId",
+            "columnName": "endId",
+            "affinity": "INTEGER",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [
+          {
+            "name": "index_totalDailyDoses_id",
+            "unique": false,
+            "columnNames": [
+              "id"
+            ],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_totalDailyDoses_id` ON `${TABLE_NAME}` (`id`)"
+          },
+          {
+            "name": "index_totalDailyDoses_pumpId",
+            "unique": false,
+            "columnNames": [
+              "pumpId"
+            ],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_totalDailyDoses_pumpId` ON `${TABLE_NAME}` (`pumpId`)"
+          },
+          {
+            "name": "index_totalDailyDoses_pumpType",
+            "unique": false,
+            "columnNames": [
+              "pumpType"
+            ],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_totalDailyDoses_pumpType` ON `${TABLE_NAME}` (`pumpType`)"
+          },
+          {
+            "name": "index_totalDailyDoses_pumpSerial",
+            "unique": false,
+            "columnNames": [
+              "pumpSerial"
+            ],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_totalDailyDoses_pumpSerial` ON `${TABLE_NAME}` (`pumpSerial`)"
+          },
+          {
+            "name": "index_totalDailyDoses_isValid",
+            "unique": false,
+            "columnNames": [
+              "isValid"
+            ],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_totalDailyDoses_isValid` ON `${TABLE_NAME}` (`isValid`)"
+          },
+          {
+            "name": "index_totalDailyDoses_referenceId",
+            "unique": false,
+            "columnNames": [
+              "referenceId"
+            ],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_totalDailyDoses_referenceId` ON `${TABLE_NAME}` (`referenceId`)"
+          },
+          {
+            "name": "index_totalDailyDoses_timestamp",
+            "unique": false,
+            "columnNames": [
+              "timestamp"
+            ],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_totalDailyDoses_timestamp` ON `${TABLE_NAME}` (`timestamp`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "totalDailyDoses",
+            "onDelete": "NO ACTION",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "referenceId"
+            ],
+            "referencedColumns": [
+              "id"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "apsResultLinks",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `version` INTEGER NOT NULL, `dateCreated` INTEGER NOT NULL, `isValid` INTEGER NOT NULL, `referenceId` INTEGER, `apsResultId` INTEGER NOT NULL, `smbId` INTEGER, `tbrId` INTEGER, `nightscoutSystemId` TEXT, `nightscoutId` TEXT, `pumpType` TEXT, `pumpSerial` TEXT, `temporaryId` INTEGER, `pumpId` INTEGER, `startId` INTEGER, `endId` INTEGER, FOREIGN KEY(`apsResultId`) REFERENCES `apsResults`(`id`) ON UPDATE NO ACTION ON DELETE NO ACTION , FOREIGN KEY(`smbId`) REFERENCES `boluses`(`id`) ON UPDATE NO ACTION ON DELETE NO ACTION , FOREIGN KEY(`tbrId`) REFERENCES `temporaryBasals`(`id`) ON UPDATE NO ACTION ON DELETE NO ACTION , FOREIGN KEY(`referenceId`) REFERENCES `apsResultLinks`(`id`) ON UPDATE NO ACTION ON DELETE NO ACTION )",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "version",
+            "columnName": "version",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "dateCreated",
+            "columnName": "dateCreated",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isValid",
+            "columnName": "isValid",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "referenceId",
+            "columnName": "referenceId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "apsResultId",
+            "columnName": "apsResultId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "smbId",
+            "columnName": "smbId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "tbrId",
+            "columnName": "tbrId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "interfaceIDs_backing.nightscoutSystemId",
+            "columnName": "nightscoutSystemId",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "interfaceIDs_backing.nightscoutId",
+            "columnName": "nightscoutId",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "interfaceIDs_backing.pumpType",
+            "columnName": "pumpType",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "interfaceIDs_backing.pumpSerial",
+            "columnName": "pumpSerial",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "interfaceIDs_backing.temporaryId",
+            "columnName": "temporaryId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "interfaceIDs_backing.pumpId",
+            "columnName": "pumpId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "interfaceIDs_backing.startId",
+            "columnName": "startId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "interfaceIDs_backing.endId",
+            "columnName": "endId",
+            "affinity": "INTEGER",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [
+          {
+            "name": "index_apsResultLinks_referenceId",
+            "unique": false,
+            "columnNames": [
+              "referenceId"
+            ],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_apsResultLinks_referenceId` ON `${TABLE_NAME}` (`referenceId`)"
+          },
+          {
+            "name": "index_apsResultLinks_apsResultId",
+            "unique": false,
+            "columnNames": [
+              "apsResultId"
+            ],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_apsResultLinks_apsResultId` ON `${TABLE_NAME}` (`apsResultId`)"
+          },
+          {
+            "name": "index_apsResultLinks_smbId",
+            "unique": false,
+            "columnNames": [
+              "smbId"
+            ],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_apsResultLinks_smbId` ON `${TABLE_NAME}` (`smbId`)"
+          },
+          {
+            "name": "index_apsResultLinks_tbrId",
+            "unique": false,
+            "columnNames": [
+              "tbrId"
+            ],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_apsResultLinks_tbrId` ON `${TABLE_NAME}` (`tbrId`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "apsResults",
+            "onDelete": "NO ACTION",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "apsResultId"
+            ],
+            "referencedColumns": [
+              "id"
+            ]
+          },
+          {
+            "table": "boluses",
+            "onDelete": "NO ACTION",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "smbId"
+            ],
+            "referencedColumns": [
+              "id"
+            ]
+          },
+          {
+            "table": "temporaryBasals",
+            "onDelete": "NO ACTION",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "tbrId"
+            ],
+            "referencedColumns": [
+              "id"
+            ]
+          },
+          {
+            "table": "apsResultLinks",
+            "onDelete": "NO ACTION",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "referenceId"
+            ],
+            "referencedColumns": [
+              "id"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "multiwaveBolusLinks",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `version` INTEGER NOT NULL, `dateCreated` INTEGER NOT NULL, `isValid` INTEGER NOT NULL, `referenceId` INTEGER, `bolusId` INTEGER NOT NULL, `extendedBolusId` INTEGER NOT NULL, `nightscoutSystemId` TEXT, `nightscoutId` TEXT, `pumpType` TEXT, `pumpSerial` TEXT, `temporaryId` INTEGER, `pumpId` INTEGER, `startId` INTEGER, `endId` INTEGER, FOREIGN KEY(`bolusId`) REFERENCES `boluses`(`id`) ON UPDATE NO ACTION ON DELETE NO ACTION , FOREIGN KEY(`extendedBolusId`) REFERENCES `extendedBoluses`(`id`) ON UPDATE NO ACTION ON DELETE NO ACTION , FOREIGN KEY(`referenceId`) REFERENCES `multiwaveBolusLinks`(`id`) ON UPDATE NO ACTION ON DELETE NO ACTION )",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "version",
+            "columnName": "version",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "dateCreated",
+            "columnName": "dateCreated",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isValid",
+            "columnName": "isValid",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "referenceId",
+            "columnName": "referenceId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "bolusId",
+            "columnName": "bolusId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "extendedBolusId",
+            "columnName": "extendedBolusId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "interfaceIDs_backing.nightscoutSystemId",
+            "columnName": "nightscoutSystemId",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "interfaceIDs_backing.nightscoutId",
+            "columnName": "nightscoutId",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "interfaceIDs_backing.pumpType",
+            "columnName": "pumpType",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "interfaceIDs_backing.pumpSerial",
+            "columnName": "pumpSerial",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "interfaceIDs_backing.temporaryId",
+            "columnName": "temporaryId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "interfaceIDs_backing.pumpId",
+            "columnName": "pumpId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "interfaceIDs_backing.startId",
+            "columnName": "startId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "interfaceIDs_backing.endId",
+            "columnName": "endId",
+            "affinity": "INTEGER",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [
+          {
+            "name": "index_multiwaveBolusLinks_referenceId",
+            "unique": false,
+            "columnNames": [
+              "referenceId"
+            ],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_multiwaveBolusLinks_referenceId` ON `${TABLE_NAME}` (`referenceId`)"
+          },
+          {
+            "name": "index_multiwaveBolusLinks_bolusId",
+            "unique": false,
+            "columnNames": [
+              "bolusId"
+            ],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_multiwaveBolusLinks_bolusId` ON `${TABLE_NAME}` (`bolusId`)"
+          },
+          {
+            "name": "index_multiwaveBolusLinks_extendedBolusId",
+            "unique": false,
+            "columnNames": [
+              "extendedBolusId"
+            ],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_multiwaveBolusLinks_extendedBolusId` ON `${TABLE_NAME}` (`extendedBolusId`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "boluses",
+            "onDelete": "NO ACTION",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "bolusId"
+            ],
+            "referencedColumns": [
+              "id"
+            ]
+          },
+          {
+            "table": "extendedBoluses",
+            "onDelete": "NO ACTION",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "extendedBolusId"
+            ],
+            "referencedColumns": [
+              "id"
+            ]
+          },
+          {
+            "table": "multiwaveBolusLinks",
+            "onDelete": "NO ACTION",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "referenceId"
+            ],
+            "referencedColumns": [
+              "id"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "preferenceChanges",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `timestamp` INTEGER NOT NULL, `utcOffset` INTEGER NOT NULL, `key` TEXT NOT NULL, `value` TEXT)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "timestamp",
+            "columnName": "timestamp",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "utcOffset",
+            "columnName": "utcOffset",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "key",
+            "columnName": "key",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "value",
+            "columnName": "value",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "versionChanges",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `timestamp` INTEGER NOT NULL, `utcOffset` INTEGER NOT NULL, `versionCode` INTEGER NOT NULL, `versionName` TEXT NOT NULL, `gitRemote` TEXT, `commitHash` TEXT)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "timestamp",
+            "columnName": "timestamp",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "utcOffset",
+            "columnName": "utcOffset",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "versionCode",
+            "columnName": "versionCode",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "versionName",
+            "columnName": "versionName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "gitRemote",
+            "columnName": "gitRemote",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "commitHash",
+            "columnName": "commitHash",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "userEntry",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `timestamp` INTEGER NOT NULL, `utcOffset` INTEGER NOT NULL, `action` TEXT NOT NULL, `source` TEXT NOT NULL, `note` TEXT NOT NULL, `values` TEXT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "timestamp",
+            "columnName": "timestamp",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "utcOffset",
+            "columnName": "utcOffset",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "action",
+            "columnName": "action",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "source",
+            "columnName": "source",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "note",
+            "columnName": "note",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "values",
+            "columnName": "values",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [
+          {
+            "name": "index_userEntry_source",
+            "unique": false,
+            "columnNames": [
+              "source"
+            ],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_userEntry_source` ON `${TABLE_NAME}` (`source`)"
+          },
+          {
+            "name": "index_userEntry_timestamp",
+            "unique": false,
+            "columnNames": [
+              "timestamp"
+            ],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_userEntry_timestamp` ON `${TABLE_NAME}` (`timestamp`)"
+          }
+        ],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "foods",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `version` INTEGER NOT NULL, `dateCreated` INTEGER NOT NULL, `isValid` INTEGER NOT NULL, `referenceId` INTEGER, `name` TEXT NOT NULL, `category` TEXT, `subCategory` TEXT, `portion` REAL NOT NULL, `carbs` INTEGER NOT NULL, `fat` INTEGER, `protein` INTEGER, `energy` INTEGER, `unit` TEXT NOT NULL, `gi` INTEGER, `nightscoutSystemId` TEXT, `nightscoutId` TEXT, `pumpType` TEXT, `pumpSerial` TEXT, `temporaryId` INTEGER, `pumpId` INTEGER, `startId` INTEGER, `endId` INTEGER, FOREIGN KEY(`referenceId`) REFERENCES `foods`(`id`) ON UPDATE NO ACTION ON DELETE NO ACTION )",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "version",
+            "columnName": "version",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "dateCreated",
+            "columnName": "dateCreated",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isValid",
+            "columnName": "isValid",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "referenceId",
+            "columnName": "referenceId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "category",
+            "columnName": "category",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "subCategory",
+            "columnName": "subCategory",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "portion",
+            "columnName": "portion",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "carbs",
+            "columnName": "carbs",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "fat",
+            "columnName": "fat",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "protein",
+            "columnName": "protein",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "energy",
+            "columnName": "energy",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "unit",
+            "columnName": "unit",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "gi",
+            "columnName": "gi",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "interfaceIDs_backing.nightscoutSystemId",
+            "columnName": "nightscoutSystemId",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "interfaceIDs_backing.nightscoutId",
+            "columnName": "nightscoutId",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "interfaceIDs_backing.pumpType",
+            "columnName": "pumpType",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "interfaceIDs_backing.pumpSerial",
+            "columnName": "pumpSerial",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "interfaceIDs_backing.temporaryId",
+            "columnName": "temporaryId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "interfaceIDs_backing.pumpId",
+            "columnName": "pumpId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "interfaceIDs_backing.startId",
+            "columnName": "startId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "interfaceIDs_backing.endId",
+            "columnName": "endId",
+            "affinity": "INTEGER",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [
+          {
+            "name": "index_foods_id",
+            "unique": false,
+            "columnNames": [
+              "id"
+            ],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_foods_id` ON `${TABLE_NAME}` (`id`)"
+          },
+          {
+            "name": "index_foods_nightscoutId",
+            "unique": false,
+            "columnNames": [
+              "nightscoutId"
+            ],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_foods_nightscoutId` ON `${TABLE_NAME}` (`nightscoutId`)"
+          },
+          {
+            "name": "index_foods_referenceId",
+            "unique": false,
+            "columnNames": [
+              "referenceId"
+            ],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_foods_referenceId` ON `${TABLE_NAME}` (`referenceId`)"
+          },
+          {
+            "name": "index_foods_isValid",
+            "unique": false,
+            "columnNames": [
+              "isValid"
+            ],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_foods_isValid` ON `${TABLE_NAME}` (`isValid`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "foods",
+            "onDelete": "NO ACTION",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "referenceId"
+            ],
+            "referencedColumns": [
+              "id"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "deviceStatus",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `timestamp` INTEGER NOT NULL, `utcOffset` INTEGER NOT NULL, `device` TEXT, `pump` TEXT, `enacted` TEXT, `suggested` TEXT, `iob` TEXT, `uploaderBattery` INTEGER NOT NULL, `configuration` TEXT, `nightscoutSystemId` TEXT, `nightscoutId` TEXT, `pumpType` TEXT, `pumpSerial` TEXT, `temporaryId` INTEGER, `pumpId` INTEGER, `startId` INTEGER, `endId` INTEGER)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "timestamp",
+            "columnName": "timestamp",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "utcOffset",
+            "columnName": "utcOffset",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "device",
+            "columnName": "device",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "pump",
+            "columnName": "pump",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "enacted",
+            "columnName": "enacted",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "suggested",
+            "columnName": "suggested",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "iob",
+            "columnName": "iob",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "uploaderBattery",
+            "columnName": "uploaderBattery",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "configuration",
+            "columnName": "configuration",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "interfaceIDs_backing.nightscoutSystemId",
+            "columnName": "nightscoutSystemId",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "interfaceIDs_backing.nightscoutId",
+            "columnName": "nightscoutId",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "interfaceIDs_backing.pumpType",
+            "columnName": "pumpType",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "interfaceIDs_backing.pumpSerial",
+            "columnName": "pumpSerial",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "interfaceIDs_backing.temporaryId",
+            "columnName": "temporaryId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "interfaceIDs_backing.pumpId",
+            "columnName": "pumpId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "interfaceIDs_backing.startId",
+            "columnName": "startId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "interfaceIDs_backing.endId",
+            "columnName": "endId",
+            "affinity": "INTEGER",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [
+          {
+            "name": "index_deviceStatus_id",
+            "unique": false,
+            "columnNames": [
+              "id"
+            ],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_deviceStatus_id` ON `${TABLE_NAME}` (`id`)"
+          },
+          {
+            "name": "index_deviceStatus_nightscoutId",
+            "unique": false,
+            "columnNames": [
+              "nightscoutId"
+            ],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_deviceStatus_nightscoutId` ON `${TABLE_NAME}` (`nightscoutId`)"
+          },
+          {
+            "name": "index_deviceStatus_timestamp",
+            "unique": false,
+            "columnNames": [
+              "timestamp"
+            ],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_deviceStatus_timestamp` ON `${TABLE_NAME}` (`timestamp`)"
+          }
+        ],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "offlineEvents",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `version` INTEGER NOT NULL, `dateCreated` INTEGER NOT NULL, `isValid` INTEGER NOT NULL, `referenceId` INTEGER, `timestamp` INTEGER NOT NULL, `utcOffset` INTEGER NOT NULL, `reason` TEXT NOT NULL, `duration` INTEGER NOT NULL, `nightscoutSystemId` TEXT, `nightscoutId` TEXT, `pumpType` TEXT, `pumpSerial` TEXT, `temporaryId` INTEGER, `pumpId` INTEGER, `startId` INTEGER, `endId` INTEGER, FOREIGN KEY(`referenceId`) REFERENCES `offlineEvents`(`id`) ON UPDATE NO ACTION ON DELETE NO ACTION )",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "version",
+            "columnName": "version",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "dateCreated",
+            "columnName": "dateCreated",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isValid",
+            "columnName": "isValid",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "referenceId",
+            "columnName": "referenceId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "timestamp",
+            "columnName": "timestamp",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "utcOffset",
+            "columnName": "utcOffset",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "reason",
+            "columnName": "reason",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "duration",
+            "columnName": "duration",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "interfaceIDs_backing.nightscoutSystemId",
+            "columnName": "nightscoutSystemId",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "interfaceIDs_backing.nightscoutId",
+            "columnName": "nightscoutId",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "interfaceIDs_backing.pumpType",
+            "columnName": "pumpType",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "interfaceIDs_backing.pumpSerial",
+            "columnName": "pumpSerial",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "interfaceIDs_backing.temporaryId",
+            "columnName": "temporaryId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "interfaceIDs_backing.pumpId",
+            "columnName": "pumpId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "interfaceIDs_backing.startId",
+            "columnName": "startId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "interfaceIDs_backing.endId",
+            "columnName": "endId",
+            "affinity": "INTEGER",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [
+          {
+            "name": "index_offlineEvents_id",
+            "unique": false,
+            "columnNames": [
+              "id"
+            ],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_offlineEvents_id` ON `${TABLE_NAME}` (`id`)"
+          },
+          {
+            "name": "index_offlineEvents_isValid",
+            "unique": false,
+            "columnNames": [
+              "isValid"
+            ],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_offlineEvents_isValid` ON `${TABLE_NAME}` (`isValid`)"
+          },
+          {
+            "name": "index_offlineEvents_nightscoutId",
+            "unique": false,
+            "columnNames": [
+              "nightscoutId"
+            ],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_offlineEvents_nightscoutId` ON `${TABLE_NAME}` (`nightscoutId`)"
+          },
+          {
+            "name": "index_offlineEvents_referenceId",
+            "unique": false,
+            "columnNames": [
+              "referenceId"
+            ],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_offlineEvents_referenceId` ON `${TABLE_NAME}` (`referenceId`)"
+          },
+          {
+            "name": "index_offlineEvents_timestamp",
+            "unique": false,
+            "columnNames": [
+              "timestamp"
+            ],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_offlineEvents_timestamp` ON `${TABLE_NAME}` (`timestamp`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "offlineEvents",
+            "onDelete": "NO ACTION",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "referenceId"
+            ],
+            "referencedColumns": [
+              "id"
+            ]
+          }
+        ]
+      }
+    ],
+    "views": [],
+    "setupQueries": [
+      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, 'e3558dc3bb3136c37dba4f90c97e8bdd')"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/database/src/debug/java/info/nightscout/androidaps/annotations/OpenForTesting.kt b/database/src/debug/java/info/nightscout/androidaps/annotations/OpenForTesting.kt
new file mode 100644
index 0000000000..47be2222ad
--- /dev/null
+++ b/database/src/debug/java/info/nightscout/androidaps/annotations/OpenForTesting.kt
@@ -0,0 +1,15 @@
+package info.nightscout.androidaps.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
\ No newline at end of file
diff --git a/database/src/main/java/info/nightscout/androidaps/database/AppDatabase.kt b/database/src/main/java/info/nightscout/androidaps/database/AppDatabase.kt
index 163590525c..948aa705d6 100644
--- a/database/src/main/java/info/nightscout/androidaps/database/AppDatabase.kt
+++ b/database/src/main/java/info/nightscout/androidaps/database/AppDatabase.kt
@@ -6,14 +6,14 @@ import androidx.room.TypeConverters
 import info.nightscout.androidaps.database.daos.*
 import info.nightscout.androidaps.database.entities.*
 
-const val DATABASE_VERSION = 20
+const val DATABASE_VERSION = 21
 
 @Database(version = DATABASE_VERSION,
     entities = [APSResult::class, Bolus::class, BolusCalculatorResult::class, Carbs::class,
         EffectiveProfileSwitch::class, ExtendedBolus::class, GlucoseValue::class, ProfileSwitch::class,
         TemporaryBasal::class, TemporaryTarget::class, TherapyEvent::class, TotalDailyDose::class, APSResultLink::class,
         MultiwaveBolusLink::class, PreferenceChange::class, VersionChange::class, UserEntry::class,
-        Food::class, DeviceStatus::class],
+        Food::class, DeviceStatus::class, OfflineEvent::class],
     exportSchema = true)
 @TypeConverters(Converters::class)
 internal abstract class AppDatabase : RoomDatabase() {
@@ -56,4 +56,6 @@ internal abstract class AppDatabase : RoomDatabase() {
 
     abstract val deviceStatusDao: DeviceStatusDao
 
+    abstract val offlineEventDao: OfflineEventDao
+
 }
\ No newline at end of file
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 93d92392d1..6654bd1377 100644
--- a/database/src/main/java/info/nightscout/androidaps/database/AppRepository.kt
+++ b/database/src/main/java/info/nightscout/androidaps/database/AppRepository.kt
@@ -1,5 +1,7 @@
 package info.nightscout.androidaps.database
 
+import info.nightscout.androidaps.annotations.OpenForTesting
+import info.nightscout.androidaps.database.data.NewEntries
 import info.nightscout.androidaps.database.entities.*
 import info.nightscout.androidaps.database.interfaces.DBEntry
 import info.nightscout.androidaps.database.transactions.Transaction
@@ -14,8 +16,8 @@ import javax.inject.Inject
 import javax.inject.Singleton
 import kotlin.math.roundToInt
 
-@Singleton
-open class AppRepository @Inject internal constructor(
+@OpenForTesting
+@Singleton class AppRepository @Inject internal constructor(
     internal val database: AppDatabase
 ) {
 
@@ -213,6 +215,11 @@ open class AppRepository @Inject internal constructor(
         return null
     }
 
+    fun getPermanentProfileSwitch(timestamp: Long): ProfileSwitch? =
+        database.profileSwitchDao.getPermanentProfileSwitchActiveAt(timestamp)
+            .subscribeOn(Schedulers.io())
+            .blockingGet()
+
     fun getAllProfileSwitches(): Single<List<ProfileSwitch>> =
         database.profileSwitchDao.getAllProfileSwitches()
             .subscribeOn(Schedulers.io())
@@ -255,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)
     }
@@ -336,8 +347,8 @@ open class AppRepository @Inject internal constructor(
     fun deleteAllTherapyEventsEntries() =
         database.therapyEventDao.deleteAllEntries()
 
-    fun getLastTherapyRecord(type: TherapyEvent.Type): Single<ValueWrapper<TherapyEvent>> =
-        database.therapyEventDao.getLastTherapyRecord(type).toWrappedSingle()
+    fun getLastTherapyRecordUpToNow(type: TherapyEvent.Type): Single<ValueWrapper<TherapyEvent>> =
+        database.therapyEventDao.getLastTherapyRecord(type, System.currentTimeMillis()).toWrappedSingle()
             .subscribeOn(Schedulers.io())
 
     fun getTherapyEventByTimestamp(type: TherapyEvent.Type, timestamp: Long): TherapyEvent? =
@@ -477,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 } }
 
@@ -768,6 +779,82 @@ open class AppRepository @Inject internal constructor(
         database.extendedBolusDao.getLastId()
             .subscribeOn(Schedulers.io())
             .toWrappedSingle()
+
+    // OFFLINE EVENT
+    /*
+       * returns a Pair of the next entity to sync and the ID of the "update".
+       * The update id might either be the entry id itself if it is a new entry - or the id
+       * of the update ("historic") entry. The sync counter should be incremented to that id if it was synced successfully.
+       *
+       * It is a Maybe as there might be no next element.
+       * */
+    fun getNextSyncElementOfflineEvent(id: Long): Maybe<Pair<OfflineEvent, Long>> =
+        database.offlineEventDao.getNextModifiedOrNewAfter(id)
+            .flatMap { nextIdElement ->
+                val nextIdElemReferenceId = nextIdElement.referenceId
+                if (nextIdElemReferenceId == null) {
+                    Maybe.just(nextIdElement to nextIdElement.id)
+                } else {
+                    database.offlineEventDao.getCurrentFromHistoric(nextIdElemReferenceId)
+                        .map { it to nextIdElement.id }
+                }
+            }
+
+    fun compatGetOfflineEventData(): Single<List<OfflineEvent>> =
+        database.offlineEventDao.getOfflineEventData()
+            .subscribeOn(Schedulers.io())
+
+    fun getOfflineEventDataFromTime(timestamp: Long, ascending: Boolean): Single<List<OfflineEvent>> =
+        database.offlineEventDao.getOfflineEventDataFromTime(timestamp)
+            .map { if (!ascending) it.reversed() else it }
+            .subscribeOn(Schedulers.io())
+
+    fun getOfflineEventDataIncludingInvalidFromTime(timestamp: Long, ascending: Boolean): Single<List<OfflineEvent>> =
+        database.offlineEventDao.getOfflineEventDataIncludingInvalidFromTime(timestamp)
+            .map { if (!ascending) it.reversed() else it }
+            .subscribeOn(Schedulers.io())
+
+    fun getOfflineEventDataFromTimeToTime(start: Long, end: Long, ascending: Boolean): Single<List<OfflineEvent>> =
+        database.offlineEventDao.getOfflineEventDataFromTimeToTime(start, end)
+            .map { if (!ascending) it.reversed() else it }
+            .subscribeOn(Schedulers.io())
+
+    fun getModifiedOfflineEventsDataFromId(lastId: Long): Single<List<OfflineEvent>> =
+        database.offlineEventDao.getModifiedFrom(lastId)
+            .subscribeOn(Schedulers.io())
+
+    fun getOfflineEventActiveAt(timestamp: Long): Single<ValueWrapper<OfflineEvent>> =
+        database.offlineEventDao.getOfflineEventActiveAt(timestamp)
+            .subscribeOn(Schedulers.io())
+            .toWrappedSingle()
+
+    fun deleteAllOfflineEventEntries() =
+        database.offlineEventDao.deleteAllEntries()
+
+    fun getLastOfflineEventIdWrapped(): Single<ValueWrapper<Long>> =
+        database.offlineEventDao.getLastId()
+            .subscribeOn(Schedulers.io())
+            .toWrappedSingle()
+
+    suspend fun collectNewEntriesSince(since: Long, until: Long, limit: Int, offset: Int) = NewEntries(
+        apsResults = database.apsResultDao.getNewEntriesSince(since, until, limit, offset),
+        apsResultLinks = database.apsResultLinkDao.getNewEntriesSince(since, until, limit, offset),
+        bolusCalculatorResults = database.bolusCalculatorResultDao.getNewEntriesSince(since, until, limit, offset),
+        boluses = database.bolusDao.getNewEntriesSince(since, until, limit, offset),
+        carbs = database.carbsDao.getNewEntriesSince(since, until, limit, offset),
+        effectiveProfileSwitches = database.effectiveProfileSwitchDao.getNewEntriesSince(since, until, limit, offset),
+        extendedBoluses = database.extendedBolusDao.getNewEntriesSince(since, until, limit, offset),
+        glucoseValues = database.glucoseValueDao.getNewEntriesSince(since, until, limit, offset),
+        multiwaveBolusLinks = database.multiwaveBolusLinkDao.getNewEntriesSince(since, until, limit, offset),
+        offlineEvents = database.offlineEventDao.getNewEntriesSince(since, until, limit, offset),
+        preferencesChanges = database.preferenceChangeDao.getNewEntriesSince(since, until, limit, offset),
+        profileSwitches = database.profileSwitchDao.getNewEntriesSince(since, until, limit, offset),
+        temporaryBasals = database.temporaryBasalDao.getNewEntriesSince(since, until, limit, offset),
+        temporaryTarget = database.temporaryTargetDao.getNewEntriesSince(since, until, limit, offset),
+        therapyEvents = database.therapyEventDao.getNewEntriesSince(since, until, limit, offset),
+        totalDailyDoses = database.totalDailyDoseDao.getNewEntriesSince(since, until, limit, offset),
+        versionChanges = database.versionChangeDao.getNewEntriesSince(since, until, limit, offset),
+    )
 }
 
 @Suppress("USELESS_CAST")
diff --git a/database/src/main/java/info/nightscout/androidaps/database/Converters.kt b/database/src/main/java/info/nightscout/androidaps/database/Converters.kt
index ee645d06e4..371976cc5c 100644
--- a/database/src/main/java/info/nightscout/androidaps/database/Converters.kt
+++ b/database/src/main/java/info/nightscout/androidaps/database/Converters.kt
@@ -183,4 +183,9 @@ class Converters {
         return list
     }
 
-}
\ No newline at end of file
+    @TypeConverter
+    fun fromOfflineEventReason(reason: OfflineEvent.Reason?) = reason?.name
+
+    @TypeConverter
+    fun toOfflineEventReason(reason: String?) = reason?.let { OfflineEvent.Reason.valueOf(it) }
+}
diff --git a/database/src/main/java/info/nightscout/androidaps/database/DatabaseModule.kt b/database/src/main/java/info/nightscout/androidaps/database/DatabaseModule.kt
index ec1f24e00b..4f2b1be88d 100644
--- a/database/src/main/java/info/nightscout/androidaps/database/DatabaseModule.kt
+++ b/database/src/main/java/info/nightscout/androidaps/database/DatabaseModule.kt
@@ -26,13 +26,11 @@ open class DatabaseModule {
  //           .addMigrations(migration6to7)
  //           .addMigrations(migration7to8)
  //           .addMigrations(migration11to12)
+            .addMigrations(migration20to21)
             .addCallback(object : Callback() {
                 override fun onOpen(db: SupportSQLiteDatabase) {
                     super.onOpen(db)
-                    db.execSQL("CREATE INDEX IF NOT EXISTS `index_temporaryBasals_end` ON `temporaryBasals` (`timestamp` + `duration`)")
-                    db.execSQL("CREATE INDEX IF NOT EXISTS `index_extendedBoluses_end` ON `extendedBoluses` (`timestamp` + `duration`)")
-                    db.execSQL("CREATE INDEX IF NOT EXISTS `index_temporaryTargets_end` ON `temporaryTargets` (`timestamp` + `duration`)")
-                    db.execSQL("CREATE INDEX IF NOT EXISTS `index_carbs_end` ON `carbs` (`timestamp` + `duration`)")
+                    createCustomIndexes(db)
                 }
             })
             .fallbackToDestructiveMigration()
@@ -41,43 +39,34 @@ open class DatabaseModule {
     @Qualifier
     annotation class DbFileName
 
-    private val migration5to6 = object : Migration(5, 6) {
+    private fun createCustomIndexes(database: SupportSQLiteDatabase) {
+        database.execSQL("CREATE INDEX IF NOT EXISTS `index_temporaryBasals_end` ON `temporaryBasals` (`timestamp` + `duration`)")
+        database.execSQL("CREATE INDEX IF NOT EXISTS `index_extendedBoluses_end` ON `extendedBoluses` (`timestamp` + `duration`)")
+        database.execSQL("CREATE INDEX IF NOT EXISTS `index_temporaryTargets_end` ON `temporaryTargets` (`timestamp` + `duration`)")
+        database.execSQL("CREATE INDEX IF NOT EXISTS `index_carbs_end` ON `carbs` (`timestamp` + `duration`)")
+        database.execSQL("CREATE INDEX IF NOT EXISTS `index_offlineEvents_end` ON `offlineEvents` (`timestamp` + `duration`)")
+    }
+
+    private fun dropCustomIndexes(database: SupportSQLiteDatabase) {
+        database.execSQL("DROP INDEX IF EXISTS `index_temporaryBasals_end`")
+        database.execSQL("DROP INDEX IF EXISTS `index_extendedBoluses_end`")
+        database.execSQL("DROP INDEX IF EXISTS `index_temporaryTargets_end`")
+        database.execSQL("DROP INDEX IF EXISTS `index_carbs_end`")
+        database.execSQL("DROP INDEX IF EXISTS `index_offlineEvents_end`")
+    }
+
+    private val migration20to21 = object : Migration(20,21) {
         override fun migrate(database: SupportSQLiteDatabase) {
-            database.execSQL("DROP TABLE IF EXISTS userEntry")
-            database.execSQL("CREATE TABLE userEntry (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `timestamp` INTEGER NOT NULL, `utcOffset` INTEGER NOT NULL, `action` TEXT NOT NULL, `s` TEXT NOT NULL, `values` TEXT NOT NULL)")
+            database.execSQL("DROP TABLE IF EXISTS offlineEvents")
+            database.execSQL("CREATE TABLE IF NOT EXISTS `offlineEvents` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `version` INTEGER NOT NULL, `dateCreated` INTEGER NOT NULL, `isValid` INTEGER NOT NULL, `referenceId` INTEGER, `timestamp` INTEGER NOT NULL, `utcOffset` INTEGER NOT NULL, `reason` TEXT NOT NULL, `duration` INTEGER NOT NULL, `nightscoutSystemId` TEXT, `nightscoutId` TEXT, `pumpType` TEXT, `pumpSerial` TEXT, `temporaryId` INTEGER, `pumpId` INTEGER, `startId` INTEGER, `endId` INTEGER, FOREIGN KEY(`referenceId`) REFERENCES `offlineEvents`(`id`) ON UPDATE NO ACTION ON DELETE NO ACTION )")
+            database.execSQL("CREATE INDEX IF NOT EXISTS `index_offlineEvents_id` ON offlineEvents (`id`)")
+            database.execSQL("CREATE INDEX IF NOT EXISTS `index_offlineEvents_isValid` ON offlineEvents (`isValid`)")
+            database.execSQL("CREATE INDEX IF NOT EXISTS `index_offlineEvents_nightscoutId` ON offlineEvents (`nightscoutId`)")
+            database.execSQL("CREATE INDEX IF NOT EXISTS `index_offlineEvents_referenceId` ON offlineEvents (`referenceId`)")
+            database.execSQL("CREATE INDEX IF NOT EXISTS `index_offlineEvents_timestamp` ON offlineEvents (`timestamp`)")
+            // Custom indexes must be dropped on migration to pass room schema checking after upgrade
+            dropCustomIndexes(database)
         }
     }
 
-    private val migration6to7 = object : Migration(6, 7) {
-        override fun migrate(database: SupportSQLiteDatabase) {
-            database.execSQL("DROP TABLE IF EXISTS foods")
-            database.execSQL("CREATE TABLE IF NOT EXISTS foods (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `version` INTEGER NOT NULL, `dateCreated` INTEGER NOT NULL, `isValid` INTEGER NOT NULL, `referenceId` INTEGER, `name` TEXT NOT NULL, `category` TEXT, `subCategory` TEXT, `portion` REAL NOT NULL, `carbs` INTEGER NOT NULL, `fat` INTEGER, `protein` INTEGER, `energy` INTEGER, `unit` TEXT NOT NULL, `gi` INTEGER, `nightscoutSystemId` TEXT, `nightscoutId` TEXT, `pumpType` TEXT, `pumpSerial` TEXT, `pumpId` INTEGER, `startId` INTEGER, `endId` INTEGER, FOREIGN KEY(`referenceId`) REFERENCES `foods`(`id`) ON UPDATE NO ACTION ON DELETE NO ACTION )")
-            database.execSQL("CREATE INDEX IF NOT EXISTS `index_foods_referenceId` ON `foods` (`referenceId`)")
-        }
-    }
-
-    private val migration7to8 = object : Migration(7, 8) {
-        override fun migrate(database: SupportSQLiteDatabase) {
-            database.execSQL("DROP TABLE IF EXISTS bolusCalculatorResults")
-            database.execSQL("CREATE TABLE IF NOT EXISTS bolusCalculatorResults (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `version` INTEGER NOT NULL, `dateCreated` INTEGER NOT NULL, `isValid` INTEGER NOT NULL, `referenceId` INTEGER, `timestamp` INTEGER NOT NULL, `utcOffset` INTEGER NOT NULL, `targetBGLow` REAL NOT NULL, `targetBGHigh` REAL NOT NULL, `isf` REAL NOT NULL, `ic` REAL NOT NULL, `bolusIOB` REAL NOT NULL, `wasBolusIOBUsed` INTEGER NOT NULL, `basalIOB` REAL NOT NULL, `wasBasalIOBUsed` INTEGER NOT NULL, `glucoseValue` REAL NOT NULL, `wasGlucoseUsed` INTEGER NOT NULL, `glucoseDifference` REAL NOT NULL, `glucoseInsulin` REAL NOT NULL, `glucoseTrend` REAL NOT NULL, `wasTrendUsed` INTEGER NOT NULL, `trendInsulin` REAL NOT NULL, `cob` REAL NOT NULL, `wasCOBUsed` INTEGER NOT NULL, `cobInsulin` REAL NOT NULL, `carbs` REAL NOT NULL, `wereCarbsUsed` INTEGER NOT NULL, `carbsInsulin` REAL NOT NULL, `otherCorrection` REAL NOT NULL, `wasSuperbolusUsed` INTEGER NOT NULL, `superbolusInsulin` REAL NOT NULL, `wasTempTargetUsed` INTEGER NOT NULL, `totalInsulin` REAL NOT NULL, `percentageCorrection` INTEGER NOT NULL, `profileName` TEXT NOT NULL, `nightscoutSystemId` TEXT, `nightscoutId` TEXT, `pumpType` TEXT, `pumpSerial` TEXT, `pumpId` INTEGER, `startId` INTEGER, `endId` INTEGER, FOREIGN KEY(`referenceId`) REFERENCES `bolusCalculatorResults`(`id`) ON UPDATE NO ACTION ON DELETE NO ACTION )")
-            database.execSQL("CREATE INDEX IF NOT EXISTS `index_bolusCalculatorResults_referenceId` ON bolusCalculatorResults (`referenceId`)")
-            database.execSQL("CREATE INDEX IF NOT EXISTS `index_bolusCalculatorResults_timestamp` ON bolusCalculatorResults (`timestamp`)")
-
-            database.execSQL("DROP TABLE IF EXISTS mealLinks")
-            database.execSQL("CREATE TABLE IF NOT EXISTS mealLinks (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `version` INTEGER NOT NULL, `dateCreated` INTEGER NOT NULL, `isValid` INTEGER NOT NULL, `referenceId` INTEGER, `timestamp` INTEGER NOT NULL, `utcOffset` INTEGER NOT NULL, `bolusId` INTEGER, `carbsId` INTEGER, `bolusCalcResultId` INTEGER, `superbolusTempBasalId` INTEGER, `noteId` INTEGER, `nightscoutSystemId` TEXT, `nightscoutId` TEXT, `pumpType` TEXT, `pumpSerial` TEXT, `pumpId` INTEGER, `startId` INTEGER, `endId` INTEGER, FOREIGN KEY(`bolusId`) REFERENCES `boluses`(`id`) ON UPDATE NO ACTION ON DELETE NO ACTION , FOREIGN KEY(`carbsId`) REFERENCES `carbs`(`id`) ON UPDATE NO ACTION ON DELETE NO ACTION , FOREIGN KEY(`bolusCalcResultId`) REFERENCES `bolusCalculatorResults`(`id`) ON UPDATE NO ACTION ON DELETE NO ACTION , FOREIGN KEY(`superbolusTempBasalId`) REFERENCES `temporaryBasals`(`id`) ON UPDATE NO ACTION ON DELETE NO ACTION , FOREIGN KEY(`noteId`) REFERENCES `therapyEvents`(`id`) ON UPDATE NO ACTION ON DELETE NO ACTION , FOREIGN KEY(`referenceId`) REFERENCES `mealLinks`(`id`) ON UPDATE NO ACTION ON DELETE NO ACTION )")
-            database.execSQL("CREATE INDEX IF NOT EXISTS `index_mealLinks_referenceId` ON mealLinks (`referenceId`)")
-            database.execSQL("CREATE INDEX IF NOT EXISTS `index_mealLinks_bolusId` ON `mealLinks (`bolusId`)")
-            database.execSQL("CREATE INDEX IF NOT EXISTS `index_mealLinks_carbsId` ON mealLinks (`carbsId`)")
-            database.execSQL("CREATE INDEX IF NOT EXISTS `index_mealLinks_bolusCalcResultId` ON mealLinks (`bolusCalcResultId`)")
-            database.execSQL("CREATE INDEX IF NOT EXISTS `index_mealLinks_superbolusTempBasalId` ON mealLinks (`superbolusTempBasalId`)")
-            database.execSQL("CREATE INDEX IF NOT EXISTS `index_mealLinks_noteId` ON mealLinks (`noteId`)")
-        }
-    }
-
-    private val migration11to12 = object : Migration(11,12) {
-        override fun migrate(database: SupportSQLiteDatabase) {
-            database.execSQL("DROP TABLE IF EXISTS userEntry")
-            database.execSQL("CREATE TABLE IF NOT EXISTS userEntry (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `timestamp` INTEGER NOT NULL, `utcOffset` INTEGER NOT NULL, `action` TEXT NOT NULL, `source` TEXT NOT NULL, `note` TEXT NOT NULL, `values` TEXT NOT NULL)")
-        }
-    }
 }
\ No newline at end of file
diff --git a/database/src/main/java/info/nightscout/androidaps/database/DelegatedAppDatabase.kt b/database/src/main/java/info/nightscout/androidaps/database/DelegatedAppDatabase.kt
index 22ffbb4154..f436dc99e7 100644
--- a/database/src/main/java/info/nightscout/androidaps/database/DelegatedAppDatabase.kt
+++ b/database/src/main/java/info/nightscout/androidaps/database/DelegatedAppDatabase.kt
@@ -2,6 +2,7 @@ package info.nightscout.androidaps.database
 
 import info.nightscout.androidaps.database.daos.*
 import info.nightscout.androidaps.database.daos.delegated.*
+import info.nightscout.androidaps.database.entities.OfflineEvent
 import info.nightscout.androidaps.database.interfaces.DBEntry
 
 internal class DelegatedAppDatabase(val changes: MutableList<DBEntry>, val database: AppDatabase) {
@@ -25,5 +26,6 @@ internal class DelegatedAppDatabase(val changes: MutableList<DBEntry>, val datab
     val preferenceChangeDao: PreferenceChangeDao = DelegatedPreferenceChangeDao(changes, database.preferenceChangeDao)
     val foodDao: FoodDao = DelegatedFoodDao(changes, database.foodDao)
     val deviceStatusDao: DeviceStatusDao = DelegatedDeviceStatusDao(changes, database.deviceStatusDao)
+    val offlineEventDao: OfflineEventDao = DelegatedOfflineEventDao(changes, database.offlineEventDao)
     fun clearAllTables() = database.clearAllTables()
 }
\ No newline at end of file
diff --git a/database/src/main/java/info/nightscout/androidaps/database/TableNames.kt b/database/src/main/java/info/nightscout/androidaps/database/TableNames.kt
index a22a280a2a..6cfc7e1de0 100644
--- a/database/src/main/java/info/nightscout/androidaps/database/TableNames.kt
+++ b/database/src/main/java/info/nightscout/androidaps/database/TableNames.kt
@@ -14,6 +14,7 @@ const val TABLE_MULTIWAVE_BOLUS_LINKS = "multiwaveBolusLinks"
 const val TABLE_PROFILE_SWITCHES = "profileSwitches"
 const val TABLE_TEMPORARY_BASALS = "temporaryBasals"
 const val TABLE_TEMPORARY_TARGETS = "temporaryTargets"
+const val TABLE_OFFLINE_EVENTS = "offlineEvents"
 const val TABLE_TOTAL_DAILY_DOSES = "totalDailyDoses"
 const val TABLE_THERAPY_EVENTS = "therapyEvents"
 const val TABLE_PREFERENCE_CHANGES = "preferenceChanges"
diff --git a/database/src/main/java/info/nightscout/androidaps/database/daos/APSResultDao.kt b/database/src/main/java/info/nightscout/androidaps/database/daos/APSResultDao.kt
index 62a1608cdb..5eabc904b9 100644
--- a/database/src/main/java/info/nightscout/androidaps/database/daos/APSResultDao.kt
+++ b/database/src/main/java/info/nightscout/androidaps/database/daos/APSResultDao.kt
@@ -4,7 +4,6 @@ import androidx.room.Dao
 import androidx.room.Query
 import info.nightscout.androidaps.database.TABLE_APS_RESULTS
 import info.nightscout.androidaps.database.entities.APSResult
-import io.reactivex.Single
 
 @Suppress("FunctionName")
 @Dao
@@ -15,4 +14,7 @@ internal interface APSResultDao : TraceableDao<APSResult> {
 
     @Query("DELETE FROM $TABLE_APS_RESULTS")
     override fun deleteAllEntries()
+
+    @Query("SELECT * FROM $TABLE_APS_RESULTS WHERE dateCreated > :since AND dateCreated <= :until LIMIT :limit OFFSET :offset")
+    suspend fun getNewEntriesSince(since: Long, until: Long, limit: Int, offset: Int): List<APSResult>
 }
\ No newline at end of file
diff --git a/database/src/main/java/info/nightscout/androidaps/database/daos/APSResultLinkDao.kt b/database/src/main/java/info/nightscout/androidaps/database/daos/APSResultLinkDao.kt
index e19a605897..c5318c49f8 100644
--- a/database/src/main/java/info/nightscout/androidaps/database/daos/APSResultLinkDao.kt
+++ b/database/src/main/java/info/nightscout/androidaps/database/daos/APSResultLinkDao.kt
@@ -5,7 +5,6 @@ import androidx.room.Query
 import info.nightscout.androidaps.database.TABLE_APS_RESULTS
 import info.nightscout.androidaps.database.TABLE_APS_RESULT_LINKS
 import info.nightscout.androidaps.database.entities.APSResultLink
-import io.reactivex.Single
 
 @Suppress("FunctionName")
 @Dao
@@ -16,4 +15,7 @@ internal interface APSResultLinkDao : TraceableDao<APSResultLink> {
 
     @Query("DELETE FROM $TABLE_APS_RESULTS")
     override fun deleteAllEntries()
+
+    @Query("SELECT * FROM $TABLE_APS_RESULT_LINKS WHERE dateCreated > :since AND dateCreated <= :until LIMIT :limit OFFSET :offset")
+    suspend fun getNewEntriesSince(since: Long, until: Long, limit: Int, offset: Int): List<APSResultLink>
 }
\ No newline at end of file
diff --git a/database/src/main/java/info/nightscout/androidaps/database/daos/BolusCalculatorResultDao.kt b/database/src/main/java/info/nightscout/androidaps/database/daos/BolusCalculatorResultDao.kt
index 600a01de0b..0b192849e1 100644
--- a/database/src/main/java/info/nightscout/androidaps/database/daos/BolusCalculatorResultDao.kt
+++ b/database/src/main/java/info/nightscout/androidaps/database/daos/BolusCalculatorResultDao.kt
@@ -2,6 +2,7 @@ package info.nightscout.androidaps.database.daos
 
 import androidx.room.Dao
 import androidx.room.Query
+import info.nightscout.androidaps.database.TABLE_APS_RESULTS
 import info.nightscout.androidaps.database.TABLE_BOLUS_CALCULATOR_RESULTS
 import info.nightscout.androidaps.database.entities.BolusCalculatorResult
 import io.reactivex.Maybe
@@ -37,4 +38,7 @@ internal interface BolusCalculatorResultDao : TraceableDao<BolusCalculatorResult
 
     @Query("SELECT * FROM $TABLE_BOLUS_CALCULATOR_RESULTS WHERE id = :referenceId")
     fun getCurrentFromHistoric(referenceId: Long): Maybe<BolusCalculatorResult>
+
+    @Query("SELECT * FROM $TABLE_BOLUS_CALCULATOR_RESULTS WHERE dateCreated > :since AND dateCreated <= :until LIMIT :limit OFFSET :offset")
+    suspend fun getNewEntriesSince(since: Long, until: Long, limit: Int, offset: Int): List<BolusCalculatorResult>
 }
\ No newline at end of file
diff --git a/database/src/main/java/info/nightscout/androidaps/database/daos/BolusDao.kt b/database/src/main/java/info/nightscout/androidaps/database/daos/BolusDao.kt
index 2483cb04cc..7bfa7fd72a 100644
--- a/database/src/main/java/info/nightscout/androidaps/database/daos/BolusDao.kt
+++ b/database/src/main/java/info/nightscout/androidaps/database/daos/BolusDao.kt
@@ -3,8 +3,10 @@ package info.nightscout.androidaps.database.daos
 import androidx.room.Dao
 import androidx.room.Query
 import info.nightscout.androidaps.database.TABLE_BOLUSES
+import info.nightscout.androidaps.database.TABLE_BOLUS_CALCULATOR_RESULTS
 import info.nightscout.androidaps.database.embedments.InterfaceIDs
 import info.nightscout.androidaps.database.entities.Bolus
+import info.nightscout.androidaps.database.entities.BolusCalculatorResult
 import io.reactivex.Maybe
 import io.reactivex.Single
 
@@ -33,16 +35,16 @@ internal interface BolusDao : TraceableDao<Bolus> {
     @Query("SELECT * FROM $TABLE_BOLUSES WHERE temporaryId = :temporaryId AND pumpType = :pumpType AND pumpSerial = :pumpSerial AND referenceId IS NULL")
     fun findByPumpTempIds(temporaryId: Long, pumpType: InterfaceIDs.PumpType, pumpSerial: String): Bolus?
 
-    @Query("SELECT * FROM $TABLE_BOLUSES WHERE isValid = 1 AND type <> :exclude AND referenceId IS NULL ORDER BY id ASC LIMIT 1")
+    @Query("SELECT * FROM $TABLE_BOLUSES WHERE isValid = 1 AND type <> :exclude AND referenceId IS NULL ORDER BY timestamp DESC LIMIT 1")
     fun getLastBolusRecord(exclude: Bolus.Type = Bolus.Type.PRIMING): Bolus?
 
-    @Query("SELECT * FROM $TABLE_BOLUSES WHERE isValid = 1 AND type <> :exclude AND referenceId IS NULL ORDER BY id ASC LIMIT 1")
+    @Query("SELECT * FROM $TABLE_BOLUSES WHERE isValid = 1 AND type <> :exclude AND referenceId IS NULL ORDER BY timestamp DESC LIMIT 1")
     fun getLastBolusRecordMaybe(exclude: Bolus.Type = Bolus.Type.PRIMING): Maybe<Bolus>
 
-    @Query("SELECT * FROM $TABLE_BOLUSES WHERE isValid = 1 AND type == :only AND referenceId IS NULL ORDER BY id ASC LIMIT 1")
+    @Query("SELECT * FROM $TABLE_BOLUSES WHERE isValid = 1 AND type == :only AND referenceId IS NULL ORDER BY timestamp DESC LIMIT 1")
     fun getLastBolusRecordOfType(only: Bolus.Type): Bolus?
 
-    @Query("SELECT * FROM $TABLE_BOLUSES WHERE isValid = 1 AND type <> :exclude AND referenceId IS NULL ORDER BY id ASC LIMIT 1")
+    @Query("SELECT * FROM $TABLE_BOLUSES WHERE isValid = 1 AND type <> :exclude AND referenceId IS NULL ORDER BY timestamp ASC LIMIT 1")
     fun getOldestBolusRecord(exclude: Bolus.Type = Bolus.Type.PRIMING): Bolus?
 
     @Query("SELECT * FROM $TABLE_BOLUSES WHERE isValid = 1 AND timestamp >= :timestamp AND referenceId IS NULL ORDER BY id DESC")
@@ -67,4 +69,7 @@ internal interface BolusDao : TraceableDao<Bolus> {
 
     @Query("SELECT * FROM $TABLE_BOLUSES WHERE id = :referenceId")
     fun getCurrentFromHistoric(referenceId: Long): Maybe<Bolus>
+
+    @Query("SELECT * FROM $TABLE_BOLUSES WHERE dateCreated > :since AND dateCreated <= :until LIMIT :limit OFFSET :offset")
+    suspend fun getNewEntriesSince(since: Long, until: Long, limit: Int, offset: Int): List<Bolus>
 }
\ No newline at end of file
diff --git a/database/src/main/java/info/nightscout/androidaps/database/daos/CarbsDao.kt b/database/src/main/java/info/nightscout/androidaps/database/daos/CarbsDao.kt
index fabed9ae77..4e76fd1ef2 100644
--- a/database/src/main/java/info/nightscout/androidaps/database/daos/CarbsDao.kt
+++ b/database/src/main/java/info/nightscout/androidaps/database/daos/CarbsDao.kt
@@ -2,6 +2,7 @@ package info.nightscout.androidaps.database.daos
 
 import androidx.room.Dao
 import androidx.room.Query
+import info.nightscout.androidaps.database.TABLE_BOLUSES
 import info.nightscout.androidaps.database.TABLE_CARBS
 import info.nightscout.androidaps.database.entities.Carbs
 import io.reactivex.Maybe
@@ -69,4 +70,7 @@ internal interface CarbsDao : TraceableDao<Carbs> {
 
     @Query("SELECT * FROM $TABLE_CARBS WHERE id = :referenceId")
     fun getCurrentFromHistoric(referenceId: Long): Maybe<Carbs>
+
+    @Query("SELECT * FROM $TABLE_CARBS WHERE dateCreated > :since AND dateCreated <= :until LIMIT :limit OFFSET :offset")
+    suspend fun getNewEntriesSince(since: Long, until: Long, limit: Int, offset: Int): List<Carbs>
 }
\ No newline at end of file
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 592c21bd0b..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
@@ -20,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?
 
@@ -49,4 +55,7 @@ internal interface EffectiveProfileSwitchDao : TraceableDao<EffectiveProfileSwit
     @Query("SELECT * FROM $TABLE_EFFECTIVE_PROFILE_SWITCHES WHERE id = :referenceId")
     fun getCurrentFromHistoric(referenceId: Long): Maybe<EffectiveProfileSwitch>
 
+    @Query("SELECT * FROM $TABLE_EFFECTIVE_PROFILE_SWITCHES WHERE dateCreated > :since AND dateCreated <= :until LIMIT :limit OFFSET :offset")
+    suspend fun getNewEntriesSince(since: Long, until: Long, limit: Int, offset: Int): List<EffectiveProfileSwitch>
+
 }
\ No newline at end of file
diff --git a/database/src/main/java/info/nightscout/androidaps/database/daos/ExtendedBolusDao.kt b/database/src/main/java/info/nightscout/androidaps/database/daos/ExtendedBolusDao.kt
index 657ee3b7ff..843990d901 100644
--- a/database/src/main/java/info/nightscout/androidaps/database/daos/ExtendedBolusDao.kt
+++ b/database/src/main/java/info/nightscout/androidaps/database/daos/ExtendedBolusDao.kt
@@ -2,8 +2,10 @@ 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_EXTENDED_BOLUSES
 import info.nightscout.androidaps.database.embedments.InterfaceIDs
+import info.nightscout.androidaps.database.entities.Carbs
 import info.nightscout.androidaps.database.entities.ExtendedBolus
 import io.reactivex.Maybe
 import io.reactivex.Single
@@ -65,4 +67,7 @@ internal interface ExtendedBolusDao : TraceableDao<ExtendedBolus> {
     @Query("SELECT * FROM $TABLE_EXTENDED_BOLUSES WHERE isValid = 1 AND referenceId IS NULL ORDER BY id ASC LIMIT 1")
     fun getOldestRecord(): ExtendedBolus?
 
+    @Query("SELECT * FROM $TABLE_EXTENDED_BOLUSES WHERE dateCreated > :since AND dateCreated <= :until LIMIT :limit OFFSET :offset")
+    suspend fun getNewEntriesSince(since: Long, until: Long, limit: Int, offset: Int): List<ExtendedBolus>
+
 }
\ No newline at end of file
diff --git a/database/src/main/java/info/nightscout/androidaps/database/daos/GlucoseValueDao.kt b/database/src/main/java/info/nightscout/androidaps/database/daos/GlucoseValueDao.kt
index bda5c63b2f..7a0a8b36de 100644
--- a/database/src/main/java/info/nightscout/androidaps/database/daos/GlucoseValueDao.kt
+++ b/database/src/main/java/info/nightscout/androidaps/database/daos/GlucoseValueDao.kt
@@ -2,7 +2,9 @@ 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_GLUCOSE_VALUES
+import info.nightscout.androidaps.database.entities.Carbs
 import info.nightscout.androidaps.database.entities.GlucoseValue
 import io.reactivex.Maybe
 import io.reactivex.Single
@@ -53,4 +55,7 @@ internal interface GlucoseValueDao : TraceableDao<GlucoseValue> {
 
     @Query("SELECT * FROM $TABLE_GLUCOSE_VALUES WHERE id = :referenceId")
     fun getCurrentFromHistoric(referenceId: Long): Maybe<GlucoseValue>
+
+    @Query("SELECT * FROM $TABLE_GLUCOSE_VALUES WHERE dateCreated > :since AND dateCreated <= :until LIMIT :limit OFFSET :offset")
+    suspend fun getNewEntriesSince(since: Long, until: Long, limit: Int, offset: Int): List<GlucoseValue>
 }
\ No newline at end of file
diff --git a/database/src/main/java/info/nightscout/androidaps/database/daos/MultiwaveBolusLinkDao.kt b/database/src/main/java/info/nightscout/androidaps/database/daos/MultiwaveBolusLinkDao.kt
index df275b1837..032bf9fd60 100644
--- a/database/src/main/java/info/nightscout/androidaps/database/daos/MultiwaveBolusLinkDao.kt
+++ b/database/src/main/java/info/nightscout/androidaps/database/daos/MultiwaveBolusLinkDao.kt
@@ -2,7 +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_MULTIWAVE_BOLUS_LINKS
+import info.nightscout.androidaps.database.entities.GlucoseValue
 import info.nightscout.androidaps.database.entities.MultiwaveBolusLink
 
 @Suppress("FunctionName")
@@ -14,4 +16,7 @@ internal interface MultiwaveBolusLinkDao : TraceableDao<MultiwaveBolusLink> {
 
     @Query("DELETE FROM $TABLE_MULTIWAVE_BOLUS_LINKS")
     override fun deleteAllEntries()
+
+    @Query("SELECT * FROM $TABLE_MULTIWAVE_BOLUS_LINKS WHERE dateCreated > :since AND dateCreated <= :until LIMIT :limit OFFSET :offset")
+    suspend fun getNewEntriesSince(since: Long, until: Long, limit: Int, offset: Int): List<MultiwaveBolusLink>
 }
\ No newline at end of file
diff --git a/database/src/main/java/info/nightscout/androidaps/database/daos/OfflineEventDao.kt b/database/src/main/java/info/nightscout/androidaps/database/daos/OfflineEventDao.kt
new file mode 100644
index 0000000000..a6bf37604d
--- /dev/null
+++ b/database/src/main/java/info/nightscout/androidaps/database/daos/OfflineEventDao.kt
@@ -0,0 +1,56 @@
+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_OFFLINE_EVENTS
+import info.nightscout.androidaps.database.entities.GlucoseValue
+import info.nightscout.androidaps.database.entities.OfflineEvent
+import io.reactivex.Maybe
+import io.reactivex.Single
+
+@Suppress("FunctionName")
+@Dao
+internal interface OfflineEventDao : TraceableDao<OfflineEvent> {
+
+    @Query("SELECT * FROM $TABLE_OFFLINE_EVENTS WHERE id = :id")
+    override fun findById(id: Long): OfflineEvent?
+
+    @Query("DELETE FROM $TABLE_OFFLINE_EVENTS")
+    override fun deleteAllEntries()
+
+    @Query("SELECT id FROM $TABLE_OFFLINE_EVENTS ORDER BY id DESC limit 1")
+    fun getLastId(): Maybe<Long>
+
+    @Query("SELECT * FROM $TABLE_OFFLINE_EVENTS WHERE nightscoutId = :nsId AND referenceId IS NULL")
+    fun findByNSId(nsId: String): OfflineEvent?
+
+    @Query("SELECT * FROM $TABLE_OFFLINE_EVENTS WHERE timestamp <= :timestamp AND (timestamp + duration) > :timestamp AND referenceId IS NULL AND isValid = 1 ORDER BY timestamp DESC LIMIT 1")
+    fun getOfflineEventActiveAt(timestamp: Long): Maybe<OfflineEvent>
+
+    @Query("SELECT * FROM $TABLE_OFFLINE_EVENTS WHERE timestamp >= :timestamp AND isValid = 1 AND referenceId IS NULL ORDER BY timestamp ASC")
+    fun getOfflineEventDataFromTime(timestamp: Long): Single<List<OfflineEvent>>
+
+    @Query("SELECT * FROM $TABLE_OFFLINE_EVENTS WHERE timestamp >= :timestamp AND referenceId IS NULL ORDER BY timestamp ASC")
+    fun getOfflineEventDataIncludingInvalidFromTime(timestamp: Long): Single<List<OfflineEvent>>
+
+    @Query("SELECT * FROM $TABLE_OFFLINE_EVENTS WHERE timestamp BETWEEN :start AND :end AND isValid = 1 AND referenceId IS NULL ORDER BY timestamp ASC")
+    fun getOfflineEventDataFromTimeToTime(start: Long, end: Long): Single<List<OfflineEvent>>
+
+    @Query("SELECT * FROM $TABLE_OFFLINE_EVENTS WHERE isValid = 1 AND referenceId IS NULL ORDER BY timestamp ASC")
+    fun getOfflineEventData(): Single<List<OfflineEvent>>
+
+    // This query will be used with v3 to get all changed records
+    @Query("SELECT * FROM $TABLE_OFFLINE_EVENTS WHERE id > :id AND referenceId IS NULL OR id IN (SELECT DISTINCT referenceId FROM $TABLE_OFFLINE_EVENTS WHERE id > :id) ORDER BY id ASC")
+    fun getModifiedFrom(id: Long): Single<List<OfflineEvent>>
+
+    // for WS we need 1 record only
+    @Query("SELECT * FROM $TABLE_OFFLINE_EVENTS WHERE id > :id ORDER BY id ASC limit 1")
+    fun getNextModifiedOrNewAfter(id: Long): Maybe<OfflineEvent>
+
+    @Query("SELECT * FROM $TABLE_OFFLINE_EVENTS WHERE id = :referenceId")
+    fun getCurrentFromHistoric(referenceId: Long): Maybe<OfflineEvent>
+
+    @Query("SELECT * FROM $TABLE_OFFLINE_EVENTS WHERE dateCreated > :since AND dateCreated <= :until LIMIT :limit OFFSET :offset")
+    suspend fun getNewEntriesSince(since: Long, until: Long, limit: Int, offset: Int): List<OfflineEvent>
+}
\ No newline at end of file
diff --git a/database/src/main/java/info/nightscout/androidaps/database/daos/PreferenceChangeDao.kt b/database/src/main/java/info/nightscout/androidaps/database/daos/PreferenceChangeDao.kt
index 49388a6d37..a8aaaf0fc1 100644
--- a/database/src/main/java/info/nightscout/androidaps/database/daos/PreferenceChangeDao.kt
+++ b/database/src/main/java/info/nightscout/androidaps/database/daos/PreferenceChangeDao.kt
@@ -3,7 +3,9 @@ package info.nightscout.androidaps.database.daos
 import androidx.room.Dao
 import androidx.room.Insert
 import androidx.room.Query
+import info.nightscout.androidaps.database.TABLE_GLUCOSE_VALUES
 import info.nightscout.androidaps.database.TABLE_PREFERENCE_CHANGES
+import info.nightscout.androidaps.database.entities.GlucoseValue
 import info.nightscout.androidaps.database.entities.PreferenceChange
 import io.reactivex.Single
 
@@ -13,4 +15,7 @@ interface PreferenceChangeDao {
     @Insert
     fun insert(preferenceChange: PreferenceChange)
 
+    @Query("SELECT * FROM $TABLE_PREFERENCE_CHANGES WHERE timestamp > :since AND timestamp <= :until LIMIT :limit OFFSET :offset")
+    suspend fun getNewEntriesSince(since: Long, until: Long, limit: Int, offset: Int): List<PreferenceChange>
+
 }
\ No newline at end of file
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 598679864b..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
@@ -53,6 +53,9 @@ internal interface ProfileSwitchDao : ProfileSwitchDaoWorkaround {
 
     @Query("SELECT * FROM $TABLE_PROFILE_SWITCHES WHERE id = :referenceId")
     fun getCurrentFromHistoric(referenceId: Long): Maybe<ProfileSwitch>
+
+    @Query("SELECT * FROM $TABLE_PROFILE_SWITCHES WHERE dateCreated > :since AND dateCreated <= :until LIMIT :limit OFFSET :offset")
+    suspend fun getNewEntriesSince(since: Long, until: Long, limit: Int, offset: Int): List<ProfileSwitch>
 }
 
 internal fun ProfileSwitchDao.insertNewEntryImpl(entry: ProfileSwitch): Long {
diff --git a/database/src/main/java/info/nightscout/androidaps/database/daos/TemporaryBasalDao.kt b/database/src/main/java/info/nightscout/androidaps/database/daos/TemporaryBasalDao.kt
index f2cdd2617e..94f717a420 100644
--- a/database/src/main/java/info/nightscout/androidaps/database/daos/TemporaryBasalDao.kt
+++ b/database/src/main/java/info/nightscout/androidaps/database/daos/TemporaryBasalDao.kt
@@ -2,8 +2,10 @@ 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_TEMPORARY_BASALS
 import info.nightscout.androidaps.database.embedments.InterfaceIDs
+import info.nightscout.androidaps.database.entities.GlucoseValue
 import info.nightscout.androidaps.database.entities.TemporaryBasal
 import io.reactivex.Maybe
 import io.reactivex.Single
@@ -76,4 +78,7 @@ internal interface TemporaryBasalDao : TraceableDao<TemporaryBasal> {
 
     @Query("SELECT * FROM $TABLE_TEMPORARY_BASALS WHERE isValid = 1 AND referenceId IS NULL ORDER BY id ASC LIMIT 1")
     fun getOldestRecord(): TemporaryBasal?
+
+    @Query("SELECT * FROM $TABLE_TEMPORARY_BASALS WHERE dateCreated > :since AND dateCreated <= :until LIMIT :limit OFFSET :offset")
+    suspend fun getNewEntriesSince(since: Long, until: Long, limit: Int, offset: Int): List<TemporaryBasal>
 }
\ No newline at end of file
diff --git a/database/src/main/java/info/nightscout/androidaps/database/daos/TemporaryTargetDao.kt b/database/src/main/java/info/nightscout/androidaps/database/daos/TemporaryTargetDao.kt
index 065eb76595..87d1d55aff 100644
--- a/database/src/main/java/info/nightscout/androidaps/database/daos/TemporaryTargetDao.kt
+++ b/database/src/main/java/info/nightscout/androidaps/database/daos/TemporaryTargetDao.kt
@@ -2,7 +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_TEMPORARY_TARGETS
+import info.nightscout.androidaps.database.entities.GlucoseValue
 import info.nightscout.androidaps.database.entities.TemporaryTarget
 import io.reactivex.Maybe
 import io.reactivex.Single
@@ -45,4 +47,7 @@ internal interface TemporaryTargetDao : TraceableDao<TemporaryTarget> {
 
     @Query("SELECT * FROM $TABLE_TEMPORARY_TARGETS WHERE id = :referenceId")
     fun getCurrentFromHistoric(referenceId: Long): Maybe<TemporaryTarget>
+
+    @Query("SELECT * FROM $TABLE_TEMPORARY_TARGETS WHERE dateCreated > :since AND dateCreated <= :until LIMIT :limit OFFSET :offset")
+    suspend fun getNewEntriesSince(since: Long, until: Long, limit: Int, offset: Int): List<TemporaryTarget>
 }
\ No newline at end of file
diff --git a/database/src/main/java/info/nightscout/androidaps/database/daos/TherapyEventDao.kt b/database/src/main/java/info/nightscout/androidaps/database/daos/TherapyEventDao.kt
index dea04b81b2..5e541b6800 100644
--- a/database/src/main/java/info/nightscout/androidaps/database/daos/TherapyEventDao.kt
+++ b/database/src/main/java/info/nightscout/androidaps/database/daos/TherapyEventDao.kt
@@ -2,7 +2,9 @@ package info.nightscout.androidaps.database.daos
 
 import androidx.room.Dao
 import androidx.room.Query
+import info.nightscout.androidaps.database.TABLE_TEMPORARY_TARGETS
 import info.nightscout.androidaps.database.TABLE_THERAPY_EVENTS
+import info.nightscout.androidaps.database.entities.TemporaryTarget
 import info.nightscout.androidaps.database.entities.TherapyEvent
 import io.reactivex.Maybe
 import io.reactivex.Single
@@ -37,8 +39,8 @@ internal interface TherapyEventDao : TraceableDao<TherapyEvent> {
     @Query("SELECT * FROM $TABLE_THERAPY_EVENTS WHERE timestamp >= :timestamp AND referenceId IS NULL ORDER BY timestamp ASC")
     fun getTherapyEventDataIncludingInvalidFromTime(timestamp: Long): Single<List<TherapyEvent>>
 
-    @Query("SELECT * FROM $TABLE_THERAPY_EVENTS WHERE type = :type AND isValid = 1 ORDER BY id DESC LIMIT 1")
-    fun getLastTherapyRecord(type: TherapyEvent.Type): Maybe<TherapyEvent>
+    @Query("SELECT * FROM $TABLE_THERAPY_EVENTS WHERE type = :type AND isValid = 1 AND timestamp <= :now ORDER BY id DESC LIMIT 1")
+    fun getLastTherapyRecord(type: TherapyEvent.Type, now: Long): Maybe<TherapyEvent>
 
     @Query("SELECT * FROM $TABLE_THERAPY_EVENTS WHERE timestamp >= :timestamp AND isValid = 1 AND referenceId IS NULL ORDER BY timestamp ASC")
     fun compatGetTherapyEventDataFromTime(timestamp: Long): Single<List<TherapyEvent>>
@@ -56,4 +58,7 @@ internal interface TherapyEventDao : TraceableDao<TherapyEvent> {
 
     @Query("SELECT * FROM $TABLE_THERAPY_EVENTS WHERE id = :referenceId")
     fun getCurrentFromHistoric(referenceId: Long): Maybe<TherapyEvent>
+
+    @Query("SELECT * FROM $TABLE_THERAPY_EVENTS WHERE dateCreated > :since AND dateCreated <= :until LIMIT :limit OFFSET :offset")
+    suspend fun getNewEntriesSince(since: Long, until: Long, limit: Int, offset: Int): List<TherapyEvent>
 }
\ No newline at end of file
diff --git a/database/src/main/java/info/nightscout/androidaps/database/daos/TotalDailyDoseDao.kt b/database/src/main/java/info/nightscout/androidaps/database/daos/TotalDailyDoseDao.kt
index 2b16339108..e441f69372 100644
--- a/database/src/main/java/info/nightscout/androidaps/database/daos/TotalDailyDoseDao.kt
+++ b/database/src/main/java/info/nightscout/androidaps/database/daos/TotalDailyDoseDao.kt
@@ -2,8 +2,10 @@ package info.nightscout.androidaps.database.daos
 
 import androidx.room.Dao
 import androidx.room.Query
+import info.nightscout.androidaps.database.TABLE_TEMPORARY_TARGETS
 import info.nightscout.androidaps.database.TABLE_TOTAL_DAILY_DOSES
 import info.nightscout.androidaps.database.embedments.InterfaceIDs
+import info.nightscout.androidaps.database.entities.TemporaryTarget
 import info.nightscout.androidaps.database.entities.TotalDailyDose
 import io.reactivex.Single
 
@@ -29,4 +31,7 @@ internal interface TotalDailyDoseDao : TraceableDao<TotalDailyDose> {
     @Query("SELECT * FROM $TABLE_TOTAL_DAILY_DOSES WHERE isValid = 1 AND referenceId IS NULL ORDER BY timestamp DESC LIMIT :count")
     fun getLastTotalDailyDoses(count: Int): Single<List<TotalDailyDose>>
 
+    @Query("SELECT * FROM $TABLE_TOTAL_DAILY_DOSES WHERE dateCreated > :since AND dateCreated <= :until LIMIT :limit OFFSET :offset")
+    suspend fun getNewEntriesSince(since: Long, until: Long, limit: Int, offset: Int): List<TotalDailyDose>
+
 }
\ No newline at end of file
diff --git a/database/src/main/java/info/nightscout/androidaps/database/daos/VersionChangeDao.kt b/database/src/main/java/info/nightscout/androidaps/database/daos/VersionChangeDao.kt
index fabbead4fa..46c18d4242 100644
--- a/database/src/main/java/info/nightscout/androidaps/database/daos/VersionChangeDao.kt
+++ b/database/src/main/java/info/nightscout/androidaps/database/daos/VersionChangeDao.kt
@@ -3,7 +3,9 @@ package info.nightscout.androidaps.database.daos
 import androidx.room.Dao
 import androidx.room.Insert
 import androidx.room.Query
+import info.nightscout.androidaps.database.TABLE_TEMPORARY_TARGETS
 import info.nightscout.androidaps.database.TABLE_VERSION_CHANGES
+import info.nightscout.androidaps.database.entities.TemporaryTarget
 import info.nightscout.androidaps.database.entities.VersionChange
 import io.reactivex.Single
 
@@ -16,4 +18,7 @@ interface VersionChangeDao {
     @Query("SELECT * FROM $TABLE_VERSION_CHANGES ORDER BY id DESC LIMIT 1")
     fun getMostRecentVersionChange(): VersionChange?
 
+    @Query("SELECT * FROM $TABLE_VERSION_CHANGES WHERE timestamp > :since AND timestamp <= :until LIMIT :limit OFFSET :offset")
+    suspend fun getNewEntriesSince(since: Long, until: Long, limit: Int, offset: Int): List<VersionChange>
+
 }
\ No newline at end of file
diff --git a/database/src/main/java/info/nightscout/androidaps/database/daos/delegated/DelegatedOfflineEventDao.kt b/database/src/main/java/info/nightscout/androidaps/database/daos/delegated/DelegatedOfflineEventDao.kt
new file mode 100644
index 0000000000..fc2bc94c30
--- /dev/null
+++ b/database/src/main/java/info/nightscout/androidaps/database/daos/delegated/DelegatedOfflineEventDao.kt
@@ -0,0 +1,18 @@
+package info.nightscout.androidaps.database.daos.delegated
+
+import info.nightscout.androidaps.database.daos.OfflineEventDao
+import info.nightscout.androidaps.database.entities.OfflineEvent
+import info.nightscout.androidaps.database.interfaces.DBEntry
+
+internal class DelegatedOfflineEventDao(changes: MutableList<DBEntry>, private val dao: OfflineEventDao) : DelegatedDao(changes), OfflineEventDao by dao {
+
+    override fun insertNewEntry(entry: OfflineEvent): Long {
+        changes.add(entry)
+        return dao.insertNewEntry(entry)
+    }
+
+    override fun updateExistingEntry(entry: OfflineEvent): Long {
+        changes.add(entry)
+        return dao.updateExistingEntry(entry)
+    }
+}
\ No newline at end of file
diff --git a/database/src/main/java/info/nightscout/androidaps/database/data/NewEntries.kt b/database/src/main/java/info/nightscout/androidaps/database/data/NewEntries.kt
new file mode 100644
index 0000000000..e951f37de2
--- /dev/null
+++ b/database/src/main/java/info/nightscout/androidaps/database/data/NewEntries.kt
@@ -0,0 +1,23 @@
+package info.nightscout.androidaps.database.data
+
+import info.nightscout.androidaps.database.entities.*
+
+data class NewEntries(
+    val apsResults: List<APSResult>,
+    val apsResultLinks: List<APSResultLink>,
+    val bolusCalculatorResults: List<BolusCalculatorResult>,
+    val boluses: List<Bolus>,
+    val carbs: List<Carbs>,
+    val effectiveProfileSwitches: List<EffectiveProfileSwitch>,
+    val extendedBoluses: List<ExtendedBolus>,
+    val glucoseValues: List<GlucoseValue>,
+    val multiwaveBolusLinks: List<MultiwaveBolusLink>,
+    val offlineEvents: List<OfflineEvent>,
+    val preferencesChanges: List<PreferenceChange>,
+    val profileSwitches: List<ProfileSwitch>,
+    val temporaryBasals: List<TemporaryBasal>,
+    val temporaryTarget: List<TemporaryTarget>,
+    val therapyEvents: List<TherapyEvent>,
+    val totalDailyDoses: List<TotalDailyDose>,
+    val versionChanges: List<VersionChange>
+)
\ No newline at end of file
diff --git a/database/src/main/java/info/nightscout/androidaps/database/embedments/InterfaceIDs.kt b/database/src/main/java/info/nightscout/androidaps/database/embedments/InterfaceIDs.kt
index beb7eb5184..b06098f4ee 100644
--- a/database/src/main/java/info/nightscout/androidaps/database/embedments/InterfaceIDs.kt
+++ b/database/src/main/java/info/nightscout/androidaps/database/embedments/InterfaceIDs.kt
@@ -43,6 +43,7 @@ data class InterfaceIDs(
         TANDEM_T_SLIM_X2,
         YPSOPUMP,
         MDI,
+        DIACONN_G8,
         USER;
 
         companion object {
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/GlucoseValue.kt b/database/src/main/java/info/nightscout/androidaps/database/entities/GlucoseValue.kt
index d7140a7900..d101681a7b 100644
--- a/database/src/main/java/info/nightscout/androidaps/database/entities/GlucoseValue.kt
+++ b/database/src/main/java/info/nightscout/androidaps/database/entities/GlucoseValue.kt
@@ -1,25 +1,31 @@
 package info.nightscout.androidaps.database.entities
 
-import com.google.gson.annotations.SerializedName
-import androidx.room.*
+import androidx.room.Embedded
+import androidx.room.Entity
+import androidx.room.ForeignKey
+import androidx.room.Index
+import androidx.room.PrimaryKey
 import info.nightscout.androidaps.database.TABLE_GLUCOSE_VALUES
 import info.nightscout.androidaps.database.embedments.InterfaceIDs
 import info.nightscout.androidaps.database.interfaces.DBEntryWithTime
 import info.nightscout.androidaps.database.interfaces.TraceableDBEntry
-import java.util.TimeZone
+import java.util.*
 
-@Entity(tableName = TABLE_GLUCOSE_VALUES,
+@Entity(
+    tableName = TABLE_GLUCOSE_VALUES,
     foreignKeys = [ForeignKey(
         entity = GlucoseValue::class,
         parentColumns = ["id"],
-        childColumns = ["referenceId"])],
+        childColumns = ["referenceId"]
+    )],
     indices = [
         Index("id"),
         Index("nightscoutId"),
         Index("sourceSensor"),
         Index("referenceId"),
         Index("timestamp")
-    ])
+    ]
+)
 data class GlucoseValue(
     @PrimaryKey(autoGenerate = true)
     override var id: Long = 0,
@@ -51,53 +57,55 @@ data class GlucoseValue(
     fun isRecordDeleted(other: GlucoseValue): Boolean =
         isValid && !other.isValid
 
-    enum class TrendArrow (val text:String, val symbol:String){
-        @SerializedName("NONE") NONE("NONE", "??"),
-        @SerializedName("TripleUp")TRIPLE_UP("TripleUp", "X"),
-        @SerializedName("DoubleUp")DOUBLE_UP("DoubleUp", "\u21c8"),
-        @SerializedName("SingleUp")SINGLE_UP("SingleUp", "\u2191"),
-        @SerializedName("FortyFiveUp")FORTY_FIVE_UP("FortyFiveUp", "\u2197"),
-        @SerializedName("Flat")FLAT("Flat", "\u2192"),
-        @SerializedName("FortyFiveDown")FORTY_FIVE_DOWN("FortyFiveDown", "\u2198"),
-        @SerializedName("SingleDown")SINGLE_DOWN("SingleDown", "\u2193"),
-        @SerializedName("DoubleDown")DOUBLE_DOWN("DoubleDown", "\u21ca"),
-        @SerializedName("TripleDown")TRIPLE_DOWN("TripleDown", "X")
+    enum class TrendArrow(val text: String, val symbol: String) {
+        NONE("NONE", "??"),
+        TRIPLE_UP("TripleUp", "X"),
+        DOUBLE_UP("DoubleUp", "\u21c8"),
+        SINGLE_UP("SingleUp", "\u2191"),
+        FORTY_FIVE_UP("FortyFiveUp", "\u2197"),
+        FLAT("Flat", "\u2192"),
+        FORTY_FIVE_DOWN("FortyFiveDown", "\u2198"),
+        SINGLE_DOWN("SingleDown", "\u2193"),
+        DOUBLE_DOWN("DoubleDown", "\u21ca"),
+        TRIPLE_DOWN("TripleDown", "X")
         ;
 
         companion object {
-            fun fromString(direction : String?) = values().firstOrNull {it.text == direction} ?: NONE
+
+            fun fromString(direction: String?) =
+                values().firstOrNull { it.text == direction } ?: NONE
         }
     }
 
-    enum class SourceSensor(val text : String) {
-        @SerializedName("AndroidAPS-Dexcom") DEXCOM_NATIVE_UNKNOWN("AndroidAPS-Dexcom"),
-        @SerializedName("AndroidAPS-DexcomG6") DEXCOM_G6_NATIVE("AndroidAPS-DexcomG6"),
-        @SerializedName("AndroidAPS-DexcomG5") DEXCOM_G5_NATIVE("AndroidAPS-DexcomG5"),
-        @SerializedName("Bluetooth Wixel") DEXCOM_G4_WIXEL("Bluetooth Wixel"),
-        @SerializedName("xBridge Wixel") DEXCOM_G4_XBRIDGE("xBridge Wixel"),
-        @SerializedName("G4 Share Receiver") DEXCOM_G4_NATIVE("G4 Share Receiver"),
-        @SerializedName("Medtrum A6") MEDTRUM_A6("Medtrum A6"),
-        @SerializedName("Network G4") DEXCOM_G4_NET("Network G4"),
-        @SerializedName("Network G4 and xBridge") DEXCOM_G4_NET_XBRIDGE("Network G4 and xBridge"),
-        @SerializedName("Network G4 and Classic xDrip") DEXCOM_G4_NET_CLASSIC("Network G4 and Classic xDrip"),
-        @SerializedName("DexcomG5") DEXCOM_G5_XDRIP("DexcomG5"),
-        @SerializedName("G6 Native") DEXCOM_G6_NATIVE_XDRIP("G6 Native"),
-        @SerializedName("G5 Native") DEXCOM_G5_NATIVE_XDRIP("G5 Native"),
-        @SerializedName("G6 Native / G5 Native") DEXCOM_G6_G5_NATIVE_XDRIP("G6 Native / G5 Native"),
-        @SerializedName("Network libre") LIBRE_1_NET("Network libre"),
-        @SerializedName("BlueReader") LIBRE_1_BLUE("BlueReader"),
-        @SerializedName("Transmiter PL") LIBRE_1_PL("Transmiter PL"),
-        @SerializedName("Blucon") LIBRE_1_BLUCON("Blucon"),
-        @SerializedName("Tomato") LIBRE_1_TOMATO("Tomato"),
-        @SerializedName("Rfduino") LIBRE_1_RF("Rfduino"),
-        @SerializedName("LimiTTer") LIBRE_1_LIMITTER("LimiTTer"),
-        @SerializedName("Glimp") GLIMP("Glimp"),
-        @SerializedName("Libre2") LIBRE_2_NATIVE("Libre2"),
-        @SerializedName("Poctech") POCTECH_NATIVE("Poctech"),
-        @SerializedName("MM600Series") MM_600_SERIES("MM600Series"),
-        @SerializedName("Eversense") EVERSENSE("Eversense"),
-        @SerializedName("Random") RANDOM("Random"),
-        @SerializedName("Unknown") UNKNOWN("Unknown"),
+    enum class SourceSensor(val text: String) {
+        DEXCOM_NATIVE_UNKNOWN("AndroidAPS-Dexcom"),
+        DEXCOM_G6_NATIVE("AndroidAPS-DexcomG6"),
+        DEXCOM_G5_NATIVE("AndroidAPS-DexcomG5"),
+        DEXCOM_G4_WIXEL("Bluetooth Wixel"),
+        DEXCOM_G4_XBRIDGE("xBridge Wixel"),
+        DEXCOM_G4_NATIVE("G4 Share Receiver"),
+        MEDTRUM_A6("Medtrum A6"),
+        DEXCOM_G4_NET("Network G4"),
+        DEXCOM_G4_NET_XBRIDGE("Network G4 and xBridge"),
+        DEXCOM_G4_NET_CLASSIC("Network G4 and Classic xDrip"),
+        DEXCOM_G5_XDRIP("DexcomG5"),
+        DEXCOM_G6_NATIVE_XDRIP("G6 Native"),
+        DEXCOM_G5_NATIVE_XDRIP("G5 Native"),
+        DEXCOM_G6_G5_NATIVE_XDRIP("G6 Native / G5 Native"),
+        LIBRE_1_NET("Network libre"),
+        LIBRE_1_BLUE("BlueReader"),
+        LIBRE_1_PL("Transmiter PL"),
+        LIBRE_1_BLUCON("Blucon"),
+        LIBRE_1_TOMATO("Tomato"),
+        LIBRE_1_RF("Rfduino"),
+        LIBRE_1_LIMITTER("LimiTTer"),
+        GLIMP("Glimp"),
+        LIBRE_2_NATIVE("Libre2"),
+        POCTECH_NATIVE("Poctech"),
+        MM_600_SERIES("MM600Series"),
+        EVERSENSE("Eversense"),
+        RANDOM("Random"),
+        UNKNOWN("Unknown"),
 
         IOB_PREDICTION("IOBPrediction"),
         A_COB_PREDICTION("aCOBPrediction"),
diff --git a/database/src/main/java/info/nightscout/androidaps/database/entities/OfflineEvent.kt b/database/src/main/java/info/nightscout/androidaps/database/entities/OfflineEvent.kt
new file mode 100644
index 0000000000..c2af9d5edb
--- /dev/null
+++ b/database/src/main/java/info/nightscout/androidaps/database/entities/OfflineEvent.kt
@@ -0,0 +1,64 @@
+package info.nightscout.androidaps.database.entities
+
+import androidx.room.Embedded
+import androidx.room.Entity
+import androidx.room.ForeignKey
+import androidx.room.Index
+import androidx.room.PrimaryKey
+import info.nightscout.androidaps.database.TABLE_OFFLINE_EVENTS
+import info.nightscout.androidaps.database.embedments.InterfaceIDs
+import info.nightscout.androidaps.database.interfaces.DBEntryWithTimeAndDuration
+import info.nightscout.androidaps.database.interfaces.TraceableDBEntry
+import java.util.*
+
+@Entity(tableName = TABLE_OFFLINE_EVENTS,
+    foreignKeys = [ForeignKey(
+        entity = OfflineEvent::class,
+        parentColumns = ["id"],
+        childColumns = ["referenceId"])],
+    indices = [
+        Index("id"),
+        Index("isValid"),
+        Index("nightscoutId"),
+        Index("referenceId"),
+        Index("timestamp")
+    ])
+data class OfflineEvent(
+    @PrimaryKey(autoGenerate = true)
+    override var id: Long = 0,
+    override var version: Int = 0,
+    override var dateCreated: Long = -1,
+    override var isValid: Boolean = true,
+    override var referenceId: Long? = null,
+    @Embedded
+    override var interfaceIDs_backing: InterfaceIDs? = InterfaceIDs(),
+    override var timestamp: Long,
+    override var utcOffset: Long = TimeZone.getDefault().getOffset(timestamp).toLong(),
+    var reason: Reason,
+    override var duration: Long // in millis
+) : TraceableDBEntry, DBEntryWithTimeAndDuration {
+
+    fun contentEqualsTo(other: OfflineEvent): Boolean =
+        timestamp == other.timestamp &&
+            utcOffset == other.utcOffset &&
+            reason == other.reason &&
+            duration == other.duration &&
+            isValid == other.isValid
+
+    fun isRecordDeleted(other: OfflineEvent): Boolean =
+        isValid && !other.isValid
+
+    enum class Reason {
+        DISCONNECT_PUMP,
+        SUSPEND,
+        DISABLE_LOOP,
+        SUPER_BOLUS,
+        OTHER
+        ;
+
+        companion object {
+
+            fun fromString(reason: String?) = values().firstOrNull { it.name == reason } ?: OTHER
+        }
+    }
+}
\ No newline at end of file
diff --git a/database/src/main/java/info/nightscout/androidaps/database/entities/TemporaryBasal.kt b/database/src/main/java/info/nightscout/androidaps/database/entities/TemporaryBasal.kt
index 2e3b002476..14d1b876e6 100644
--- a/database/src/main/java/info/nightscout/androidaps/database/entities/TemporaryBasal.kt
+++ b/database/src/main/java/info/nightscout/androidaps/database/entities/TemporaryBasal.kt
@@ -45,8 +45,7 @@ data class TemporaryBasal(
 ) : TraceableDBEntry, DBEntryWithTimeAndDuration {
 
     init {
-        if (duration <= 0)
-            require(duration > 0)
+        require(duration > 0)
     }
 
     enum class Type {
diff --git a/database/src/main/java/info/nightscout/androidaps/database/entities/TherapyEvent.kt b/database/src/main/java/info/nightscout/androidaps/database/entities/TherapyEvent.kt
index 8a701e1e21..f930be4645 100644
--- a/database/src/main/java/info/nightscout/androidaps/database/entities/TherapyEvent.kt
+++ b/database/src/main/java/info/nightscout/androidaps/database/entities/TherapyEvent.kt
@@ -48,7 +48,7 @@ data class TherapyEvent(
     enum class GlucoseUnit {
         MGDL,
         MMOL;
-        companion object { }
+        companion object
     }
 
     enum class MeterType(val text: String) {
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 1672944892..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),
@@ -43,6 +43,8 @@ data class UserEntry(
         OPEN_LOOP_MODE (ColorGroup.Loop),
         LOOP_DISABLED (ColorGroup.Loop),
         LOOP_ENABLED (ColorGroup.Loop),
+        LOOP_CHANGE (ColorGroup.Loop),
+        LOOP_REMOVED (ColorGroup.Loop),
         RECONNECT (ColorGroup.Pump),
         DISCONNECT (ColorGroup.Pump),
         RESUME (ColorGroup.Loop),
@@ -151,18 +153,20 @@ data class UserEntry(
         Objectives,         //From Objectives plugin
         Pump,               //To update with one Source per pump
         Dana,               //Only one UserEntry in Common module Dana
-        DanaR,              //No entry currently
-        DanaRC,             //No entry currently
-        DanaRv2,            //No entry currently
-        DanaRS,             //No entry currently
-        Insight,            //No entry currently
-        Combo,              //No entry currently
-        Medtronic,          //No entry currently
+        DanaR,
+        DanaRC,
+        DanaRv2,
+        DanaRS,
+        DanaI,
+        DiaconnG8,
+        Insight,
+        Combo,
+        Medtronic,
         Omnipod,            //No entry currently
-        OmnipodEros,        //No entry currently
+        OmnipodEros,
         OmnipodDash,        //No entry currently
-        MDI,                //No entry currently
-        VirtualPump,        //No entry currently
+        MDI,
+        VirtualPump,
         SMS,                //From SMS plugin
         Treatments,         //From Treatments plugin
         Wear,               //From Wear plugin
diff --git a/database/src/main/java/info/nightscout/androidaps/database/entities/ValueWithUnit.kt b/database/src/main/java/info/nightscout/androidaps/database/entities/ValueWithUnit.kt
index 7cd94956f0..55709888f7 100644
--- a/database/src/main/java/info/nightscout/androidaps/database/entities/ValueWithUnit.kt
+++ b/database/src/main/java/info/nightscout/androidaps/database/entities/ValueWithUnit.kt
@@ -1,7 +1,5 @@
 package info.nightscout.androidaps.database.entities
 
-import androidx.annotation.StringRes
-
 sealed class ValueWithUnit {
 
     object UNKNOWN : ValueWithUnit() // formerly None used as fallback
@@ -34,6 +32,8 @@ sealed class ValueWithUnit {
 
     data class TherapyEventTTReason(val value: TemporaryTarget.Reason) : ValueWithUnit()
 
+    data class OfflineEventReason(val value: OfflineEvent.Reason) : ValueWithUnit()
+
     fun value(): Any? {
         return when(this) {
             is Gram -> this.value
@@ -47,6 +47,7 @@ sealed class ValueWithUnit {
             is SimpleString -> this.value
             is TherapyEventMeterType -> this.value
             is TherapyEventTTReason -> this.value
+            is OfflineEventReason -> this.value
             is TherapyEventType -> this.value
             is Timestamp -> this.value
             is UnitPerHour -> this.value
diff --git a/database/src/main/java/info/nightscout/androidaps/database/interfaces/DBEntryWithTimeAndDuration.kt b/database/src/main/java/info/nightscout/androidaps/database/interfaces/DBEntryWithTimeAndDuration.kt
index b4f3f0bbbf..475cd01f5d 100644
--- a/database/src/main/java/info/nightscout/androidaps/database/interfaces/DBEntryWithTimeAndDuration.kt
+++ b/database/src/main/java/info/nightscout/androidaps/database/interfaces/DBEntryWithTimeAndDuration.kt
@@ -8,7 +8,7 @@ var DBEntryWithTimeAndDuration.end
     get() = timestamp + duration
     set(value) {
         duration = value - timestamp
+        require(duration > 0)
     }
 
-@JvmOverloads
 fun DBEntryWithTimeAndDuration.getRemainingDuration(current: Long = System.currentTimeMillis()) = min(0L, end - current)
\ No newline at end of file
diff --git a/database/src/main/java/info/nightscout/androidaps/database/transactions/CancelCurrentOfflineEventIfAnyTransaction.kt b/database/src/main/java/info/nightscout/androidaps/database/transactions/CancelCurrentOfflineEventIfAnyTransaction.kt
new file mode 100644
index 0000000000..6d5e1c1794
--- /dev/null
+++ b/database/src/main/java/info/nightscout/androidaps/database/transactions/CancelCurrentOfflineEventIfAnyTransaction.kt
@@ -0,0 +1,25 @@
+package info.nightscout.androidaps.database.transactions
+
+import info.nightscout.androidaps.database.entities.OfflineEvent
+import info.nightscout.androidaps.database.interfaces.end
+
+class CancelCurrentOfflineEventIfAnyTransaction(
+    val timestamp: Long
+) : Transaction<CancelCurrentOfflineEventIfAnyTransaction.TransactionResult>() {
+
+    override fun run(): TransactionResult {
+        val result = TransactionResult()
+        val current = database.offlineEventDao.getOfflineEventActiveAt(timestamp).blockingGet()
+        if (current != null) {
+            current.end = timestamp
+            database.offlineEventDao.updateExistingEntry(current)
+            result.updated.add(current)
+        }
+        return result
+    }
+
+    class TransactionResult {
+
+        val updated = mutableListOf<OfflineEvent>()
+    }
+}
\ No newline at end of file
diff --git a/database/src/main/java/info/nightscout/androidaps/database/transactions/InsertAndCancelCurrentOfflineEventTransaction.kt b/database/src/main/java/info/nightscout/androidaps/database/transactions/InsertAndCancelCurrentOfflineEventTransaction.kt
new file mode 100644
index 0000000000..f4dd63fe81
--- /dev/null
+++ b/database/src/main/java/info/nightscout/androidaps/database/transactions/InsertAndCancelCurrentOfflineEventTransaction.kt
@@ -0,0 +1,30 @@
+package info.nightscout.androidaps.database.transactions
+
+import info.nightscout.androidaps.database.entities.OfflineEvent
+import info.nightscout.androidaps.database.interfaces.end
+
+class InsertAndCancelCurrentOfflineEventTransaction(
+    val offlineEvent: OfflineEvent
+) : Transaction<InsertAndCancelCurrentOfflineEventTransaction.TransactionResult>() {
+
+    constructor(timestamp: Long, duration: Long, reason: OfflineEvent.Reason) :
+        this(OfflineEvent(timestamp = timestamp, reason = reason, duration = duration))
+
+    override fun run(): TransactionResult {
+        val result = TransactionResult()
+        val current = database.offlineEventDao.getOfflineEventActiveAt(offlineEvent.timestamp).blockingGet()
+        if (current != null) {
+            current.end = offlineEvent.timestamp
+            database.offlineEventDao.updateExistingEntry(current)
+            result.updated.add(current)
+        }
+        database.offlineEventDao.insertNewEntry(offlineEvent)
+        result.inserted.add(offlineEvent)
+        return result
+    }
+
+    class TransactionResult {
+        val inserted = mutableListOf<OfflineEvent>()
+        val updated = mutableListOf<OfflineEvent>()
+    }
+}
\ No newline at end of file
diff --git a/database/src/main/java/info/nightscout/androidaps/database/transactions/InsertTemporaryTargetAndCancelCurrentTransaction.kt b/database/src/main/java/info/nightscout/androidaps/database/transactions/InsertAndCancelCurrentTemporaryTargetTransaction.kt
similarity index 90%
rename from database/src/main/java/info/nightscout/androidaps/database/transactions/InsertTemporaryTargetAndCancelCurrentTransaction.kt
rename to database/src/main/java/info/nightscout/androidaps/database/transactions/InsertAndCancelCurrentTemporaryTargetTransaction.kt
index c100d0c358..87867309b6 100644
--- a/database/src/main/java/info/nightscout/androidaps/database/transactions/InsertTemporaryTargetAndCancelCurrentTransaction.kt
+++ b/database/src/main/java/info/nightscout/androidaps/database/transactions/InsertAndCancelCurrentTemporaryTargetTransaction.kt
@@ -3,9 +3,9 @@ package info.nightscout.androidaps.database.transactions
 import info.nightscout.androidaps.database.entities.TemporaryTarget
 import info.nightscout.androidaps.database.interfaces.end
 
-class InsertTemporaryTargetAndCancelCurrentTransaction(
+class InsertAndCancelCurrentTemporaryTargetTransaction(
     val temporaryTarget: TemporaryTarget
-) : Transaction<InsertTemporaryTargetAndCancelCurrentTransaction.TransactionResult>() {
+) : Transaction<InsertAndCancelCurrentTemporaryTargetTransaction.TransactionResult>() {
 
     constructor(timestamp: Long, duration: Long, reason: TemporaryTarget.Reason, lowTarget: Double, highTarget: Double) :
         this(TemporaryTarget(timestamp = timestamp, reason = reason, lowTarget = lowTarget, highTarget = highTarget, duration = duration))
diff --git a/database/src/main/java/info/nightscout/androidaps/database/transactions/InvalidateOfflineEventTransaction.kt b/database/src/main/java/info/nightscout/androidaps/database/transactions/InvalidateOfflineEventTransaction.kt
new file mode 100644
index 0000000000..9db9b8e84a
--- /dev/null
+++ b/database/src/main/java/info/nightscout/androidaps/database/transactions/InvalidateOfflineEventTransaction.kt
@@ -0,0 +1,10 @@
+package info.nightscout.androidaps.database.transactions
+
+class InvalidateOfflineEventTransaction(val id: Long) : Transaction<Unit>() {
+    override fun run() {
+        val offlineEvent = database.offlineEventDao.findById(id)
+            ?: throw IllegalArgumentException("There is no such OfflineEvent with the specified ID.")
+        offlineEvent.isValid = false
+        database.offlineEventDao.updateExistingEntry(offlineEvent)
+    }
+}
\ No newline at end of file
diff --git a/database/src/main/java/info/nightscout/androidaps/database/transactions/InvalidateTemporaryBasalTransactionWithPumpId.kt b/database/src/main/java/info/nightscout/androidaps/database/transactions/InvalidateTemporaryBasalTransactionWithPumpId.kt
new file mode 100644
index 0000000000..558731b28c
--- /dev/null
+++ b/database/src/main/java/info/nightscout/androidaps/database/transactions/InvalidateTemporaryBasalTransactionWithPumpId.kt
@@ -0,0 +1,25 @@
+package info.nightscout.androidaps.database.transactions
+
+import info.nightscout.androidaps.database.embedments.InterfaceIDs
+import info.nightscout.androidaps.database.entities.TemporaryBasal
+
+class InvalidateTemporaryBasalTransactionWithPumpId(val pumpId: Long, val pumpType: InterfaceIDs.PumpType, val
+pumpSerial:
+String) :
+    Transaction<InvalidateTemporaryBasalTransactionWithPumpId.TransactionResult>() {
+
+    override fun run(): TransactionResult {
+        val result = TransactionResult()
+        val temporaryBasal = database.temporaryBasalDao.findByPumpIds(pumpId, pumpType, pumpSerial)
+            ?: throw IllegalArgumentException("There is no such Temporary Basal with the specified temp ID.")
+        temporaryBasal.isValid = false
+        database.temporaryBasalDao.updateExistingEntry(temporaryBasal)
+        result.invalidated.add(temporaryBasal)
+        return result
+    }
+
+    class TransactionResult {
+
+        val invalidated = mutableListOf<TemporaryBasal>()
+    }
+}
\ No newline at end of file
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/SyncNsOfflineEventTransaction.kt b/database/src/main/java/info/nightscout/androidaps/database/transactions/SyncNsOfflineEventTransaction.kt
new file mode 100644
index 0000000000..d7a741436c
--- /dev/null
+++ b/database/src/main/java/info/nightscout/androidaps/database/transactions/SyncNsOfflineEventTransaction.kt
@@ -0,0 +1,73 @@
+package info.nightscout.androidaps.database.transactions
+
+import info.nightscout.androidaps.database.entities.OfflineEvent
+import info.nightscout.androidaps.database.interfaces.end
+import kotlin.math.abs
+
+/**
+ * Sync the OfflineEvent from NS
+ */
+class SyncNsOfflineEventTransaction(private val offlineEvent: OfflineEvent, private val invalidateByNsOnly: Boolean) : Transaction<SyncNsOfflineEventTransaction.TransactionResult>() {
+
+    override fun run(): TransactionResult {
+        val result = TransactionResult()
+
+        if (offlineEvent.duration != 0L) {
+            // not ending event
+            val current: OfflineEvent? =
+                offlineEvent.interfaceIDs.nightscoutId?.let {
+                    database.offlineEventDao.findByNSId(it)
+                }
+
+            if (current != null) {
+                // nsId exists, allow only invalidation
+                if (current.isValid && !offlineEvent.isValid) {
+                    current.isValid = false
+                    database.offlineEventDao.updateExistingEntry(current)
+                    result.invalidated.add(current)
+                }
+                return result
+            }
+
+            if (invalidateByNsOnly) return result
+
+            // not known nsId
+            val running = database.offlineEventDao.getOfflineEventActiveAt(offlineEvent.timestamp).blockingGet()
+            if (running != null && abs(running.timestamp - offlineEvent.timestamp) < 1000 && running.interfaceIDs.nightscoutId == null) { // allow missing milliseconds
+                // the same record, update nsId only
+                running.interfaceIDs.nightscoutId = offlineEvent.interfaceIDs.nightscoutId
+                database.offlineEventDao.updateExistingEntry(running)
+                result.updatedNsId.add(running)
+            } else if (running != null) {
+                // another running record. end current and insert new
+                running.end = offlineEvent.timestamp
+                database.offlineEventDao.updateExistingEntry(running)
+                database.offlineEventDao.insertNewEntry(offlineEvent)
+                result.ended.add(running)
+                result.inserted.add(offlineEvent)
+            } else {
+                database.offlineEventDao.insertNewEntry(offlineEvent)
+                result.inserted.add(offlineEvent)
+            }
+            return result
+
+        } else {
+            // ending event
+            val running = database.offlineEventDao.getOfflineEventActiveAt(offlineEvent.timestamp).blockingGet()
+            if (running != null) {
+                running.end = offlineEvent.timestamp
+                database.offlineEventDao.updateExistingEntry(running)
+                result.ended.add(running)
+            }
+        }
+        return result
+    }
+
+    class TransactionResult {
+
+        val updatedNsId = mutableListOf<OfflineEvent>()
+        val inserted = mutableListOf<OfflineEvent>()
+        val invalidated = mutableListOf<OfflineEvent>()
+        val ended = mutableListOf<OfflineEvent>()
+    }
+}
\ No newline at end of file
diff --git a/database/src/main/java/info/nightscout/androidaps/database/transactions/UpdateNsIdBolusCalculatorResultTransaction.kt b/database/src/main/java/info/nightscout/androidaps/database/transactions/UpdateNsIdBolusCalculatorResultTransaction.kt
index da50ce0a55..b824e1b4f4 100644
--- a/database/src/main/java/info/nightscout/androidaps/database/transactions/UpdateNsIdBolusCalculatorResultTransaction.kt
+++ b/database/src/main/java/info/nightscout/androidaps/database/transactions/UpdateNsIdBolusCalculatorResultTransaction.kt
@@ -6,7 +6,9 @@ class UpdateNsIdBolusCalculatorResultTransaction(val bolusCalculatorResult: Bolu
 
     override fun run() {
         val current = database.bolusCalculatorResultDao.findById(bolusCalculatorResult.id)
-        if (current != null && current.interfaceIDs.nightscoutId != bolusCalculatorResult.interfaceIDs.nightscoutId)
-            database.bolusCalculatorResultDao.updateExistingEntry(bolusCalculatorResult)
+        if (current != null && current.interfaceIDs.nightscoutId != bolusCalculatorResult.interfaceIDs.nightscoutId) {
+            current.interfaceIDs.nightscoutId = bolusCalculatorResult.interfaceIDs.nightscoutId
+            database.bolusCalculatorResultDao.updateExistingEntry(current)
+        }
     }
 }
\ No newline at end of file
diff --git a/database/src/main/java/info/nightscout/androidaps/database/transactions/UpdateNsIdBolusTransaction.kt b/database/src/main/java/info/nightscout/androidaps/database/transactions/UpdateNsIdBolusTransaction.kt
index a6e0a574ff..2504545419 100644
--- a/database/src/main/java/info/nightscout/androidaps/database/transactions/UpdateNsIdBolusTransaction.kt
+++ b/database/src/main/java/info/nightscout/androidaps/database/transactions/UpdateNsIdBolusTransaction.kt
@@ -6,7 +6,9 @@ class UpdateNsIdBolusTransaction(val bolus: Bolus) : Transaction<Unit>() {
 
     override fun run() {
         val current = database.bolusDao.findById(bolus.id)
-        if (current != null && current.interfaceIDs.nightscoutId != bolus.interfaceIDs.nightscoutId)
-            database.bolusDao.updateExistingEntry(bolus)
+        if (current != null && current.interfaceIDs.nightscoutId != bolus.interfaceIDs.nightscoutId) {
+            current.interfaceIDs.nightscoutId = bolus.interfaceIDs.nightscoutId
+            database.bolusDao.updateExistingEntry(current)
+        }
     }
 }
\ No newline at end of file
diff --git a/database/src/main/java/info/nightscout/androidaps/database/transactions/UpdateNsIdCarbsTransaction.kt b/database/src/main/java/info/nightscout/androidaps/database/transactions/UpdateNsIdCarbsTransaction.kt
index 2cba4540f9..9595fd3a17 100644
--- a/database/src/main/java/info/nightscout/androidaps/database/transactions/UpdateNsIdCarbsTransaction.kt
+++ b/database/src/main/java/info/nightscout/androidaps/database/transactions/UpdateNsIdCarbsTransaction.kt
@@ -6,7 +6,9 @@ class UpdateNsIdCarbsTransaction(val carbs: Carbs) : Transaction<Unit>() {
 
     override fun run() {
         val current = database.carbsDao.findById(carbs.id)
-        if (current != null && current.interfaceIDs.nightscoutId != carbs.interfaceIDs.nightscoutId)
-            database.carbsDao.updateExistingEntry(carbs)
+        if (current != null && current.interfaceIDs.nightscoutId != carbs.interfaceIDs.nightscoutId) {
+            current.interfaceIDs.nightscoutId = carbs.interfaceIDs.nightscoutId
+            database.carbsDao.updateExistingEntry(current)
+        }
     }
 }
\ No newline at end of file
diff --git a/database/src/main/java/info/nightscout/androidaps/database/transactions/UpdateNsIdDeviceStatusTransaction.kt b/database/src/main/java/info/nightscout/androidaps/database/transactions/UpdateNsIdDeviceStatusTransaction.kt
index 766f672877..159992ba5f 100644
--- a/database/src/main/java/info/nightscout/androidaps/database/transactions/UpdateNsIdDeviceStatusTransaction.kt
+++ b/database/src/main/java/info/nightscout/androidaps/database/transactions/UpdateNsIdDeviceStatusTransaction.kt
@@ -6,7 +6,9 @@ class UpdateNsIdDeviceStatusTransaction(val deviceStatus: DeviceStatus) : Transa
 
     override fun run() {
         val current = database.deviceStatusDao.findById(deviceStatus.id)
-        if (current != null && current.interfaceIDs.nightscoutId != deviceStatus.interfaceIDs.nightscoutId)
-            database.deviceStatusDao.update(deviceStatus)
+        if (current != null && current.interfaceIDs.nightscoutId != deviceStatus.interfaceIDs.nightscoutId) {
+            current.interfaceIDs.nightscoutId = deviceStatus.interfaceIDs.nightscoutId
+            database.deviceStatusDao.update(current)
+        }
     }
 }
\ 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/database/src/main/java/info/nightscout/androidaps/database/transactions/UpdateNsIdExtendedBolusTransaction.kt b/database/src/main/java/info/nightscout/androidaps/database/transactions/UpdateNsIdExtendedBolusTransaction.kt
index cfa12027b1..cc174ad734 100644
--- a/database/src/main/java/info/nightscout/androidaps/database/transactions/UpdateNsIdExtendedBolusTransaction.kt
+++ b/database/src/main/java/info/nightscout/androidaps/database/transactions/UpdateNsIdExtendedBolusTransaction.kt
@@ -6,7 +6,9 @@ class UpdateNsIdExtendedBolusTransaction(val bolus: ExtendedBolus) : Transaction
 
     override fun run() {
         val current = database.extendedBolusDao.findById(bolus.id)
-        if (current != null && current.interfaceIDs.nightscoutId != bolus.interfaceIDs.nightscoutId)
-            database.extendedBolusDao.updateExistingEntry(bolus)
+        if (current != null && current.interfaceIDs.nightscoutId != bolus.interfaceIDs.nightscoutId) {
+            current.interfaceIDs.nightscoutId = bolus.interfaceIDs.nightscoutId
+            database.extendedBolusDao.updateExistingEntry(current)
+        }
     }
 }
\ No newline at end of file
diff --git a/database/src/main/java/info/nightscout/androidaps/database/transactions/UpdateNsIdFoodTransaction.kt b/database/src/main/java/info/nightscout/androidaps/database/transactions/UpdateNsIdFoodTransaction.kt
index e03e38e343..78179c8cb8 100644
--- a/database/src/main/java/info/nightscout/androidaps/database/transactions/UpdateNsIdFoodTransaction.kt
+++ b/database/src/main/java/info/nightscout/androidaps/database/transactions/UpdateNsIdFoodTransaction.kt
@@ -6,7 +6,9 @@ class UpdateNsIdFoodTransaction(val food: Food) : Transaction<Unit>() {
 
     override fun run() {
         val current = database.foodDao.findById(food.id)
-        if (current != null && current.interfaceIDs.nightscoutId != food.interfaceIDs.nightscoutId)
-            database.foodDao.updateExistingEntry(food)
+        if (current != null && current.interfaceIDs.nightscoutId != food.interfaceIDs.nightscoutId) {
+            current.interfaceIDs.nightscoutId = food.interfaceIDs.nightscoutId
+            database.foodDao.updateExistingEntry(current)
+        }
     }
 }
\ No newline at end of file
diff --git a/database/src/main/java/info/nightscout/androidaps/database/transactions/UpdateNsIdGlucoseValueTransaction.kt b/database/src/main/java/info/nightscout/androidaps/database/transactions/UpdateNsIdGlucoseValueTransaction.kt
index 954aadd39b..3b43b92943 100644
--- a/database/src/main/java/info/nightscout/androidaps/database/transactions/UpdateNsIdGlucoseValueTransaction.kt
+++ b/database/src/main/java/info/nightscout/androidaps/database/transactions/UpdateNsIdGlucoseValueTransaction.kt
@@ -6,7 +6,9 @@ class UpdateNsIdGlucoseValueTransaction(val glucoseValue: GlucoseValue) : Transa
 
     override fun run() {
         val current = database.glucoseValueDao.findById(glucoseValue.id)
-        if (current != null && current.interfaceIDs.nightscoutId != glucoseValue.interfaceIDs.nightscoutId)
-            database.glucoseValueDao.updateExistingEntry(glucoseValue)
+        if (current != null && current.interfaceIDs.nightscoutId != glucoseValue.interfaceIDs.nightscoutId) {
+            current.interfaceIDs.nightscoutId = glucoseValue.interfaceIDs.nightscoutId
+            database.glucoseValueDao.updateExistingEntry(current)
+        }
     }
 }
\ No newline at end of file
diff --git a/database/src/main/java/info/nightscout/androidaps/database/transactions/UpdateNsIdOfflineEventTransaction.kt b/database/src/main/java/info/nightscout/androidaps/database/transactions/UpdateNsIdOfflineEventTransaction.kt
new file mode 100644
index 0000000000..3da1b26ce7
--- /dev/null
+++ b/database/src/main/java/info/nightscout/androidaps/database/transactions/UpdateNsIdOfflineEventTransaction.kt
@@ -0,0 +1,14 @@
+package info.nightscout.androidaps.database.transactions
+
+import info.nightscout.androidaps.database.entities.OfflineEvent
+
+class UpdateNsIdOfflineEventTransaction(val offlineEvent: OfflineEvent) : Transaction<Unit>() {
+
+    override fun run() {
+        val current = database.offlineEventDao.findById(offlineEvent.id)
+        if (current != null && current.interfaceIDs.nightscoutId != offlineEvent.interfaceIDs.nightscoutId) {
+            current.interfaceIDs.nightscoutId = offlineEvent.interfaceIDs.nightscoutId
+            database.offlineEventDao.updateExistingEntry(current)
+        }
+    }
+}
\ No newline at end of file
diff --git a/database/src/main/java/info/nightscout/androidaps/database/transactions/UpdateNsIdProfileSwitchTransaction.kt b/database/src/main/java/info/nightscout/androidaps/database/transactions/UpdateNsIdProfileSwitchTransaction.kt
index 63a589db51..368a66dc3f 100644
--- a/database/src/main/java/info/nightscout/androidaps/database/transactions/UpdateNsIdProfileSwitchTransaction.kt
+++ b/database/src/main/java/info/nightscout/androidaps/database/transactions/UpdateNsIdProfileSwitchTransaction.kt
@@ -6,7 +6,9 @@ class UpdateNsIdProfileSwitchTransaction(val profileSwitch: ProfileSwitch) : Tra
 
     override fun run() {
         val current = database.profileSwitchDao.findById(profileSwitch.id)
-        if (current != null && current.interfaceIDs.nightscoutId != profileSwitch.interfaceIDs.nightscoutId)
-            database.profileSwitchDao.updateExistingEntry(profileSwitch)
+        if (current != null && current.interfaceIDs.nightscoutId != profileSwitch.interfaceIDs.nightscoutId) {
+            current.interfaceIDs.nightscoutId = profileSwitch.interfaceIDs.nightscoutId
+            database.profileSwitchDao.updateExistingEntry(current)
+        }
     }
 }
\ No newline at end of file
diff --git a/database/src/main/java/info/nightscout/androidaps/database/transactions/UpdateNsIdTemporaryBasalTransaction.kt b/database/src/main/java/info/nightscout/androidaps/database/transactions/UpdateNsIdTemporaryBasalTransaction.kt
index be9a3c3efa..571f3da027 100644
--- a/database/src/main/java/info/nightscout/androidaps/database/transactions/UpdateNsIdTemporaryBasalTransaction.kt
+++ b/database/src/main/java/info/nightscout/androidaps/database/transactions/UpdateNsIdTemporaryBasalTransaction.kt
@@ -2,11 +2,13 @@ package info.nightscout.androidaps.database.transactions
 
 import info.nightscout.androidaps.database.entities.TemporaryBasal
 
-class UpdateNsIdTemporaryBasalTransaction(val bolus: TemporaryBasal) : Transaction<Unit>() {
+class UpdateNsIdTemporaryBasalTransaction(val temporaryBasal: TemporaryBasal) : Transaction<Unit>() {
 
     override fun run() {
-        val current = database.temporaryBasalDao.findById(bolus.id)
-        if (current != null && current.interfaceIDs.nightscoutId != bolus.interfaceIDs.nightscoutId)
-            database.temporaryBasalDao.updateExistingEntry(bolus)
+        val current = database.temporaryBasalDao.findById(temporaryBasal.id)
+        if (current != null && current.interfaceIDs.nightscoutId != temporaryBasal.interfaceIDs.nightscoutId) {
+            current.interfaceIDs.nightscoutId = temporaryBasal.interfaceIDs.nightscoutId
+            database.temporaryBasalDao.updateExistingEntry(current)
+        }
     }
 }
\ No newline at end of file
diff --git a/database/src/main/java/info/nightscout/androidaps/database/transactions/UpdateNsIdTemporaryTargetTransaction.kt b/database/src/main/java/info/nightscout/androidaps/database/transactions/UpdateNsIdTemporaryTargetTransaction.kt
index 419fba854d..28bd4211d6 100644
--- a/database/src/main/java/info/nightscout/androidaps/database/transactions/UpdateNsIdTemporaryTargetTransaction.kt
+++ b/database/src/main/java/info/nightscout/androidaps/database/transactions/UpdateNsIdTemporaryTargetTransaction.kt
@@ -6,7 +6,9 @@ class UpdateNsIdTemporaryTargetTransaction(val temporaryTarget: TemporaryTarget)
 
     override fun run() {
         val current = database.temporaryTargetDao.findById(temporaryTarget.id)
-        if (current != null && current.interfaceIDs.nightscoutId != temporaryTarget.interfaceIDs.nightscoutId)
-            database.temporaryTargetDao.updateExistingEntry(temporaryTarget)
+        if (current != null && current.interfaceIDs.nightscoutId != temporaryTarget.interfaceIDs.nightscoutId) {
+            current.interfaceIDs.nightscoutId = temporaryTarget.interfaceIDs.nightscoutId
+            database.temporaryTargetDao.updateExistingEntry(current)
+        }
     }
 }
\ No newline at end of file
diff --git a/database/src/main/java/info/nightscout/androidaps/database/transactions/UpdateNsIdTherapyEventTransaction.kt b/database/src/main/java/info/nightscout/androidaps/database/transactions/UpdateNsIdTherapyEventTransaction.kt
index 680fbe7ca3..0f04c6f81d 100644
--- a/database/src/main/java/info/nightscout/androidaps/database/transactions/UpdateNsIdTherapyEventTransaction.kt
+++ b/database/src/main/java/info/nightscout/androidaps/database/transactions/UpdateNsIdTherapyEventTransaction.kt
@@ -6,7 +6,9 @@ class UpdateNsIdTherapyEventTransaction(val therapyEvent: TherapyEvent) : Transa
 
     override fun run() {
         val current = database.therapyEventDao.findById(therapyEvent.id)
-        if (current != null && current.interfaceIDs.nightscoutId != therapyEvent.interfaceIDs.nightscoutId)
-            database.therapyEventDao.updateExistingEntry(therapyEvent)
+        if (current != null && current.interfaceIDs.nightscoutId != therapyEvent.interfaceIDs.nightscoutId) {
+            current.interfaceIDs.nightscoutId = therapyEvent.interfaceIDs.nightscoutId
+            database.therapyEventDao.updateExistingEntry(current)
+        }
     }
 }
\ No newline at end of file
diff --git a/database/src/main/java/info/nightscout/androidaps/database/transactions/UpdateTemporaryTargetTransaction.kt b/database/src/main/java/info/nightscout/androidaps/database/transactions/UpdateTemporaryTargetTransaction.kt
deleted file mode 100644
index f07a57fce2..0000000000
--- a/database/src/main/java/info/nightscout/androidaps/database/transactions/UpdateTemporaryTargetTransaction.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-package info.nightscout.androidaps.database.transactions
-
-import info.nightscout.androidaps.database.entities.TemporaryTarget
-
-class UpdateTemporaryTargetTransaction(val temporaryTarget: TemporaryTarget) : Transaction<Unit>() {
-    override fun run() {
-        database.temporaryTargetDao.updateExistingEntry(temporaryTarget)
-    }
-}
\ No newline at end of file
diff --git a/database/src/release/java/info/nightscout/androidaps/annotations/OpenForTesting.kt b/database/src/release/java/info/nightscout/androidaps/annotations/OpenForTesting.kt
new file mode 100644
index 0000000000..10911a3e95
--- /dev/null
+++ b/database/src/release/java/info/nightscout/androidaps/annotations/OpenForTesting.kt
@@ -0,0 +1,8 @@
+package info.nightscout.androidaps.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
\ No newline at end of file
diff --git a/diaconn/build.gradle b/diaconn/build.gradle
new file mode 100644
index 0000000000..2f86ece0a2
--- /dev/null
+++ b/diaconn/build.gradle
@@ -0,0 +1,30 @@
+apply plugin: 'com.android.library'
+apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-kapt'
+apply plugin: 'kotlin-allopen'
+apply plugin: 'com.hiya.jacoco-android'
+
+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"
+
+android {
+    defaultConfig {
+        kapt {
+            arguments {
+                arg("room.incremental", "true")
+                arg("room.schemaLocation", "$projectDir/schemas")
+            }
+        }
+    }
+}
+
+dependencies {
+    implementation project(':core')
+
+    api "androidx.room:room-ktx:$room_version"
+    api "androidx.room:room-runtime:$room_version"
+    api "androidx.room:room-rxjava2:$room_version"
+    kapt "androidx.room:room-compiler:$room_version"
+}
\ No newline at end of file
diff --git a/diaconn/consumer-rules.pro b/diaconn/consumer-rules.pro
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/diaconn/proguard-rules.pro b/diaconn/proguard-rules.pro
new file mode 100644
index 0000000000..481bb43481
--- /dev/null
+++ b/diaconn/proguard-rules.pro
@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
\ No newline at end of file
diff --git a/diaconn/schemas/info.nightscout.androidaps.diaconn.database.DiaconnHistoryDatabase/1.json b/diaconn/schemas/info.nightscout.androidaps.diaconn.database.DiaconnHistoryDatabase/1.json
new file mode 100644
index 0000000000..b6e405a524
--- /dev/null
+++ b/diaconn/schemas/info.nightscout.androidaps.diaconn.database.DiaconnHistoryDatabase/1.json
@@ -0,0 +1,92 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 1,
+    "identityHash": "698b023da2f9efdc0351236c43eb20b6",
+    "entities": [
+      {
+        "tableName": "diaconnHistory",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`timestamp` INTEGER NOT NULL, `code` INTEGER NOT NULL, `value` REAL NOT NULL, `bolusType` TEXT NOT NULL, `stringValue` TEXT NOT NULL, `duration` INTEGER NOT NULL, `dailyBasal` REAL NOT NULL, `dailyBolus` REAL NOT NULL, `alarm` TEXT NOT NULL, PRIMARY KEY(`timestamp`))",
+        "fields": [
+          {
+            "fieldPath": "timestamp",
+            "columnName": "timestamp",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "code",
+            "columnName": "code",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "value",
+            "columnName": "value",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "bolusType",
+            "columnName": "bolusType",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "stringValue",
+            "columnName": "stringValue",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "duration",
+            "columnName": "duration",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "dailyBasal",
+            "columnName": "dailyBasal",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "dailyBolus",
+            "columnName": "dailyBolus",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "alarm",
+            "columnName": "alarm",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "timestamp"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [
+          {
+            "name": "index_diaconnHistory_code_timestamp",
+            "unique": false,
+            "columnNames": [
+              "code",
+              "timestamp"
+            ],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_diaconnHistory_code_timestamp` ON `${TABLE_NAME}` (`code`, `timestamp`)"
+          }
+        ],
+        "foreignKeys": []
+      }
+    ],
+    "views": [],
+    "setupQueries": [
+      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '698b023da2f9efdc0351236c43eb20b6')"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/diaconn/src/main/AndroidManifest.xml b/diaconn/src/main/AndroidManifest.xml
new file mode 100644
index 0000000000..3ddb6c3a37
--- /dev/null
+++ b/diaconn/src/main/AndroidManifest.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="info.nightscout.androidaps.diaconn">
+
+    <uses-permission android:name="android.permission.BLUETOOTH" />
+    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
+
+    <application>
+        <activity android:name="info.nightscout.androidaps.diaconn.activities.DiaconnG8HistoryActivity" />
+        <activity android:name="info.nightscout.androidaps.diaconn.activities.DiaconnG8UserOptionsActivity" />
+        <activity android:name="info.nightscout.androidaps.diaconn.activities.DiaconnG8BLEScanActivity">
+            <intent-filter>
+                <action android:name="info.nightscout.androidaps.plugins.PumpDiaconnG8.activities.DiaconnG8BLEScanActivity" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
+        <service android:name="info.nightscout.androidaps.diaconn.service.DiaconnG8Service"
+            android:enabled="true"
+            android:exported="false"/>
+    </application>
+
+</manifest>
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/DiaconnG8Fragment.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/DiaconnG8Fragment.kt
new file mode 100644
index 0000000000..31ff3fd40b
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/DiaconnG8Fragment.kt
@@ -0,0 +1,200 @@
+package info.nightscout.androidaps.diaconn
+
+import android.annotation.SuppressLint
+import android.content.Intent
+import android.os.Bundle
+import android.os.Handler
+import android.os.Looper
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import dagger.android.support.DaggerFragment
+import info.nightscout.androidaps.activities.TDDStatsActivity
+import info.nightscout.androidaps.diaconn.activities.DiaconnG8HistoryActivity
+import info.nightscout.androidaps.diaconn.activities.DiaconnG8UserOptionsActivity
+import info.nightscout.androidaps.diaconn.databinding.DiaconnG8FragmentBinding
+import info.nightscout.androidaps.diaconn.events.EventDiaconnG8NewStatus
+import info.nightscout.androidaps.events.EventExtendedBolusChange
+import info.nightscout.androidaps.events.EventInitializationChanged
+import info.nightscout.androidaps.events.EventPumpStatusChanged
+import info.nightscout.androidaps.events.EventTempBasalChange
+import info.nightscout.androidaps.interfaces.ActivePlugin
+import info.nightscout.androidaps.interfaces.CommandQueueProvider
+import info.nightscout.androidaps.interfaces.Pump
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.queue.events.EventQueueChanged
+import info.nightscout.androidaps.utils.DateUtil
+import info.nightscout.androidaps.utils.FabricPrivacy
+import info.nightscout.androidaps.utils.T
+import info.nightscout.androidaps.utils.WarnColors
+import io.reactivex.rxkotlin.plusAssign
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import info.nightscout.androidaps.utils.sharedPreferences.SP
+import io.reactivex.android.schedulers.AndroidSchedulers
+import io.reactivex.disposables.CompositeDisposable
+import javax.inject.Inject
+
+class DiaconnG8Fragment : DaggerFragment() {
+
+    @Inject lateinit var rxBus: RxBusWrapper
+    @Inject lateinit var aapsLogger: AAPSLogger
+    @Inject lateinit var fabricPrivacy: FabricPrivacy
+    @Inject lateinit var commandQueue: CommandQueueProvider
+    @Inject lateinit var activePlugin: ActivePlugin
+    @Inject lateinit var diaconnG8Pump: DiaconnG8Pump
+    @Inject lateinit var resourceHelper: ResourceHelper
+    @Inject lateinit var sp: SP
+    @Inject lateinit var warnColors: WarnColors
+    @Inject lateinit var dateUtil: DateUtil
+
+    private var disposable: CompositeDisposable = CompositeDisposable()
+
+    private val loopHandler = Handler(Looper.getMainLooper())
+    private lateinit var refreshLoop: Runnable
+
+    private var _binding: DiaconnG8FragmentBinding? = null
+
+    // This property is only valid between onCreateView and
+    // onDestroyView.
+    private val binding get() = _binding!!
+
+    init {
+        refreshLoop = Runnable {
+            activity?.runOnUiThread { updateGUI() }
+            loopHandler.postDelayed(refreshLoop, T.mins(1).msecs())
+        }
+    }
+
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
+                              savedInstanceState: Bundle?): View {
+        _binding = DiaconnG8FragmentBinding.inflate(inflater, container, false)
+        return binding.root
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        binding.history.setOnClickListener { startActivity(Intent(context, DiaconnG8HistoryActivity::class.java)) }
+        binding.stats.setOnClickListener { startActivity(Intent(context, TDDStatsActivity::class.java)) }
+        binding.userOptions.setOnClickListener { startActivity(Intent(context, DiaconnG8UserOptionsActivity::class.java)) }
+        binding.btconnection.setOnClickListener {
+            aapsLogger.debug(LTag.PUMP, "Clicked connect to pump")
+            diaconnG8Pump.lastConnection = 0
+            commandQueue.readStatus("Clicked connect to pump", null)
+        }
+    }
+
+    @Synchronized
+    override fun onResume() {
+        super.onResume()
+        loopHandler.postDelayed(refreshLoop, T.mins(1).msecs())
+        disposable += rxBus
+            .toObservable(EventInitializationChanged::class.java)
+            .observeOn(AndroidSchedulers.mainThread())
+            .subscribe({ updateGUI() }, fabricPrivacy::logException)
+        disposable += rxBus
+            .toObservable(EventDiaconnG8NewStatus::class.java)
+            .observeOn(AndroidSchedulers.mainThread())
+            .subscribe({ updateGUI() }, fabricPrivacy::logException)
+        disposable += rxBus
+            .toObservable(EventExtendedBolusChange::class.java)
+            .observeOn(AndroidSchedulers.mainThread())
+            .subscribe({ updateGUI() }, fabricPrivacy::logException)
+        disposable += rxBus
+            .toObservable(EventTempBasalChange::class.java)
+            .observeOn(AndroidSchedulers.mainThread())
+            .subscribe({ updateGUI() }, fabricPrivacy::logException)
+        disposable += rxBus
+            .toObservable(EventQueueChanged::class.java)
+            .observeOn(AndroidSchedulers.mainThread())
+            .subscribe({ updateGUI() }, fabricPrivacy::logException)
+        disposable += rxBus
+            .toObservable(EventPumpStatusChanged::class.java)
+            .observeOn(AndroidSchedulers.mainThread())
+            .subscribe({
+                when (it.status) {
+                    EventPumpStatusChanged.Status.CONNECTING   ->
+                        @Suppress("SetTextI18n")
+                        binding.btconnection.text = "{fa-bluetooth-b spin} ${it.secondsElapsed}s"
+                    EventPumpStatusChanged.Status.CONNECTED    ->
+                        @Suppress("SetTextI18n")
+                        binding.btconnection.text = "{fa-bluetooth}"
+                    EventPumpStatusChanged.Status.DISCONNECTED ->
+                        @Suppress("SetTextI18n")
+                        binding.btconnection.text = "{fa-bluetooth-b}"
+                    else                                       -> {}
+                }
+                if (it.getStatus(resourceHelper) != "") {
+                    binding.diaconnG8Pumpstatus.text = it.getStatus(resourceHelper)
+                    binding.diaconnG8Pumpstatuslayout.visibility = View.VISIBLE
+                } else {
+                    binding.diaconnG8Pumpstatuslayout.visibility = View.GONE
+                }
+            }, fabricPrivacy::logException)
+        updateGUI()
+    }
+
+    @Synchronized
+    override fun onPause() {
+        super.onPause()
+        disposable.clear()
+        loopHandler.removeCallbacks(refreshLoop)
+    }
+
+    @Synchronized
+    override fun onDestroyView() {
+        super.onDestroyView()
+        _binding = null
+    }
+
+    @SuppressLint("SetTextI18n")
+    @Synchronized
+    fun updateGUI() {
+        if (_binding == null) return
+        val pump = diaconnG8Pump
+        val plugin: Pump = activePlugin.activePump
+        if (pump.lastConnection != 0L) {
+            val agoMsec = System.currentTimeMillis() - pump.lastConnection
+            val agoMin = (agoMsec.toDouble() / 60.0 / 1000.0).toInt()
+            binding.lastconnection.text = dateUtil.timeString(pump.lastConnection) + " (" + resourceHelper.gs(R.string.minago, agoMin) + ")"
+            warnColors.setColor(binding.lastconnection, agoMin.toDouble(), 16.0, 31.0)
+        }
+        if (pump.lastBolusTime != 0L) {
+            val agoMsec = System.currentTimeMillis() - pump.lastBolusTime
+            val agoHours = agoMsec.toDouble() / 60.0 / 60.0 / 1000.0
+            if (agoHours < 6)
+            // max 6h back
+                binding.lastbolus.text = dateUtil.timeString(pump.lastBolusTime) + " " + dateUtil.sinceString(pump.lastBolusTime, resourceHelper) + " " + resourceHelper.gs(R.string.formatinsulinunits, pump.lastBolusAmount)
+            else
+                binding.lastbolus.text = ""
+        }
+
+        val todayInsulinAmount = (pump.todayBaseAmount + pump.todaySnackAmount + pump.todayMealAmount)
+        val todayInsulinLimitAmount = (pump.maxBasal.toInt() * 24) + pump.maxBolusePerDay.toInt()
+        binding.dailyunits.text = resourceHelper.gs(R.string.reservoirvalue, todayInsulinAmount, todayInsulinLimitAmount)
+        warnColors.setColor(binding.dailyunits, todayInsulinAmount, todayInsulinLimitAmount * 0.75, todayInsulinLimitAmount * 0.9)
+        binding.basabasalrate.text = pump.baseInjAmount.toString() +" / "+ resourceHelper.gs(R.string.pump_basebasalrate, plugin.baseBasalRate)
+
+        binding.tempbasal.text = diaconnG8Pump.temporaryBasalToString()
+        binding.extendedbolus.text = diaconnG8Pump.extendedBolusToString()
+        binding.reservoir.text = resourceHelper.gs(R.string.reservoirvalue, pump.systemRemainInsulin, 307)
+        warnColors.setColorInverse(binding.reservoir, pump.systemRemainInsulin , 50.0, 20.0)
+        binding.battery.text = "{fa-battery-" + pump.systemRemainBattery / 25  + "}" + " ("+ pump.systemRemainBattery + " %)"
+        warnColors.setColorInverse(binding.battery, pump.systemRemainBattery.toDouble(), 51.0, 26.0)
+        binding.firmware.text = resourceHelper.gs(R.string.diaconn_g8_pump) + "\nVersion: " + pump.majorVersion.toString() + "." +  pump.minorVersion.toString() + "\nCountry: "+pump.country.toString() + "\nProductType: "+ pump.productType.toString() + "\nManufacture: " + pump.makeYear + "." + pump.makeMonth + "." + pump.makeDay
+        binding.basalstep.text = pump.basalStep.toString()
+        binding.bolusstep.text = pump.bolusStep.toString()
+        binding.serialNumber.text = pump.serialNo.toString()
+        val status = commandQueue.spannedStatus()
+        if (status.toString() == "") {
+            binding.queue.visibility = View.GONE
+        } else {
+            binding.queue.visibility = View.VISIBLE
+            binding.queue.text = status
+        }
+
+        binding.userOptions.visibility = View.VISIBLE
+    }
+}
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/DiaconnG8Plugin.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/DiaconnG8Plugin.kt
new file mode 100644
index 0000000000..168c0f3fa5
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/DiaconnG8Plugin.kt
@@ -0,0 +1,593 @@
+package info.nightscout.androidaps.diaconn
+
+import android.content.ComponentName
+import android.content.Context
+import android.content.Intent
+import android.content.ServiceConnection
+import android.os.IBinder
+import android.text.format.DateFormat
+import androidx.preference.Preference
+import androidx.preference.PreferenceFragmentCompat
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.data.DetailedBolusInfo
+import info.nightscout.androidaps.data.PumpEnactResult
+import info.nightscout.androidaps.diaconn.events.EventDiaconnG8DeviceChange
+import info.nightscout.androidaps.diaconn.service.DiaconnG8Service
+import info.nightscout.androidaps.events.EventAppExit
+import info.nightscout.androidaps.events.EventConfigBuilderChange
+import info.nightscout.androidaps.extensions.convertedToAbsolute
+import info.nightscout.androidaps.extensions.plannedRemainingMinutes
+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.configBuilder.ConstraintChecker
+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.bolusInfo.DetailedBolusInfoStorage
+import info.nightscout.androidaps.plugins.pump.common.bolusInfo.TemporaryBasalStorage
+import info.nightscout.androidaps.plugins.pump.common.defs.PumpType
+import info.nightscout.androidaps.utils.*
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import info.nightscout.androidaps.utils.sharedPreferences.SP
+import io.reactivex.disposables.CompositeDisposable
+import io.reactivex.schedulers.Schedulers
+import org.json.JSONException
+import org.json.JSONObject
+import javax.inject.Inject
+import javax.inject.Singleton
+import kotlin.math.abs
+import kotlin.math.max
+
+@Singleton
+class DiaconnG8Plugin @Inject constructor(
+    injector: HasAndroidInjector,
+    aapsLogger: AAPSLogger,
+    private val rxBus: RxBusWrapper,
+    private val context: Context,
+    resourceHelper: ResourceHelper,
+    private val constraintChecker: ConstraintChecker,
+    private val profileFunction: ProfileFunction,
+    private val sp: SP,
+    commandQueue: CommandQueueProvider,
+    private val diaconnG8Pump: DiaconnG8Pump,
+    private val pumpSync: PumpSync,
+    private val detailedBolusInfoStorage: DetailedBolusInfoStorage,
+    private val temporaryBasalStorage: TemporaryBasalStorage,
+    private val fabricPrivacy: FabricPrivacy,
+    private val dateUtil: DateUtil
+) : PumpPluginBase(PluginDescription()
+    .mainType(PluginType.PUMP)
+    .fragmentClass(DiaconnG8Fragment::class.java.name)
+    .pluginIcon(R.drawable.ic_diaconn_g8)
+    .pluginName(R.string.diaconn_g8_pump)
+    .shortName(R.string.diaconn_g8_pump_shortname)
+    .preferencesId(R.xml.pref_diaconn)
+    .description(R.string.description_pump_diaconn_g8),
+    injector, aapsLogger, resourceHelper, commandQueue
+), Pump, Diaconn, Constraints {
+
+    private val disposable = CompositeDisposable()
+    private var diaconnG8Service: DiaconnG8Service? = null
+    private var mDeviceAddress = ""
+    var mDeviceName = ""
+    override val pumpDescription = PumpDescription(PumpType.DIACONN_G8)
+
+    override fun onStart() {
+        super.onStart()
+        val intent = Intent(context, DiaconnG8Service::class.java)
+        context.bindService(intent, mConnection, Context.BIND_AUTO_CREATE)
+        disposable.add(rxBus
+            .toObservable(EventAppExit::class.java)
+            .observeOn(Schedulers.io())
+            .subscribe({ context.unbindService(mConnection) }) { fabricPrivacy.logException(it) }
+        )
+        disposable.add(rxBus
+            .toObservable(EventConfigBuilderChange::class.java)
+            .observeOn(Schedulers.io())
+            .subscribe { diaconnG8Pump.reset() }
+        )
+        disposable.add(rxBus
+            .toObservable(EventDiaconnG8DeviceChange::class.java)
+            .observeOn(Schedulers.io())
+            .subscribe({ changePump() }) { fabricPrivacy.logException(it) }
+        )
+        changePump() // load device name
+    }
+
+    override fun onStop() {
+        context.unbindService(mConnection)
+        disposable.clear()
+        super.onStop()
+    }
+
+    private val mConnection: ServiceConnection = object : ServiceConnection {
+        override fun onServiceDisconnected(name: ComponentName) {
+            aapsLogger.debug(LTag.PUMP, "Service is disconnected")
+            diaconnG8Service = null
+        }
+
+        override fun onServiceConnected(name: ComponentName, service: IBinder) {
+            aapsLogger.debug(LTag.PUMP, "Service is connected")
+            val mLocalBinder = service as DiaconnG8Service.LocalBinder
+            diaconnG8Service = mLocalBinder.serviceInstance
+        }
+    }
+
+    fun changePump() {
+        mDeviceAddress = sp.getString(R.string.key_diaconn_g8_address, "")
+        mDeviceName = sp.getString(R.string.key_diaconn_g8_name, "")
+        diaconnG8Pump.reset()
+        commandQueue.readStatus("DeviceChanged", null)
+    }
+
+    override fun connect(reason: String) {
+        aapsLogger.debug(LTag.PUMP, "Diaconn G8 connect from: $reason")
+        if(diaconnG8Service != null && mDeviceAddress != "" && mDeviceName != "") {
+            val success = diaconnG8Service?.connect(reason, mDeviceAddress) ?: false
+            if(!success) ToastUtils.showToastInUiThread(context, resourceHelper.gs(R.string.ble_not_supported))
+        }
+    }
+
+    override fun isConnected(): Boolean = diaconnG8Service?.isConnected ?: false
+    override fun isConnecting(): Boolean = diaconnG8Service?.isConnecting ?: false
+    override fun isHandshakeInProgress(): Boolean = false
+
+
+    override fun disconnect(reason: String) {
+        aapsLogger.debug(LTag.PUMP, "Diaconn G8 disconnect from: $reason")
+        diaconnG8Service?.disconnect(reason)
+    }
+
+    override fun stopConnecting() {
+        diaconnG8Service?.stopConnecting()
+    }
+
+    override fun getPumpStatus(reason: String) {
+        diaconnG8Service?.readPumpStatus()
+        pumpDescription.basalStep = diaconnG8Pump.basalStep
+        pumpDescription.bolusStep = diaconnG8Pump.bolusStep
+        pumpDescription.basalMaximumRate = diaconnG8Pump.maxBasalPerHours
+    }
+
+    // Diaconn Pump Interface
+    override fun loadHistory(): PumpEnactResult {
+        return diaconnG8Service?.loadHistory() ?: PumpEnactResult(injector).success(false)
+    }
+
+    override fun setUserOptions(): PumpEnactResult {
+        return diaconnG8Service?.setUserSettings() ?: PumpEnactResult(injector).success(false)
+    }
+
+    // Constraints interface
+    override fun applyBasalConstraints(absoluteRate: Constraint<Double>, profile: Profile): Constraint<Double> {
+        absoluteRate.setIfSmaller(aapsLogger, diaconnG8Pump.maxBasal, resourceHelper.gs(R.string.limitingbasalratio, diaconnG8Pump.maxBasal, resourceHelper.gs(R.string.pumplimit)), this)
+        return absoluteRate
+    }
+
+    override fun applyBasalPercentConstraints(percentRate: Constraint<Int>, profile: Profile): Constraint<Int> {
+        percentRate.setIfGreater(aapsLogger, 0, resourceHelper.gs(R.string.limitingpercentrate, 0, resourceHelper.gs(R.string.itmustbepositivevalue)), this)
+        percentRate.setIfSmaller(aapsLogger, pumpDescription.maxTempPercent, resourceHelper.gs(R.string.limitingpercentrate, pumpDescription.maxTempPercent, resourceHelper.gs(R.string.pumplimit)), this)
+        return percentRate
+    }
+
+    override fun applyBolusConstraints(insulin: Constraint<Double>): Constraint<Double> {
+        insulin.setIfSmaller(aapsLogger, diaconnG8Pump.maxBolus, resourceHelper.gs(R.string.limitingbolus, diaconnG8Pump.maxBolus, resourceHelper.gs(R.string.pumplimit)), this)
+        return insulin
+    }
+
+    override fun applyExtendedBolusConstraints(insulin: Constraint<Double>): Constraint<Double> {
+        return applyBolusConstraints(insulin)
+    }
+
+    // Pump interface
+    override fun isInitialized(): Boolean  =
+        diaconnG8Pump.lastConnection > 0 && diaconnG8Pump.maxBasal > 0
+
+    override fun isSuspended(): Boolean =
+        diaconnG8Pump.basePauseStatus == 1
+
+    override fun isBusy(): Boolean =
+        diaconnG8Service?.isConnected ?: false || diaconnG8Service?.isConnecting ?: false
+
+    override fun setNewBasalProfile(profile: Profile): PumpEnactResult {
+        val result = PumpEnactResult(injector)
+        if (!isInitialized()) {
+            val notification = Notification(Notification.PROFILE_NOT_SET_NOT_INITIALIZED, resourceHelper.gs(R.string.pumpNotInitializedProfileNotSet), Notification.URGENT)
+            rxBus.send(EventNewNotification(notification))
+            result.comment = resourceHelper.gs(R.string.pumpNotInitializedProfileNotSet)
+            return result
+        } else {
+            rxBus.send(EventDismissNotification(Notification.PROFILE_NOT_SET_NOT_INITIALIZED))
+        }
+        return if (diaconnG8Service?.updateBasalsInPump(profile) != true) {
+            val notification = Notification(Notification.FAILED_UPDATE_PROFILE, resourceHelper.gs(R.string.failedupdatebasalprofile), Notification.URGENT)
+            rxBus.send(EventNewNotification(notification))
+            result.comment = resourceHelper.gs(R.string.failedupdatebasalprofile)
+            result
+        } else {
+            rxBus.send(EventDismissNotification(Notification.PROFILE_NOT_SET_NOT_INITIALIZED))
+            rxBus.send(EventDismissNotification(Notification.FAILED_UPDATE_PROFILE))
+            val notification = Notification(Notification.PROFILE_SET_OK, resourceHelper.gs(R.string.profile_set_ok), Notification.INFO, 60)
+            rxBus.send(EventNewNotification(notification))
+            result.success = true
+            result.enacted = true
+            result.comment = "OK"
+            result
+        }
+    }
+
+    override fun isThisProfileSet(profile: Profile): Boolean {
+        if (!isInitialized()) return true // TODO: not sure what's better. so far TRUE to prevent too many SMS
+        if (diaconnG8Pump.pumpProfiles == null) return true // TODO: not sure what's better. so far TRUE to prevent too many SMS
+        val basalValues = 24
+        val basalIncrement =  60 * 60
+        for (h in 0 until basalValues) {
+            val pumpValue = diaconnG8Pump.pumpProfiles!![diaconnG8Pump.activeProfile][h]
+            val profileValue = profile.getBasalTimeFromMidnight(h * basalIncrement)
+            if (abs(pumpValue - profileValue) > pumpDescription.basalStep) {
+                aapsLogger.debug(LTag.PUMP, "Diff found. Hour: $h Pump: $pumpValue Profile: $profileValue")
+                return false
+            }
+        }
+        return true
+    }
+
+    override fun lastDataTime(): Long = diaconnG8Pump.lastConnection
+
+    override val baseBasalRate: Double
+        get() = diaconnG8Pump.baseAmount
+    override val reservoirLevel: Double
+        get() = diaconnG8Pump.systemRemainInsulin
+    override val batteryLevel: Int
+        get() = diaconnG8Pump.systemRemainBattery
+
+
+    @Synchronized
+    override fun deliverTreatment(detailedBolusInfo: DetailedBolusInfo): PumpEnactResult {
+        detailedBolusInfo.insulin = constraintChecker.applyBolusConstraints(Constraint(detailedBolusInfo.insulin)).value()
+        return if (detailedBolusInfo.insulin > 0 || detailedBolusInfo.carbs > 0) {
+            val carbs = detailedBolusInfo.carbs
+            detailedBolusInfo.carbs = 0.0
+            var carbTimeStamp = detailedBolusInfo.carbsTimestamp ?: detailedBolusInfo.timestamp
+            if (carbTimeStamp == detailedBolusInfo.timestamp) carbTimeStamp -= T.mins(1).msecs() // better set 1 min back to prevents clash with insulin
+            detailedBolusInfoStorage.add(detailedBolusInfo) // will be picked up on reading history
+            val t = EventOverviewBolusProgress.Treatment(0.0, 0, detailedBolusInfo.bolusType == DetailedBolusInfo.BolusType.SMB)
+            var connectionOK = false
+            if (detailedBolusInfo.insulin > 0 || carbs > 0) connectionOK = diaconnG8Service?.bolus(detailedBolusInfo.insulin, carbs.toInt(), carbTimeStamp, t)
+                ?: false
+            val result = PumpEnactResult(injector)
+            result.success = connectionOK
+            result.bolusDelivered = t.insulin
+            result.carbsDelivered = detailedBolusInfo.carbs
+
+            if(result.success) result.enacted = true
+            if (!result.success) {
+                setErrorMsg(diaconnG8Pump.resultErrorCode, result)
+            } else result.comment = resourceHelper.gs(R.string.ok)
+            aapsLogger.debug(LTag.PUMP, "deliverTreatment: OK. Asked: " + detailedBolusInfo.insulin + " Delivered: " + result.bolusDelivered)
+            result
+        } else {
+            val result = PumpEnactResult(injector)
+            result.success = false
+            result.bolusDelivered = 0.0
+            result.carbsDelivered = 0.0
+            result.comment = resourceHelper.gs(R.string.invalidinput)
+            aapsLogger.error("deliverTreatment: Invalid input")
+            result
+        }
+    }
+
+    override fun stopBolusDelivering() {
+        diaconnG8Service?.bolusStop()
+    }
+
+    // This is called from APS
+    @Synchronized
+    override fun setTempBasalAbsolute(absoluteRate: Double, durationInMinutes: Int, profile: Profile, enforceNew: Boolean, tbrType: PumpSync.TemporaryBasalType): PumpEnactResult {
+        val result = PumpEnactResult(injector)
+        var absoluteAfterConstrain = constraintChecker.applyBasalConstraints(Constraint(absoluteRate), profile).value()
+        val doTempOff = baseBasalRate - absoluteAfterConstrain == 0.0
+        val doLowTemp = absoluteAfterConstrain < baseBasalRate
+        val doHighTemp = absoluteAfterConstrain > baseBasalRate
+        if (doTempOff) {
+            // If temp in progress
+            if (diaconnG8Pump.isTempBasalInProgress) {
+                aapsLogger.debug(LTag.PUMP, "setTempBasalAbsolute: Stopping temp basal (doTempOff)")
+                return cancelTempBasal(false)
+            }
+            result.success = true
+            result.enacted = false
+            result.absolute = baseBasalRate
+            result.isPercent = false
+            result.isTempCancel = true
+            aapsLogger.debug(LTag.PUMP, "setTempBasalAbsolute: doTempOff OK")
+            return result
+        }
+
+        if (doLowTemp || doHighTemp) {
+            // Check if some temp is already in progress
+            if(absoluteAfterConstrain > 6.0) absoluteAfterConstrain = 6.0  // pumpLimit
+            //val activeTemp = activePluginProvider.activeTreatments.getTempBasalFromHistory(System.currentTimeMillis())
+            if (diaconnG8Pump.isTempBasalInProgress) {
+                aapsLogger.debug(LTag.PUMP, "setTempBasalAbsolute: currently running")
+                // Correct basal already set ?
+                if (diaconnG8Pump.tempBasalAbsoluteRate == absoluteAfterConstrain && diaconnG8Pump.tempBasalRemainingMin > 4) {
+                    if (!enforceNew) {
+                        result.success = true
+                        result.absolute = absoluteAfterConstrain
+                        result.enacted = false
+                        result.duration = diaconnG8Pump.tempBasalRemainingMin
+                        result.isPercent = false
+                        result.isTempCancel = false
+                        aapsLogger.debug(LTag.PUMP, "setTempBasalAbsolute: Correct temp basal already set (doLowTemp || doHighTemp)")
+                        return result
+                    }
+                }
+            }
+            temporaryBasalStorage.add(PumpSync.PumpState.TemporaryBasal(dateUtil.now(), T.mins(durationInMinutes.toLong()).msecs(), absoluteRate, true, tbrType, 0L, 0L))
+            // Convert duration from minutes to hours
+            aapsLogger.debug(LTag.PUMP, "setTempBasalAbsolute: Setting temp basal $absoluteAfterConstrain U for $durationInMinutes mins (doLowTemp || doHighTemp)")
+            val connectionOK: Boolean = if (durationInMinutes == 15 || durationInMinutes == 30) {
+                diaconnG8Service?.tempBasalShortDuration(absoluteAfterConstrain, durationInMinutes) ?: false
+            } else {
+                val durationInHours = max(durationInMinutes / 60.0, 1.0)
+                diaconnG8Service?.tempBasal(absoluteAfterConstrain, durationInHours) ?: false
+            }
+
+            if (connectionOK && diaconnG8Pump.isTempBasalInProgress && diaconnG8Pump.tempBasalAbsoluteRate == absoluteAfterConstrain) {
+                result.enacted = true
+                result.success = true
+                result.comment = resourceHelper.gs(R.string.ok)
+                result.isTempCancel = false
+                result.duration = diaconnG8Pump.tempBasalRemainingMin
+                result.absolute = diaconnG8Pump.tempBasalAbsoluteRate
+                result.isPercent = false
+                aapsLogger.debug(LTag.PUMP, "setTempBasalAbsolute: OK")
+                return result
+            }
+        }
+
+        result.enacted = false
+        result.success = false
+        result.comment = resourceHelper.gs(R.string.tempbasaldeliveryerror)
+        aapsLogger.error("setTempBasalAbsolute: Failed to set temp basal")
+        return result
+    }
+
+    @Synchronized
+    override fun setTempBasalPercent(percent: Int, durationInMinutes: Int, profile: Profile, enforceNew: Boolean, tbrType: PumpSync.TemporaryBasalType): PumpEnactResult {
+        return if (percent == 0) {
+            setTempBasalAbsolute(0.0, durationInMinutes, profile, enforceNew, tbrType)
+        } else {
+            var absoluteValue = profile.getBasal() * (percent / 100.0)
+            absoluteValue = pumpDescription.pumpType.determineCorrectBasalSize(absoluteValue)
+            aapsLogger.warn(LTag.PUMP, "setTempBasalPercent [DiaconnG8Plugin] - You are trying to use setTempBasalPercent with percent other then 0% ($percent). This will start setTempBasalAbsolute, with calculated value ($absoluteValue). Result might not be 100% correct.")
+            setTempBasalAbsolute(absoluteValue, durationInMinutes, profile, enforceNew, tbrType)
+        }
+
+    }
+
+    @Synchronized
+    override fun setExtendedBolus(insulin: Double, durationInMinutes: Int): PumpEnactResult {
+        var insulinAfterConstraint = constraintChecker.applyExtendedBolusConstraints(Constraint(insulin)).value()
+        // needs to be rounded
+        insulinAfterConstraint = Round.roundTo(insulinAfterConstraint, pumpDescription.extendedBolusStep)
+        val result = PumpEnactResult(injector)
+
+        if (diaconnG8Pump.isExtendedInProgress && abs(diaconnG8Pump.extendedBolusAmount - insulinAfterConstraint) < pumpDescription.extendedBolusStep) {
+            result.enacted = false
+            result.success = true
+            result.comment = resourceHelper.gs(R.string.ok)
+            result.duration = diaconnG8Pump.extendedBolusRemainingMinutes
+            result.absolute = diaconnG8Pump.extendedBolusAbsoluteRate
+            result.isPercent = false
+            result.isTempCancel = false
+            aapsLogger.debug(LTag.PUMP, "setExtendedBolus: Correct extended bolus already set. Current: " + diaconnG8Pump.extendedBolusAmount + " Asked: " + insulinAfterConstraint)
+            return result
+        }
+        val connectionOK = diaconnG8Service?.extendedBolus(insulinAfterConstraint, durationInMinutes)
+            ?: false
+
+        if (connectionOK) {
+            result.enacted = true
+            result.success = true
+            result.comment = resourceHelper.gs(R.string.ok)
+            result.isTempCancel = false
+            result.duration = diaconnG8Pump.extendedBolusRemainingMinutes
+            result.absolute = diaconnG8Pump.extendedBolusAbsoluteRate
+            result.bolusDelivered = diaconnG8Pump.extendedBolusAmount
+            result.isPercent = false
+            aapsLogger.debug(LTag.PUMP, "setExtendedBolus: OK")
+            return result
+        }
+
+        result.enacted = false
+        result.success = false
+        setErrorMsg(diaconnG8Pump.resultErrorCode, result)
+        aapsLogger.error("setExtendedBolus: Failed to extended bolus")
+        return result
+    }
+
+    @Synchronized
+    override fun cancelTempBasal(enforceNew: Boolean): PumpEnactResult {
+        val result = PumpEnactResult(injector)
+        if (diaconnG8Pump.isTempBasalInProgress) {
+            diaconnG8Service?.tempBasalStop()
+            result.success = !diaconnG8Pump.isTempBasalInProgress
+            result.enacted = true
+            result.isTempCancel = true
+            if(!result.success) setErrorMsg(diaconnG8Pump.resultErrorCode, result)
+        } else {
+            result.success = true
+            result.enacted = false
+            result.isTempCancel = true
+            result.comment = resourceHelper.gs(R.string.ok)
+            aapsLogger.debug(LTag.PUMP, "cancelRealTempBasal: OK")
+        }
+        return result
+    }
+
+    @Synchronized override fun cancelExtendedBolus(): PumpEnactResult {
+        val result = PumpEnactResult(injector)
+        if (diaconnG8Pump.isExtendedInProgress) {
+            diaconnG8Service?.extendedBolusStop()
+            result.success = !diaconnG8Pump.isExtendedInProgress
+            result.enacted = true
+            if(!result.success) {
+                setErrorMsg(diaconnG8Pump.resultErrorCode, result)
+                diaconnG8Service?.readPumpStatus()
+            }
+
+       } else {
+            result.success = true
+            result.enacted = false
+            result.comment = resourceHelper.gs(R.string.ok)
+            aapsLogger.debug(LTag.PUMP, "cancelExtendedBolus: OK")
+        }
+        return result
+    }
+
+    override fun getJSONStatus(profile: Profile, profileName: String, version: String): JSONObject {
+        val now = System.currentTimeMillis()
+        if (diaconnG8Pump.lastConnection + 60 * 60 * 1000L < System.currentTimeMillis()) {
+            return JSONObject()
+        }
+        val pumpJson = JSONObject()
+        val battery = JSONObject()
+        val status = JSONObject()
+        val extended = JSONObject()
+        try {
+            battery.put("percent", diaconnG8Pump.systemRemainBattery)
+            status.put("status", if (diaconnG8Pump.pumpSuspended) "suspended" else "normal")
+            status.put("timestamp", dateUtil.toISOString(diaconnG8Pump.lastConnection))
+            extended.put("Version", version)
+            if (diaconnG8Pump.lastBolusTime != 0L) {
+                extended.put("LastBolus", dateUtil.dateAndTimeString(diaconnG8Pump.lastBolusTime))
+                extended.put("LastBolusAmount", diaconnG8Pump.lastBolusAmount)
+            }
+            val tb = pumpSync.expectedPumpState().temporaryBasal
+            if (tb != null) {
+                extended.put("TempBasalAbsoluteRate", tb.convertedToAbsolute(now, profile))
+                extended.put("TempBasalStart", dateUtil.dateAndTimeString(tb.timestamp))
+                extended.put("TempBasalRemaining", tb.plannedRemainingMinutes)
+            }
+            val eb = pumpSync.expectedPumpState().extendedBolus
+            if (eb != null) {
+                extended.put("ExtendedBolusAbsoluteRate", eb.rate)
+                extended.put("ExtendedBolusStart", dateUtil.dateAndTimeString(eb.timestamp))
+                extended.put("ExtendedBolusRemaining", eb.plannedRemainingMinutes)
+            }
+            extended.put("BaseBasalRate", baseBasalRate)
+            try {
+                extended.put("ActiveProfile", profileFunction.getProfileName())
+            } catch (e: Exception) {
+                aapsLogger.error("Unhandled exception", e)
+            }
+            pumpJson.put("battery", battery)
+            pumpJson.put("status", status)
+            pumpJson.put("extended", extended)
+            pumpJson.put("reservoir", diaconnG8Pump.systemRemainInsulin.toInt())
+            pumpJson.put("clock", dateUtil.toISOString(now))
+        } catch (e: JSONException) {
+            aapsLogger.error("Unhandled exception", e)
+        }
+        return pumpJson
+    }
+
+    override fun manufacturer(): ManufacturerType {
+        return ManufacturerType.G2e
+    }
+
+    override fun model(): PumpType {
+        return PumpType.DIACONN_G8
+    }
+
+    override fun serialNumber(): String {
+        return diaconnG8Pump.serialNo.toString()
+    }
+
+    override fun shortStatus(veryShort: Boolean): String {
+        var ret = ""
+        if (diaconnG8Pump.lastConnection != 0L) {
+            val agoMillis = System.currentTimeMillis() - diaconnG8Pump.lastConnection
+            val agoMin = (agoMillis / 60.0 / 1000.0).toInt()
+            ret += "LastConn: $agoMin minago\n"
+        }
+        if (diaconnG8Pump.lastBolusTime != 0L)
+            ret += "LastBolus: ${DecimalFormatter.to2Decimal(diaconnG8Pump.lastBolusAmount)}U @${DateFormat.format("HH:mm", diaconnG8Pump.lastBolusTime)}"
+
+        if (diaconnG8Pump.isTempBasalInProgress)
+            ret += "Temp: ${diaconnG8Pump.temporaryBasalToString()}"
+
+        if (diaconnG8Pump.isExtendedInProgress)
+            ret += "Extended: ${diaconnG8Pump.extendedBolusToString()}\n"
+
+        if (!veryShort) {
+            ret += "TDD: ${DecimalFormatter.to0Decimal(diaconnG8Pump.dailyTotalUnits)} / ${diaconnG8Pump.maxDailyTotalUnits} U"
+        }
+        ret += "Reserv: ${DecimalFormatter.to0Decimal(diaconnG8Pump.systemRemainInsulin)} U"
+        ret += "Batt: ${diaconnG8Pump.systemRemainBattery}"
+        return ret
+    }
+    override val isFakingTempsByExtendedBoluses: Boolean = false
+    override fun loadTDDs(): PumpEnactResult = loadHistory()
+    override fun getCustomActions(): List<CustomAction>? = null
+    override fun executeCustomAction(customActionType: CustomActionType) {}
+    override fun canHandleDST(): Boolean = false
+
+    fun isBatteryChangeLoggingEnabled():Boolean {
+        return sp.getBoolean(R.string.key_diaconn_g8_logbatterychange, false)
+    }
+
+    fun isInsulinChangeLoggingEnabled():Boolean {
+        return sp.getBoolean(R.string.key_diaconn_g8_loginsulinchange, false)
+    }
+
+    @Synchronized
+    fun setErrorMsg(errorCode: Int, result: PumpEnactResult) {
+        when (errorCode) {
+            1 -> result.comment = resourceHelper.gs(R.string.diaconn_g8_errorcode_1)
+            2 -> result.comment = resourceHelper.gs(R.string.diaconn_g8_errorcode_2)
+            3 -> result.comment = resourceHelper.gs(R.string.diaconn_g8_errorcode_3)
+            4 -> result.comment = resourceHelper.gs(R.string.diaconn_g8_errorcode_4)
+            6 -> result.comment = resourceHelper.gs(R.string.diaconn_g8_errorcode_6)
+            7 -> result.comment = resourceHelper.gs(R.string.diaconn_g8_errorcode_7)
+            8 -> result.comment = resourceHelper.gs(R.string.diaconn_g8_errorcode_8)
+            9 -> result.comment = resourceHelper.gs(R.string.diaconn_g8_errorcode_9)
+            10 -> result.comment = resourceHelper.gs(R.string.diaconn_g8_errorcode_10)
+            11 -> result.comment = resourceHelper.gs(R.string.diaconn_g8_errorcode_11)
+            12 -> result.comment = resourceHelper.gs(R.string.diaconn_g8_errorcode_12)
+            13 -> result.comment = resourceHelper.gs(R.string.diaconn_g8_errorcode_13)
+            14 -> result.comment = resourceHelper.gs(R.string.diaconn_g8_errorcode_14)
+            15 -> result.comment = resourceHelper.gs(R.string.diaconn_g8_errorcode_15)
+            32 -> result.comment = resourceHelper.gs(R.string.diaconn_g8_errorcode_32)
+            33 -> result.comment = resourceHelper.gs(R.string.diaconn_g8_errorcode_33)
+            34 -> result.comment = resourceHelper.gs(R.string.diaconn_g8_errorcode_34)
+            35 -> result.comment = resourceHelper.gs(R.string.diaconn_g8_errorcode_35)
+            36 -> result.comment = resourceHelper.gs(R.string.diaconn_g8_errorcode_36)
+            else -> result.comment = "not defined Error code: $errorCode"
+        }
+    }
+
+    override fun preprocessPreferences(preferenceFragment: PreferenceFragmentCompat) {
+
+        val bolusSpeedPreference: Preference? = preferenceFragment.findPreference(resourceHelper.gs(R.string.key_diaconn_g8_bolusspeed))
+        bolusSpeedPreference?.setOnPreferenceChangeListener { _, newValue ->
+            val intBolusSpeed = newValue.toString().toInt()
+
+            diaconnG8Pump.bolusSpeed = intBolusSpeed
+            diaconnG8Pump.speed = intBolusSpeed
+            diaconnG8Pump.setUserOptionType = DiaconnG8Pump.BOLUS_SPEED
+            sp.putBoolean("diaconn_g8_isbolusspeedsync", false)
+
+            true
+        }
+    }
+
+}
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/DiaconnG8Pump.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/DiaconnG8Pump.kt
new file mode 100644
index 0000000000..77739cf9e9
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/DiaconnG8Pump.kt
@@ -0,0 +1,374 @@
+package info.nightscout.androidaps.diaconn
+
+
+import info.nightscout.androidaps.interfaces.Profile
+import info.nightscout.androidaps.interfaces.PumpSync
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.general.overview.events.EventOverviewBolusProgress
+import info.nightscout.androidaps.utils.DateUtil
+import info.nightscout.androidaps.utils.DecimalFormatter
+import info.nightscout.androidaps.utils.T
+import javax.inject.Inject
+import javax.inject.Singleton
+import kotlin.math.max
+import kotlin.math.min
+import kotlin.math.roundToInt
+
+@Singleton
+class DiaconnG8Pump @Inject constructor(
+    private val aapsLogger: AAPSLogger,
+    private val dateUtil: DateUtil
+) {
+
+
+    var maxBolusePerDay: Double = 0.0
+    var pumpIncarnationNum: Int = 65536
+    var isPumpVersionGe2_63: Boolean = false // is pumpVersion higher then 2.63
+    var insulinWarningGrade: Int =0
+    var insulinWarningProcess: Int =0
+    var insulinWarningRemain: Int =0
+    var batteryWaningGrade: Int = 0
+    var batteryWaningProcess: Int = 0
+    var batteryWaningRemain: Int = 0
+    var injectionBlockType: Int =0
+    var injectionBlockRemainAmount: Double = 0.0
+    var injectionBlockProcess: Int = 0
+    var injectionBlockGrade: Int = 0
+    var lastConnection: Long = 0
+    var lastSettingsRead: Long = 0
+
+    // time
+    private var pumpTime: Long = 0
+
+    fun setPumpTime(value: Long) {
+        pumpTime = value
+    }
+    fun getPumpTime() = pumpTime
+
+    // Status
+    var pumpSuspended = false
+    var dailyTotalUnits = 0.0
+    var maxDailyTotalUnits = 0
+    var bolusStep = 0.01
+    var basalStep = 0.01
+    var iob = 0.0
+
+
+    var bolusBlocked = false
+    var lastBolusTime: Long = 0
+    var lastBolusAmount = 0.0
+
+
+    /*
+     * TEMP BASALS
+     */
+    var tempBasalStart: Long = 0
+    var tempBasalDuration: Long = 0 // in milliseconds
+    var tempBasalAbsoluteRate: Double = 0.0
+    var tempBasalPercent: Int = 0
+
+    var tempBasalTotalSec: Long
+        set(durationInSec) {
+            tempBasalDuration = T.secs(durationInSec).msecs()
+        }
+        get() = T.msecs(tempBasalDuration).mins()
+    var isTempBasalInProgress: Boolean
+        get() = tempBasalStart != 0L && dateUtil.now() in tempBasalStart..tempBasalStart + tempBasalDuration
+        set(isRunning) {
+            if (isRunning) throw IllegalArgumentException("Use to cancel TBR only")
+            else {
+                tempBasalStart = 0L
+                tempBasalDuration = 0L
+                tempBasalAbsoluteRate = 0.0
+            }
+        }
+    val tempBasalRemainingMin: Int
+        get() = max(T.msecs(tempBasalStart + tempBasalDuration - dateUtil.now()).mins().toInt(), 0)
+
+    fun temporaryBasalToString(): String {
+        if (!isTempBasalInProgress) return ""
+
+        val passedMin = ((min(dateUtil.now(), tempBasalStart + tempBasalDuration) - tempBasalStart) / 60.0 / 1000).roundToInt()
+        return tempBasalAbsoluteRate.toString() + "U/h @" +
+            dateUtil.timeString(tempBasalStart) +
+            " " + passedMin + "/" + T.msecs(tempBasalDuration).mins() + "'"
+    }
+
+    fun fromTemporaryBasal(tbr: PumpSync.PumpState.TemporaryBasal?) {
+        if (tbr == null) {
+            tempBasalStart = 0
+            tempBasalDuration = 0
+            tempBasalAbsoluteRate = 0.0
+        } else {
+            tempBasalStart = tbr.timestamp
+            tempBasalDuration = tbr.duration
+            tempBasalAbsoluteRate = tbr.rate
+        }
+    }
+
+    /*
+    * EXTENDED BOLUSES
+    */
+    var extendedBolusStart: Long = 0
+    var extendedBolusDuration: Long = 0
+    var extendedBolusAmount = 0.0
+
+    var isExtendedInProgress: Boolean
+        get() = extendedBolusStart != 0L && dateUtil.now() in extendedBolusStart..extendedBolusStart + extendedBolusDuration
+        set(isRunning) {
+            if (isRunning) throw IllegalArgumentException("Use to cancel EB only")
+            else {
+                extendedBolusStart = 0L
+                extendedBolusDuration = 0L
+                extendedBolusAmount = 0.0
+            }
+        }
+    val extendedBolusPassedMinutes:Int
+        get() = T.msecs(max(0, dateUtil.now() - extendedBolusStart)).mins().toInt()
+    val extendedBolusRemainingMinutes: Int
+        get() = max(T.msecs(extendedBolusStart + extendedBolusDuration - dateUtil.now()).mins().toInt(), 0)
+    private val extendedBolusDurationInMinutes: Int
+        get() = T.msecs(extendedBolusDuration).mins().toInt()
+
+    var extendedBolusAbsoluteRate: Double
+        get() = extendedBolusAmount * T.hours(1).msecs() / extendedBolusDuration
+        set(rate) {
+            extendedBolusAmount = rate * extendedBolusDuration / T.hours(1).msecs()
+        }
+
+    fun extendedBolusToString(): String {
+        if (!isExtendedInProgress) return ""
+        //return "E "+ DecimalFormatter.to2Decimal(extendedBolusDeliveredSoFar) +"/" + DecimalFormatter.to2Decimal(extendedBolusAbsoluteRate) + "U/h @" +
+        //     " " + extendedBolusPassedMinutes + "/" + extendedBolusMinutes + "'"
+        return "E "+ DecimalFormatter.to2Decimal(extendedBolusAbsoluteRate) + "U/h @" +
+            dateUtil.timeString(extendedBolusStart) +
+            " " + extendedBolusPassedMinutes + "/" + extendedBolusDurationInMinutes + "'"
+    }
+
+    fun fromExtendedBolus(eb: PumpSync.PumpState.ExtendedBolus?) {
+        if (eb == null) {
+            extendedBolusStart = 0
+            extendedBolusDuration = 0
+            extendedBolusAmount = 0.0
+        } else {
+            extendedBolusStart = eb.timestamp
+            extendedBolusDuration = eb.duration
+            extendedBolusAmount = eb.amount
+        }
+    }
+    // Profile
+    var units = 0
+    var activeProfile = 0
+    var pumpProfiles: Array<Array<Double>>? = null
+
+    //Limits
+    var maxBolus = 0.0
+    var maxBasal = 0.0
+
+    // User settings
+    var setUserOptionType = 0 // ALARM:0, LCD:1, LANG:2, BOLUS_SPEED:3
+    var beepAndAlarm = 0
+    var alarmIntesity = 0
+    var lcdOnTimeSec = 0
+    var selectedLanguage = 0
+    var bolusSpeed = 0
+
+    var resultErrorCode: Int = 0 // last start bolus erroCode
+
+    // Bolus settings
+    var historyDoneReceived: Boolean = false // true when last history message is received
+    var bolusingTreatment: EventOverviewBolusProgress.Treatment? = null // actually delivered treatment
+    var bolusAmountToBeDelivered = 0.0 // amount to be delivered
+    var bolusProgressLastTimeStamp: Long = 0 // timestamp of last bolus progress message
+    var bolusStopped = false // bolus finished
+    var bolusStopForced = false // bolus forced to stop by user
+    var bolusDone = false // success end
+
+    // LGS Status
+    var lgsStatus: Int = 0     // LGS Status(1=LGS_ON, 2=LGS_OFF)
+    var lgsTime:Int = 0        // LGS Setting time (0~255 min)
+    var lgsElapsedTime:Int = 0 // LGS Passed Time (0~255 min)
+
+    fun buildDiaconnG8ProfileRecord(nsProfile: Profile): Array<Double> {
+        val record = Array(24) { 0.0 }
+        for (hour in 0..23) {
+            //Some values get truncated to the next lower one.
+            // -> round them to two decimals and make sure we are a small delta larger (that will get truncated)
+            val value = (100.0 * nsProfile.getBasalTimeFromMidnight((hour * 60 * 60))).roundToInt() / 100.0 + 0.00001
+            aapsLogger.debug(LTag.PUMP, "NS basal value for $hour:00 is $value")
+            record[hour] = value
+            //aapsLogger.debug(LTag.PUMP, "NS basal value * 100 for $hour:00 is $value")
+        }
+        return record
+    }
+
+    fun reset() {
+        aapsLogger.debug(LTag.PUMP, "Diaconn G8 Pump reset")
+        lastConnection = 0
+        lastSettingsRead = 0
+    }
+
+    // G8 pump
+    var result:Int = 0 // 조회결과
+
+    // 1. pump setting info
+    var systemRemainInsulin = 0.0 // 인슐린 잔량
+    var systemRemainBattery = 0 // 배터리 잔량(0~100%)
+    var systemBasePattern = 0 // 기저주입 패턴(0=없음, 1=기본, 2=생활1, 3=생활2, 4=생활3, 5=닥터1, 6=닥터2)
+    var systemTbStatus = 0 // 임시기저 상태(1=임시기저 중, 2=임시기저 해제)
+    var systemInjectionMealStatus = 0 // 식사주입 상태(1=주입중, 2=주입상태아님)
+    var systemInjectionSnackStatus = 0 // 일반간식 주입 상태(1=주입중, 2=주입상태아님)
+    var systemInjectionSquareStatue = 0 // 스퀘어회식 주입 상태(1=주입중, 2=주입상태아님)
+    var systemInjectionDualStatus = 0 // 더블회식 주입 상태(1=주입중, 2=주입상태아님)
+
+    // 2. basal injection suspend status (1:stop, 2:release)
+    var basePauseStatus = 0 // 상태(1=정지,2=해제)
+
+    // 3. Pump time
+    var year = 0 // 년 (18~99)
+    var month = 0 // 월 (1~12)
+    var day = 0 // 일 (1~31)
+    var hour = 0 // 시 (0~23)
+    var minute = 0 // 분 (0~59)
+    var second = 0 // 초 (0~59)
+
+
+    // 4. pump system info
+    var country = 0 // 생산국(K, C), ASCII
+    var productType = 0 // 제품종류(A ~ Z), ASCII
+    var makeYear = 0 // 제조년
+    var makeMonth = 0 // 제조월
+    var makeDay = 0 // 제조일
+    var lotNo = 0 // LOT NO
+    var serialNo = 0 // SERIAL NO
+    var majorVersion = 0 // Major 버전
+    var minorVersion = 0 // Minor 버전
+
+    // 5. pump log status
+    var pumpLastLogNum = 0 // 마지막 저장 로그 번호(0~9999)
+    var pumpWrappingCount = 0 // wrapping 카운트(0~255)
+    var apslastLogNum = 0 // 앱에서 처리한 마지막 로그 번호.
+    var apsWrappingCount = 0 // 앱에서 처리한 마지막 로그 번호.
+    var isProgressPumpLogSync = false // 로그 동기화 진행 여부
+
+    // 6. bolus speed status.
+    var speed = 0 // 주입 속도(1 ~ 8)
+    var maxBasalPerHours = 0.0
+
+    // 7. Tempbasal status
+    var tbStatus = 0 // 임시기저 상태 (1 : running, 2:not  running )
+    var tbTime = 0 // 임시기저 시간
+    var tbInjectRateRatio = 0 // 임시기저 주입량/률  1000(0.00U)~1600(6.00U), 50000(0%)~50200(200%), 50000이상이면 주입률로 판정
+    var tbElapsedTime = 0 // 임시기저 경과 시간(0~1425분)
+    var tbInjectAbsoluteValue = 0.0 // 임시기저 주입량/률  1000(0.00U)~1600(6.00U)
+
+    // 8. Basal status
+    var baseStatus = 0 // 주입상태
+    var baseHour = 0 // 현재주입시간(0~23)
+    var baseAmount = 0.0 // 주입설정량(량*100, 23.25->2325, 15.2->1520)
+    var baseInjAmount = 0.0 // 현재주입량(량*100, 23.25->2325, 15.2->1520)
+
+
+    // 9. meal bolus status
+    var mealKind = 0 // 주입종류(1=아침,2=점심,3=저녁)
+    var mealStartTime = 0 // 식사주입 시작시간(time_t)
+    var mealStatus = 0 // 주입상태(1=주입중,2=주입상태아님)
+    var mealAmount = 0.0 // 주입설정량(량*100, 23.25->2325, 15.2->1520)
+    var mealInjAmount = 0.0 // 현재주입량(량*100, 23.25->2325, 15.2->1520)
+    var mealSpeed = 0 // 주입속도(1~8)
+
+
+    // 10. snack bolus status
+    var snackStatus = 0 // 주입상태(1=주입중,2=주입상태아님)
+    var snackAmount = 0.0 // 주입설정량(량*100, 23.25->2325, 15.2->1520)
+    var snackInjAmount = 0.0 // 현재주입량(량*100, 23.25->2325, 15.2->1520)
+    var snackSpeed = 0 // 주입속도(1~8)
+
+
+    // 11. square(extended) bolus status
+    var squareStatus = 0 // 주입상태
+    var squareTime = 0 // 설정 주입시간(10~300분)
+    var squareInjTime = 0 // 경과 주입시간(10~300분)
+    var squareAmount = 0.0 // 주입 설정량
+    var squareInjAmount = 0.0 // 현재 주입량
+
+
+    // 12. daul bolus status
+    var dualStatus = 0 // 주입상태
+    var dualAmount = 0.0 // 일반주입 설정량
+    var dualInjAmount = 0.0 // 일반주입량
+    var dualSquareTime = 0 // 스퀘어주입 설정시간(10~300분)
+    var dualInjSquareTime = 0 // 스퀘어주입 경과시간(10~300분)
+    var dualSquareAmount = 0.0 // 스퀘어주입 설정량
+    var dualInjSquareAmount = 0.0 // 스퀘어주입량
+
+
+    // 13. last injection  status
+    var recentKind1 = 0 // 최근-1 주입 종류(1=식사, 2=일반간식, 3=스퀘어회식, 4=더블회식)
+    var recentTime1 = 0 // 최근-1 주입 시간
+    var recentAmount1 = 0.0 // 최근-1 주입량
+    var recentKind2 = 0 // 최근-2 주입 종류(1=식사, 2=일반간식, 3=스퀘어회식, 4=더블회식)
+    var recentTime2 = 0 // 최근-2 주입 시간
+    var recentAmount2 = 0.0 // 최근-2 주입량
+
+
+    // 14. daily injection status
+    var todayBaseAmount = 0.0 // 기저주입 총량
+    var todayMealAmount = 0.0 // 식사주입 총량
+    var todaySnackAmount = 0.0 // 회식주입 총량
+
+
+    // 15. meat setting status
+    var morningHour = 0 // 아침 개시 시간(0~23)
+    var morningAmount = 0.0 // 아침 식전량
+    var lunchHour = 0 // 점심 개시 시간(0~23)
+    var lunchAmount = 0.0 // 점심 식전량
+    var dinnerHour = 0 // 저녁 개시 시간(0~23)
+    var dinnerAmount = 0.0 // 저녁 식전량
+
+
+    // 16. basal injection status at this hour
+    var currentBasePattern = 0 // 패턴 종류 (1=기본, 2=생활1, 3=생활2, 4=생활3, 5=닥터1, 6=닥터2)
+    var currentBaseHour = 0 // 현재주입시간(0~23)
+    var currentBaseTbBeforeAmount = 0.0 // 해당시간의 임시기저 계산 전 기저주입량: 기저주입막힘 발생 시 기저주입 막힘량 제외, 기저정지로 인해 주입되지 않은 량 제외, 리셋으로 인해 주입되지 않은 량 제외(47.5=4750)
+    var currentBaseTbAfterAmount = 0.0 // 해당시간의 임시기저 계산 후 기저주입량: 기저주입막힘 발생 시 기저주입 막힘량 제외, 기저정지로 인해 주입되지 않은 량 제외, 리셋으로 인해 주입되지 않은 량 제외(47.5=4750)
+
+
+    // 17. saved basal pattern status
+    var baseAmount1 = 0.00// 주입량 1(량*100, 23.25->2325, 15.2->1520)
+    var baseAmount2 = 0.0// 주입량 2(량*100, 23.25->2325, 15.2->1520)
+    var baseAmount3 = 0.0 // 주입량 3(량*100, 23.25->2325, 15.2->1520)
+    var baseAmount4 = 0.0 // 주입량 4(량*100, 23.25->2325, 15.2->1520)
+    var baseAmount5 = 0.0 // 주입량 5(량*100, 23.25->2325, 15.2->1520)
+    var baseAmount6 = 0.0 // 주입량 6(량*100, 23.25->2325, 15.2->1520)
+    var baseAmount7 = 0.0 // 주입량 7(량*100, 23.25->2325, 15.2->1520)
+    var baseAmount8 = 0.0 // 주입량 8(량*100, 23.25->2325, 15.2->1520)
+    var baseAmount9 = 0.0 // 주입량 9(량*100, 23.25->2325, 15.2->1520)
+    var baseAmount10 = 0.0 // 주입량 10(량*100, 23.25->2325, 15.2->1520)
+    var baseAmount11 = 0.0 // 주입량 11(량*100, 23.25->2325, 15.2->1520)
+    var baseAmount12 = 0.0 // 주입량 12(량*100, 23.25->2325, 15.2->1520)
+    var baseAmount13 = 0.0 // 주입량 13(량*100, 23.25->2325, 15.2->1520)
+    var baseAmount14 = 0.0 // 주입량 14(량*100, 23.25->2325, 15.2->1520)
+    var baseAmount15 = 0.0 // 주입량 15(량*100, 23.25->2325, 15.2->1520)
+    var baseAmount16 = 0.0 // 주입량 16(량*100, 23.25->2325, 15.2->1520)
+    var baseAmount17 = 0.0 // 주입량 17(량*100, 23.25->2325, 15.2->1520)
+    var baseAmount18 = 0.0 // 주입량 18(량*100, 23.25->2325, 15.2->1520)
+    var baseAmount19 = 0.0 // 주입량 19(량*100, 23.25->2325, 15.2->1520)
+    var baseAmount20 = 0.0 // 주입량 20(량*100, 23.25->2325, 15.2->1520)
+    var baseAmount21 = 0.0 // 주입량 21(량*100, 23.25->2325, 15.2->1520)
+    var baseAmount22 = 0.0 // 주입량 22(량*100, 23.25->2325, 15.2->1520)
+    var baseAmount23 = 0.0 // 주입량 23(량*100, 23.25->2325, 15.2->1520)
+    var baseAmount24 = 0.0 // 주입량 24(량*100, 23.25->2325, 15.2->1520)
+
+    var otpNumber = 0
+
+    companion object {
+        // User settings
+        const val ALARM = 0
+        const val LCD = 1
+        const val LANG = 2
+        const val BOLUS_SPEED = 3
+    }
+
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/activities/DiaconnG8BLEScanActivity.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/activities/DiaconnG8BLEScanActivity.kt
new file mode 100644
index 0000000000..0581f0a42b
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/activities/DiaconnG8BLEScanActivity.kt
@@ -0,0 +1,185 @@
+package info.nightscout.androidaps.diaconn.activities
+
+import android.annotation.SuppressLint
+import android.bluetooth.BluetoothAdapter
+import android.bluetooth.BluetoothDevice
+import android.bluetooth.le.BluetoothLeScanner
+import android.bluetooth.le.ScanCallback
+import android.bluetooth.le.ScanFilter
+import android.bluetooth.le.ScanResult
+import android.bluetooth.le.ScanSettings
+import android.content.pm.ActivityInfo
+import android.os.Bundle
+import android.os.Handler
+import android.os.Looper
+import android.os.ParcelUuid
+import android.view.View
+import android.view.ViewGroup
+import android.widget.BaseAdapter
+import android.widget.TextView
+import info.nightscout.androidaps.activities.NoSplashAppCompatActivity
+import info.nightscout.androidaps.diaconn.events.EventDiaconnG8DeviceChange
+import info.nightscout.androidaps.diaconn.R
+import info.nightscout.androidaps.diaconn.databinding.DiaconnG8BlescannerActivityBinding
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.pump.common.ble.BlePreCheck
+import info.nightscout.androidaps.utils.sharedPreferences.SP
+import java.util.*
+import javax.inject.Inject
+
+class DiaconnG8BLEScanActivity : NoSplashAppCompatActivity() {
+
+    @Inject lateinit var sp: SP
+    @Inject lateinit var rxBus: RxBusWrapper
+    @Inject lateinit var blePreCheck: BlePreCheck
+
+    private var listAdapter: ListAdapter? = null
+    private val devices = ArrayList<BluetoothDeviceItem>()
+    private var bluetoothLeScanner: BluetoothLeScanner? = null
+    private val serviceUUID = UUID.fromString("6e400001-b5a3-f393-e0a9-e50e24dcca9e") // BLE GATT Service UUID
+
+    private lateinit var binding: DiaconnG8BlescannerActivityBinding
+
+    @SuppressLint("SourceLockedOrientationActivity")
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        binding = DiaconnG8BlescannerActivityBinding.inflate(layoutInflater)
+        setContentView(binding.root)
+        requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_PORTRAIT
+
+        blePreCheck.prerequisitesCheck(this)
+
+        listAdapter = ListAdapter()
+        binding.blescannerListview.emptyView = binding.blescannerNodevice
+        binding.blescannerListview.adapter = listAdapter
+        listAdapter?.notifyDataSetChanged()
+    }
+
+    override fun onResume() {
+        super.onResume()
+
+        BluetoothAdapter.getDefaultAdapter()?.let { bluetoothAdapter ->
+            if (!bluetoothAdapter.isEnabled) bluetoothAdapter.enable()
+            bluetoothLeScanner = bluetoothAdapter.bluetoothLeScanner
+            startScan()
+        }
+    }
+
+    override fun onPause() {
+        super.onPause()
+        stopScan()
+    }
+
+    private fun startScan() =
+        try {
+            val filters: MutableList<ScanFilter> = ArrayList()
+            val scanFilter = ScanFilter.Builder()
+                .setServiceUuid(ParcelUuid(serviceUUID))
+                .build()
+            filters.add(scanFilter)
+
+            val settings = ScanSettings.Builder()
+                .setScanMode(ScanSettings.SCAN_MODE_LOW_LATENCY)
+                .build()
+
+            bluetoothLeScanner?.startScan(filters, settings, mBleScanCallback)
+        } catch (e: IllegalStateException) {
+        } // ignore BT not on
+
+    private fun stopScan() =
+        try {
+            bluetoothLeScanner?.stopScan(mBleScanCallback)
+        } catch (e: IllegalStateException) {
+        } // ignore BT not on
+
+    private fun addBleDevice(device: BluetoothDevice?) {
+        if (device == null || device.name == null || device.name == "") {
+            return
+        }
+        val item = BluetoothDeviceItem(device)
+        if (devices.contains(item)) {
+            return
+        }
+        devices.add(item)
+        Handler(Looper.getMainLooper()).post { listAdapter?.notifyDataSetChanged() }
+    }
+
+    private val mBleScanCallback: ScanCallback = object : ScanCallback() {
+        override fun onScanResult(callbackType: Int, result: ScanResult) {
+            addBleDevice(result.device)
+        }
+    }
+
+    internal inner class ListAdapter : BaseAdapter() {
+
+        override fun getCount(): Int = devices.size
+        override fun getItem(i: Int): BluetoothDeviceItem = devices[i]
+        override fun getItemId(i: Int): Long = 0
+
+        override fun getView(i: Int, convertView: View?, parent: ViewGroup?): View {
+            var v = convertView
+            val holder: ViewHolder
+            if (v == null) {
+                v = View.inflate(applicationContext, R.layout.diaconn_g8_blescanner_item, null)
+                holder = ViewHolder(v)
+                v.tag = holder
+            } else {
+                // reuse view if already exists
+                holder = v.tag as ViewHolder
+            }
+            val item = getItem(i)
+            holder.setData(item)
+            return v!!
+        }
+
+        private inner class ViewHolder(v: View) : View.OnClickListener {
+
+            private lateinit var item: BluetoothDeviceItem
+            private val name: TextView = v.findViewById(R.id.ble_name)
+            private val address: TextView = v.findViewById(R.id.ble_address)
+
+            init {
+                v.setOnClickListener(this@ViewHolder)
+            }
+
+            override fun onClick(v: View) {
+                sp.putString(R.string.key_diaconn_g8_address, item.device.address)
+                sp.putString(R.string.key_diaconn_g8_name, name.text.toString())
+                item.device.createBond()
+                rxBus.send(EventDiaconnG8DeviceChange())
+                finish()
+            }
+
+            fun setData(data: BluetoothDeviceItem) {
+                var tTitle = data.device.name
+                if (tTitle == null || tTitle == "") {
+                    tTitle = "(unknown)"
+                }
+                name.text = tTitle
+                address.text = data.device.address
+                item = data
+            }
+
+        }
+    }
+
+    //
+    inner class BluetoothDeviceItem internal constructor(val device: BluetoothDevice) {
+        override fun equals(other: Any?): Boolean {
+            if (other !is BluetoothDeviceItem) {
+                return false
+            }
+            return stringEquals(device.address, other.device.address)
+        }
+
+        private fun stringEquals(arg1: String, arg2: String): Boolean {
+            return try {
+                arg1 == arg2
+            } catch (e: Exception) {
+                false
+            }
+        }
+
+        override fun hashCode(): Int = device.hashCode()
+    }
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/activities/DiaconnG8HistoryActivity.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/activities/DiaconnG8HistoryActivity.kt
new file mode 100644
index 0000000000..06ec319cb4
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/activities/DiaconnG8HistoryActivity.kt
@@ -0,0 +1,257 @@
+package info.nightscout.androidaps.diaconn.activities
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.AdapterView
+import android.widget.ArrayAdapter
+import android.widget.TextView
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+import info.nightscout.androidaps.activities.NoSplashAppCompatActivity
+import info.nightscout.androidaps.diaconn.R
+import info.nightscout.androidaps.diaconn.common.RecordTypes
+import info.nightscout.androidaps.diaconn.database.DiaconnHistoryRecord
+import info.nightscout.androidaps.diaconn.database.DiaconnHistoryRecordDao
+import info.nightscout.androidaps.diaconn.databinding.DiaconnG8HistoryActivityBinding
+import info.nightscout.androidaps.events.EventPumpStatusChanged
+import info.nightscout.androidaps.interfaces.ActivePlugin
+import info.nightscout.androidaps.interfaces.CommandQueueProvider
+import info.nightscout.androidaps.interfaces.ProfileFunction
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.queue.Callback
+import info.nightscout.androidaps.utils.DateUtil
+import info.nightscout.androidaps.utils.DecimalFormatter
+import info.nightscout.androidaps.utils.FabricPrivacy
+import info.nightscout.androidaps.utils.T
+import info.nightscout.androidaps.utils.rx.AapsSchedulers
+
+
+import io.reactivex.disposables.CompositeDisposable
+import io.reactivex.rxkotlin.plusAssign
+import java.util.*
+import javax.inject.Inject
+
+class DiaconnG8HistoryActivity : NoSplashAppCompatActivity() {
+
+    @Inject lateinit var rxBus: RxBusWrapper
+    @Inject lateinit var aapsLogger: AAPSLogger
+    @Inject lateinit var profileFunction: ProfileFunction
+    @Inject lateinit var fabricPrivacy: FabricPrivacy
+    @Inject lateinit var activePlugin: ActivePlugin
+    @Inject lateinit var commandQueue: CommandQueueProvider
+    @Inject lateinit var diaconnHistoryRecordDao: DiaconnHistoryRecordDao
+    @Inject lateinit var dateUtil: DateUtil
+    @Inject lateinit var aapsSchedulers: AapsSchedulers
+
+    private val disposable = CompositeDisposable()
+
+    private var showingType = RecordTypes.RECORD_TYPE_ALARM
+    private var historyList: List<DiaconnHistoryRecord> = ArrayList()
+
+    class TypeList internal constructor(var type: Byte, var name: String) {
+
+        override fun toString(): String = name
+    }
+
+    private lateinit var binding: DiaconnG8HistoryActivityBinding
+
+    override fun onResume() {
+        super.onResume()
+        disposable += rxBus
+            .toObservable(EventPumpStatusChanged::class.java)
+            .observeOn(aapsSchedulers.main)
+            .subscribe({ binding.status.text = it.getStatus(resourceHelper) }) { fabricPrivacy.logException(it) }
+        swapAdapter(showingType)
+    }
+
+    override fun onPause() {
+        super.onPause()
+        disposable.clear()
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        binding = DiaconnG8HistoryActivityBinding.inflate(layoutInflater)
+        setContentView(binding.root)
+
+        binding.recyclerview.setHasFixedSize(true)
+        binding.recyclerview.layoutManager = LinearLayoutManager(this)
+        binding.recyclerview.adapter = RecyclerViewAdapter(historyList)
+        binding.status.visibility = View.GONE
+
+        // Types
+        val typeList = ArrayList<TypeList>()
+        typeList.add(TypeList(RecordTypes.RECORD_TYPE_ALARM, resourceHelper.gs(R.string.diaconn_g8_history_alarm)))
+        typeList.add(TypeList(RecordTypes.RECORD_TYPE_BASALHOUR, resourceHelper.gs(R.string.diaconn_g8_history_basalhours)))
+        typeList.add(TypeList(RecordTypes.RECORD_TYPE_BOLUS, resourceHelper.gs(R.string.diaconn_g8_history_bolus)))
+        typeList.add(TypeList(RecordTypes.RECORD_TYPE_TB, resourceHelper.gs(R.string.diaconn_g8_history_tempbasal)))
+        typeList.add(TypeList(RecordTypes.RECORD_TYPE_DAILY, resourceHelper.gs(R.string.diaconn_g8_history_dailyinsulin)))
+        typeList.add(TypeList(RecordTypes.RECORD_TYPE_REFILL, resourceHelper.gs(R.string.diaconn_g8_history_refill)))
+        typeList.add(TypeList(RecordTypes.RECORD_TYPE_SUSPEND, resourceHelper.gs(R.string.diaconn_g8_history_suspend)))
+        binding.spinner.adapter = ArrayAdapter(this, R.layout.spinner_centered, typeList)
+
+        binding.reload.setOnClickListener {
+            val selected = binding.spinner.selectedItem as TypeList?
+                ?: return@setOnClickListener
+            runOnUiThread {
+                binding.reload.visibility = View.GONE
+                binding.status.visibility = View.VISIBLE
+            }
+            clearCardView()
+            commandQueue.loadHistory(selected.type, object : Callback() {
+                override fun run() {
+                    swapAdapter(selected.type)
+                    runOnUiThread {
+                        binding.reload.visibility = View.VISIBLE
+                        binding.status.visibility = View.GONE
+                    }
+                }
+            })
+        }
+        binding.spinner.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
+            override fun onItemSelected(parent: AdapterView<*>?, view: View?, position: Int, id: Long) {
+                val selected = typeList[position]
+                swapAdapter(selected.type)
+                showingType = selected.type
+            }
+
+            override fun onNothingSelected(parent: AdapterView<*>?) {
+                clearCardView()
+            }
+        }
+    }
+
+    inner class RecyclerViewAdapter internal constructor(private var historyList: List<DiaconnHistoryRecord>) : RecyclerView.Adapter<RecyclerViewAdapter.HistoryViewHolder>() {
+
+        override fun onCreateViewHolder(viewGroup: ViewGroup, viewType: Int): HistoryViewHolder =
+            HistoryViewHolder(LayoutInflater.from(viewGroup.context).inflate(R.layout.diaconn_g8_history_item, viewGroup, false))
+
+        override fun onBindViewHolder(holder: HistoryViewHolder, position: Int) {
+            val record = historyList[position]
+            holder.time.text = dateUtil.dateAndTimeString(record.timestamp)
+            holder.value.text = DecimalFormatter.to2Decimal(record.value)
+            holder.stringValue.text = record.stringValue
+            holder.bolusType.text = record.bolusType
+            holder.duration.text = DecimalFormatter.to0Decimal(record.duration.toDouble())
+            holder.alarm.text = record.alarm
+            when (showingType) {
+                RecordTypes.RECORD_TYPE_ALARM -> {
+                    holder.time.visibility = View.VISIBLE
+                    holder.value.visibility = View.VISIBLE
+                    holder.stringValue.visibility = View.VISIBLE
+                    holder.bolusType.visibility = View.GONE
+                    holder.duration.visibility = View.GONE
+                    holder.dailyBasal.visibility = View.GONE
+                    holder.dailyBolus.visibility = View.GONE
+                    holder.dailyTotal.visibility = View.GONE
+                    holder.alarm.visibility = View.VISIBLE
+                }
+
+                RecordTypes.RECORD_TYPE_BOLUS -> {
+                    holder.time.visibility = View.VISIBLE
+                    holder.value.visibility = View.VISIBLE
+                    holder.stringValue.visibility = View.VISIBLE
+                    holder.bolusType.visibility = View.VISIBLE
+                    holder.duration.visibility = View.VISIBLE
+                    holder.dailyBasal.visibility = View.GONE
+                    holder.dailyBolus.visibility = View.GONE
+                    holder.dailyTotal.visibility = View.GONE
+                    holder.alarm.visibility = View.GONE
+                }
+
+                RecordTypes.RECORD_TYPE_DAILY -> {
+                    holder.dailyBasal.text = resourceHelper.gs(R.string.formatinsulinunits, record.dailyBasal)
+                    holder.dailyBolus.text = resourceHelper.gs(R.string.formatinsulinunits, record.dailyBolus)
+                    holder.dailyTotal.text = resourceHelper.gs(R.string.formatinsulinunits, record.dailyBolus + record.dailyBasal)
+                    holder.time.text = dateUtil.dateString(record.timestamp)
+                    holder.time.visibility = View.VISIBLE
+                    holder.value.visibility = View.GONE
+                    holder.stringValue.visibility = View.GONE
+                    holder.bolusType.visibility = View.GONE
+                    holder.duration.visibility = View.GONE
+                    holder.dailyBasal.visibility = View.VISIBLE
+                    holder.dailyBolus.visibility = View.VISIBLE
+                    holder.dailyTotal.visibility = View.VISIBLE
+                    holder.alarm.visibility = View.GONE
+                }
+
+                RecordTypes.RECORD_TYPE_BASALHOUR -> {
+                    holder.time.visibility = View.VISIBLE
+                    holder.value.visibility = View.VISIBLE
+                    holder.stringValue.visibility = View.VISIBLE
+                    holder.bolusType.visibility = View.GONE
+                    holder.duration.visibility = View.GONE
+                    holder.dailyBasal.visibility = View.GONE
+                    holder.dailyBolus.visibility = View.GONE
+                    holder.dailyTotal.visibility = View.GONE
+                    holder.alarm.visibility = View.GONE
+                }
+                RecordTypes.RECORD_TYPE_REFILL -> {
+                    holder.time.visibility = View.VISIBLE
+                    holder.value.visibility = View.VISIBLE
+                    holder.stringValue.visibility = View.VISIBLE
+                    holder.bolusType.visibility = View.GONE
+                    holder.duration.visibility = View.GONE
+                    holder.dailyBasal.visibility = View.GONE
+                    holder.dailyBolus.visibility = View.GONE
+                    holder.dailyTotal.visibility = View.GONE
+                    holder.alarm.visibility = View.GONE
+                }
+
+                RecordTypes.RECORD_TYPE_TB -> {
+                    holder.time.visibility = View.VISIBLE
+                    holder.value.visibility = View.VISIBLE
+                    holder.stringValue.visibility = View.VISIBLE
+                    holder.bolusType.visibility = View.GONE
+                    holder.duration.visibility = View.VISIBLE
+                    holder.dailyBasal.visibility = View.GONE
+                    holder.dailyBolus.visibility = View.GONE
+                    holder.dailyTotal.visibility = View.GONE
+                    holder.alarm.visibility = View.GONE
+                }
+
+                RecordTypes.RECORD_TYPE_SUSPEND -> {
+                    holder.time.visibility = View.VISIBLE
+                    holder.value.visibility = View.GONE
+                    holder.stringValue.visibility = View.VISIBLE
+                    holder.bolusType.visibility = View.GONE
+                    holder.duration.visibility = View.GONE
+                    holder.dailyBasal.visibility = View.GONE
+                    holder.dailyBolus.visibility = View.GONE
+                    holder.dailyTotal.visibility = View.GONE
+                    holder.alarm.visibility = View.GONE
+                }
+            }
+        }
+
+        override fun getItemCount(): Int {
+            return historyList.size
+        }
+
+        inner class HistoryViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
+
+            var time: TextView = itemView.findViewById(R.id.diaconn_g8_history_time)
+            var value: TextView = itemView.findViewById(R.id.diaconn_g8_history_value)
+            var bolusType: TextView = itemView.findViewById(R.id.diaconn_g8_history_bolustype)
+            var stringValue: TextView = itemView.findViewById(R.id.diaconn_g8_history_stringvalue)
+            var duration: TextView = itemView.findViewById(R.id.diaconn_g8_history_duration)
+            var dailyBasal: TextView = itemView.findViewById(R.id.diaconn_g8_history_dailybasal)
+            var dailyBolus: TextView = itemView.findViewById(R.id.diaconn_g8_history_dailybolus)
+            var dailyTotal: TextView = itemView.findViewById(R.id.diaconn_g8_history_dailytotal)
+            var alarm: TextView = itemView.findViewById(R.id.diaconn_g8_history_alarm)
+        }
+    }
+
+    private fun swapAdapter(type: Byte) {
+        disposable += diaconnHistoryRecordDao
+            .allFromByType(dateUtil.now() - T.months(1).msecs(), type)
+            .subscribeOn(aapsSchedulers.io)
+            .observeOn(aapsSchedulers.main)
+            .subscribe { historyList -> binding.recyclerview.swapAdapter(RecyclerViewAdapter(historyList), false) }
+    }
+
+    private fun clearCardView() = binding.recyclerview.swapAdapter(RecyclerViewAdapter(ArrayList()), false)
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/activities/DiaconnG8UserOptionsActivity.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/activities/DiaconnG8UserOptionsActivity.kt
new file mode 100644
index 0000000000..4ec3c4b3a2
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/activities/DiaconnG8UserOptionsActivity.kt
@@ -0,0 +1,192 @@
+package info.nightscout.androidaps.diaconn.activities
+
+import android.content.Context
+import android.content.Intent
+import android.os.Bundle
+import android.view.View
+import android.widget.AdapterView
+import android.widget.ArrayAdapter
+import info.nightscout.androidaps.activities.ErrorHelperActivity
+import info.nightscout.androidaps.activities.NoSplashAppCompatActivity
+
+
+import info.nightscout.androidaps.diaconn.DiaconnG8Pump
+import info.nightscout.androidaps.diaconn.R
+import info.nightscout.androidaps.diaconn.databinding.DiaconnG8UserOptionsActivityBinding
+
+import info.nightscout.androidaps.interfaces.ActivePlugin
+import info.nightscout.androidaps.interfaces.CommandQueueProvider
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.queue.Callback
+import info.nightscout.androidaps.utils.FabricPrivacy
+import info.nightscout.androidaps.utils.ToastUtils
+import info.nightscout.androidaps.utils.sharedPreferences.SP
+import io.reactivex.disposables.CompositeDisposable
+import java.text.DecimalFormat
+import javax.inject.Inject
+
+class DiaconnG8UserOptionsActivity : NoSplashAppCompatActivity() {
+
+    @Inject lateinit var aapsLogger: AAPSLogger
+    @Inject lateinit var rxBus: RxBusWrapper
+    @Inject lateinit var fabricPrivacy: FabricPrivacy
+    @Inject lateinit var context: Context
+    @Inject lateinit var diaconnG8Pump: DiaconnG8Pump
+    @Inject lateinit var activePlugin: ActivePlugin
+    @Inject lateinit var commandQueue: CommandQueueProvider
+    @Inject lateinit var sp: SP
+
+    private val disposable = CompositeDisposable()
+
+    private lateinit var binding: DiaconnG8UserOptionsActivityBinding
+
+    @Synchronized
+    override fun onResume() {
+        super.onResume()
+    }
+
+    @Synchronized
+    override fun onPause() {
+        disposable.clear()
+        super.onPause()
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        binding = DiaconnG8UserOptionsActivityBinding.inflate(layoutInflater)
+        setContentView(binding.root)
+
+        binding.saveAlarm.setOnClickListener { onSaveAlarmClick() }
+        binding.saveLcdOnTime.setOnClickListener { onSavelcdOnTimeClick() }
+        binding.saveLang.setOnClickListener { onSaveLangClick() }
+
+        binding.saveBolusSpeed.setOnClickListener { onSaveBolusSpeedClick() }
+
+        val spBolusSpeed = sp.getString("g8_bolusspeed", "5")
+
+        binding.bolusSpeed.setParams(spBolusSpeed.toDouble(), 1.0, 8.0, 1.0, DecimalFormat("1"), true, binding.saveBolusSpeed)
+
+        aapsLogger.debug(LTag.PUMP,
+            "UserOptionsLoaded:" + (System.currentTimeMillis() - diaconnG8Pump.lastConnection) / 1000 + " s ago"
+                + "\nbeepAndAlarm:" + diaconnG8Pump.beepAndAlarm
+                + "\nalarmIntesity:" + diaconnG8Pump.alarmIntesity
+                + "\nlanguage:" + diaconnG8Pump.selectedLanguage
+                + "\nlcdOnTimeSec:" + diaconnG8Pump.lcdOnTimeSec)
+
+        fillSoundCategory()
+        fillSoundSubCategory()
+
+        binding.beepAndAlarm.setSelection(diaconnG8Pump.beepAndAlarm - 1)
+        binding.alarmIntesity.setSelection(diaconnG8Pump.alarmIntesity - 1)
+
+        binding.beepAndAlarm.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
+            override fun onItemSelected(parent: AdapterView<*>?, view: View?, position: Int, id: Long) {
+                binding.alarmIntesity.visibility = if("silent" == binding.beepAndAlarm.getItemAtPosition(position).toString()) View.GONE else View.VISIBLE
+            }
+            override fun onNothingSelected(parent: AdapterView<*>?) {}
+        }
+
+        when (diaconnG8Pump.lcdOnTimeSec) {
+            1 -> binding.pumpscreentimeout10.isChecked = true
+            2 -> binding.pumpscreentimeout20.isChecked = true
+            3 -> binding.pumpscreentimeout30.isChecked = true
+        }
+
+        when (diaconnG8Pump.selectedLanguage) {
+            1 -> binding.pumplangChiness.isChecked = true
+            2 -> binding.pumplangKorean.isChecked = true
+            3 -> binding.pumplangEnglish.isChecked = true
+        }
+    }
+
+    private fun onSaveAlarmClick() {
+
+        diaconnG8Pump.setUserOptionType = DiaconnG8Pump.ALARM
+
+        diaconnG8Pump.beepAndAlarm = binding.beepAndAlarm.selectedItemPosition + 1
+        diaconnG8Pump.alarmIntesity = binding.alarmIntesity.selectedItemPosition + 1
+
+        onSaveClick()
+    }
+
+    private fun onSavelcdOnTimeClick() {
+
+        diaconnG8Pump.setUserOptionType = DiaconnG8Pump.LCD
+
+        diaconnG8Pump.lcdOnTimeSec = when {
+            binding.pumpscreentimeout10.isChecked   -> 1
+            binding.pumpscreentimeout20.isChecked   -> 2
+            binding.pumpscreentimeout30.isChecked   -> 3
+            else                                    -> 1
+        }
+
+        onSaveClick()
+    }
+
+    private fun onSaveLangClick() {
+
+        diaconnG8Pump.setUserOptionType = DiaconnG8Pump.LANG
+
+        diaconnG8Pump.selectedLanguage = when {
+            binding.pumplangChiness.isChecked   -> 1
+            binding.pumplangKorean.isChecked    -> 2
+            binding.pumplangEnglish.isChecked   -> 3
+            else                                -> 2
+        }
+
+        onSaveClick()
+    }
+
+    private fun onSaveBolusSpeedClick() {
+        val intSpeed = binding.bolusSpeed.value.toInt()
+
+        diaconnG8Pump.bolusSpeed = intSpeed
+        diaconnG8Pump.speed = intSpeed
+        diaconnG8Pump.setUserOptionType = DiaconnG8Pump.BOLUS_SPEED
+        sp.putString("g8_bolusspeed", intSpeed.toString())
+        sp.putBoolean("diaconn_g8_isbolusspeedsync", false)
+
+        ToastUtils.okToast(context, "Save Success!")
+    }
+
+    private fun onSaveClick() {
+        commandQueue.setUserOptions(object : Callback() {
+            override fun run() {
+                if (!result.success) {
+                    val i = Intent(context, ErrorHelperActivity::class.java)
+                    i.putExtra("soundid", R.raw.boluserror)
+                    i.putExtra("status", result.comment)
+                    i.putExtra("title", resourceHelper.gs(R.string.pumperror))
+                    i.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                    context.startActivity(i)
+                }
+            }
+        })
+        finish()
+    }
+
+    private fun fillSoundCategory() {
+        val categories = ArrayList<String>()
+        categories.add(resourceHelper.gs(R.string.diaconn_g8_pumpalarm_sound))
+        categories.add(resourceHelper.gs(R.string.diaconn_g8_pumpalarm_vibrate))
+        categories.add(resourceHelper.gs(R.string.diaconn_g8_pumpalarm_silent))
+        context.let { context ->
+            val adapterCategories = ArrayAdapter(context, R.layout.spinner_centered, categories)
+            binding.beepAndAlarm.adapter = adapterCategories
+        }
+    }
+
+    private fun fillSoundSubCategory() {
+        val categories = ArrayList<String>()
+        categories.add(resourceHelper.gs(R.string.diaconn_g8_pumpalarm_intensity_low))
+        categories.add(resourceHelper.gs(R.string.diaconn_g8_pumpalarm_intensity_middle))
+        categories.add(resourceHelper.gs(R.string.diaconn_g8_pumpalarm_intensity_high))
+        context.let { context ->
+            val adapterCategories = ArrayAdapter(context, R.layout.spinner_centered, categories)
+            binding.alarmIntesity.adapter = adapterCategories
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/common/RecordTypes.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/common/RecordTypes.kt
new file mode 100644
index 0000000000..e4fbc8122d
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/common/RecordTypes.kt
@@ -0,0 +1,11 @@
+package info.nightscout.androidaps.diaconn.common
+
+object RecordTypes {
+    const val RECORD_TYPE_BOLUS = 0x01.toByte()
+    const val RECORD_TYPE_DAILY = 0x02.toByte()
+    const val RECORD_TYPE_ALARM = 0x03.toByte()
+    const val RECORD_TYPE_REFILL = 0x04.toByte()
+    const val RECORD_TYPE_SUSPEND = 0x05.toByte()
+    const val RECORD_TYPE_BASALHOUR = 0x06.toByte()
+    const val RECORD_TYPE_TB = 0x07.toByte()
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/database/DiaconnHistoryDatabase.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/database/DiaconnHistoryDatabase.kt
new file mode 100644
index 0000000000..38a082133a
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/database/DiaconnHistoryDatabase.kt
@@ -0,0 +1,32 @@
+package info.nightscout.androidaps.diaconn.database
+
+import android.content.Context
+import androidx.room.Database
+import androidx.room.Room
+import androidx.room.RoomDatabase
+
+const val TABLE_DIACONN_HISTORY = "diaconnHistory"
+
+@Database(
+    entities = [DiaconnHistoryRecord::class],
+    exportSchema = true,
+    version = DiaconnHistoryDatabase.VERSION
+)
+abstract class DiaconnHistoryDatabase : RoomDatabase() {
+
+    abstract fun historyRecordDao(): DiaconnHistoryRecordDao
+
+    companion object {
+
+        const val VERSION = 1
+
+        fun build(context: Context) =
+            Room.databaseBuilder(
+                context.applicationContext,
+                DiaconnHistoryDatabase::class.java,
+                "diaconn_database.db"
+            )
+                .fallbackToDestructiveMigration()
+                .build()
+    }
+}
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/database/DiaconnHistoryRecord.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/database/DiaconnHistoryRecord.kt
new file mode 100644
index 0000000000..46d7e28e89
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/database/DiaconnHistoryRecord.kt
@@ -0,0 +1,19 @@
+package info.nightscout.androidaps.diaconn.database
+
+import androidx.room.Entity
+import androidx.room.Index
+import androidx.room.PrimaryKey
+
+@Entity(tableName = TABLE_DIACONN_HISTORY,
+    indices = [Index("code", "timestamp")])
+data class DiaconnHistoryRecord(
+    @PrimaryKey var timestamp: Long,
+    var code: Byte = 0x0F,
+    var value: Double = 0.0,
+    var bolusType: String = "None",
+    var stringValue: String = "",
+    var duration: Int = 0,
+    var dailyBasal: Double = 0.0,
+    var dailyBolus: Double = 0.0,
+    var alarm: String = ""
+)
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/database/DiaconnHistoryRecordDao.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/database/DiaconnHistoryRecordDao.kt
new file mode 100644
index 0000000000..127be05acd
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/database/DiaconnHistoryRecordDao.kt
@@ -0,0 +1,17 @@
+package info.nightscout.androidaps.diaconn.database
+
+import androidx.room.Dao
+import androidx.room.Insert
+import androidx.room.OnConflictStrategy
+import androidx.room.Query
+import io.reactivex.Single
+
+@Dao
+abstract class DiaconnHistoryRecordDao {
+
+    @Query("SELECT * from $TABLE_DIACONN_HISTORY WHERE timestamp >= :timestamp AND code = :type")
+    abstract fun allFromByType(timestamp: Long, type: Byte): Single<List<DiaconnHistoryRecord>>
+
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    abstract fun createOrUpdate(diaconnHistoryRecord: DiaconnHistoryRecord)
+}
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/di/DiaconnG8ActivitiesModule.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/di/DiaconnG8ActivitiesModule.kt
new file mode 100644
index 0000000000..8a39b928a0
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/di/DiaconnG8ActivitiesModule.kt
@@ -0,0 +1,17 @@
+package info.nightscout.androidaps.diaconn.di
+
+import dagger.Module
+import dagger.android.ContributesAndroidInjector
+import info.nightscout.androidaps.diaconn.DiaconnG8Fragment
+import info.nightscout.androidaps.diaconn.activities.DiaconnG8BLEScanActivity
+import info.nightscout.androidaps.diaconn.activities.DiaconnG8HistoryActivity
+import info.nightscout.androidaps.diaconn.activities.DiaconnG8UserOptionsActivity
+
+@Module
+@Suppress("unused")
+abstract class DiaconnG8ActivitiesModule {
+    @ContributesAndroidInjector abstract fun contributesDiaconnG8Fragment(): DiaconnG8Fragment
+    @ContributesAndroidInjector abstract fun contributesDiaconnG8HistoryActivity(): DiaconnG8HistoryActivity
+    @ContributesAndroidInjector abstract fun contributesDiaconnG8UserOptionsActivity(): DiaconnG8UserOptionsActivity
+    @ContributesAndroidInjector abstract fun contributesDiaconnG8BLEScanActivity(): DiaconnG8BLEScanActivity
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/di/DiaconnG8Module.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/di/DiaconnG8Module.kt
new file mode 100644
index 0000000000..870d460bf0
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/di/DiaconnG8Module.kt
@@ -0,0 +1,12 @@
+package info.nightscout.androidaps.diaconn.di
+
+import dagger.Module
+
+@Module(includes = [
+    DiaconnG8ActivitiesModule::class,
+    DiaconnG8ServiceModule::class,
+    DiaconnG8PacketModule::class,
+    DiaconnHistoryModule::class
+])
+
+open class DiaconnG8Module
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/di/DiaconnG8PacketModule.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/di/DiaconnG8PacketModule.kt
new file mode 100644
index 0000000000..8a661ed7a7
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/di/DiaconnG8PacketModule.kt
@@ -0,0 +1,83 @@
+package info.nightscout.androidaps.diaconn.di
+
+import dagger.Module
+import dagger.android.ContributesAndroidInjector
+import info.nightscout.androidaps.diaconn.packet.*
+
+@Module
+@Suppress("unused")
+abstract class DiaconnG8PacketModule {
+    @ContributesAndroidInjector abstract fun contributesDiaconnG8Packet(): DiaconnG8Packet
+    @ContributesAndroidInjector abstract fun contributesAppCancelSettingPacket(): AppCancelSettingPacket
+    @ContributesAndroidInjector abstract fun contributesAppCancelSettingResponsePacket(): AppCancelSettingResponsePacket
+    @ContributesAndroidInjector abstract fun contributesAppConfirmSettingPacket(): AppConfirmSettingPacket
+    @ContributesAndroidInjector abstract fun contributesAppConfirmSettingResponsePacket(): AppConfirmSettingResponsePacket
+    @ContributesAndroidInjector abstract fun contributesSneckLimitInquirePacket(): SneckLimitInquirePacket
+    @ContributesAndroidInjector abstract fun contributesBasalLimitInquirePacket(): BasalLimitInquirePacket
+    @ContributesAndroidInjector abstract fun contributesSneckLimitInquireResponsePacket(): SneckLimitInquireResponsePacket
+    @ContributesAndroidInjector abstract fun contributesBasalLimitInquireResponsePacket(): BasalLimitInquireResponsePacket
+    @ContributesAndroidInjector abstract fun contributesBasalPauseReportPacket(): BasalPauseReportPacket
+    @ContributesAndroidInjector abstract fun contributesBasalPauseSettingPacket(): BasalPauseSettingPacket
+    @ContributesAndroidInjector abstract fun contributesBasalPauseSettingResponsePacket(): BasalPauseSettingResponsePacket
+    @ContributesAndroidInjector abstract fun contributesBasalSettingPacket(): BasalSettingPacket
+    @ContributesAndroidInjector abstract fun contributesBasalSettingReportPacket(): BasalSettingReportPacket
+    @ContributesAndroidInjector abstract fun contributesBasalSettingResponsePacket(): BasalSettingResponsePacket
+    @ContributesAndroidInjector abstract fun contributesBigMainInfoInquirePacket(): BigMainInfoInquirePacket
+    @ContributesAndroidInjector abstract fun contributesBigMainInfoInquireResponsePacket(): BigMainInfoInquireResponsePacket
+    @ContributesAndroidInjector abstract fun contributesBigLogInquirePacket(): BigLogInquirePacket
+    @ContributesAndroidInjector abstract fun contributesBigLogInquireResponsePacket(): BigLogInquireResponsePacket
+    @ContributesAndroidInjector abstract fun contributesConfirmReportPacket(): ConfirmReportPacket
+    @ContributesAndroidInjector abstract fun contributesInjectionBasalSettingPacket(): InjectionBasalSettingPacket
+    @ContributesAndroidInjector abstract fun contributesInjectionBasalSettingResponsePacket(): InjectionBasalSettingResponsePacket
+    @ContributesAndroidInjector abstract fun contributesInjectionSnackResultReportPacket(): InjectionSnackResultReportPacket
+    @ContributesAndroidInjector abstract fun contributesInjectionSnactSettingPacket(): InjectionSnackSettingPacket
+    @ContributesAndroidInjector abstract fun contributesInjectionSnackSettingResponsePacket(): InjectionSnackSettingResponsePacket
+    @ContributesAndroidInjector abstract fun contributesInjectionExtendedBolusResultReportPacket(): InjectionExtendedBolusResultReportPacket
+    @ContributesAndroidInjector abstract fun contributesInjectionExtendedBolusSettingPacket(): InjectionExtendedBolusSettingPacket
+    @ContributesAndroidInjector abstract fun contributesInjectionExtendedBolusSettingResponsePacket(): InjectionExtendedBolusSettingResponsePacket
+    @ContributesAndroidInjector abstract fun contributesInjectionBasalReportPacket(): InjectionBasalReportPacket
+    @ContributesAndroidInjector abstract fun contributesInjectionSnackInquirePacket(): InjectionSnackInquirePacket
+    @ContributesAndroidInjector abstract fun contributesInjectionSnackInquireResponsePacket(): InjectionSnackInquireResponsePacket
+    @ContributesAndroidInjector abstract fun contributesRejectReportPacket(): RejectReportPacket
+    @ContributesAndroidInjector abstract fun contributesTempBasalReportPacket(): TempBasalReportPacket
+    @ContributesAndroidInjector abstract fun contributesTempBasalSettingPacket(): TempBasalSettingPacket
+    @ContributesAndroidInjector abstract fun contributesTempBasalSettingResponsePacket(): TempBasalSettingResponsePacket
+    @ContributesAndroidInjector abstract fun contributesTempBasalInquirePacket(): TempBasalInquirePacket
+    @ContributesAndroidInjector abstract fun contributesTempBasalInquireResponsePacket(): TempBasalInquireResponsePacket
+    @ContributesAndroidInjector abstract fun contributesTimeInquirePacket(): TimeInquirePacket
+    @ContributesAndroidInjector abstract fun contributesTimeInquireResponsePacket(): TimeInquireResponsePacket
+    @ContributesAndroidInjector abstract fun contributesTimeReportPacket(): TimeReportPacket
+    @ContributesAndroidInjector abstract fun contributesTimeSettingPacket(): TimeSettingPacket
+    @ContributesAndroidInjector abstract fun contributesTimeSettingResponsePacket(): TimeSettingResponsePacket
+    @ContributesAndroidInjector abstract fun contributesLogStatusInquirePacket(): LogStatusInquirePacket
+    @ContributesAndroidInjector abstract fun contributesLogStatusInquireResponsePacket(): LogStatusInquireResponsePacket
+    @ContributesAndroidInjector abstract fun contributesInjectionCancelSettingPacket(): InjectionCancelSettingPacket
+    @ContributesAndroidInjector abstract fun contributesInjectionCancelSettingResponsePacket(): InjectionCancelSettingResponsePacket
+    @ContributesAndroidInjector abstract fun contributesSoundSettingPacket(): SoundSettingPacket
+    @ContributesAndroidInjector abstract fun contributesSoundSettingResponsePacket(): SoundSettingResponsePacket
+    @ContributesAndroidInjector abstract fun contributesDisplayTimeoutSettingPacket(): DisplayTimeoutSettingPacket
+    @ContributesAndroidInjector abstract fun contributesDisplayTimeoutSettingResponsePacket(): DisplayTimeoutSettingResponsePacket
+    @ContributesAndroidInjector abstract fun contributesLanguageSettingPacket(): LanguageSettingPacket
+    @ContributesAndroidInjector abstract fun contributesLanguageSettingResponsePacket(): LanguageSettingResponsePacket
+    @ContributesAndroidInjector abstract fun contributesInjectionBlockReportPacket(): InjectionBlockReportPacket
+    @ContributesAndroidInjector abstract fun contributesBatteryWarningReportPacket(): BatteryWarningReportPacket
+    @ContributesAndroidInjector abstract fun contributesInsulinLackReportPacket(): InsulinLackReportPacket
+    @ContributesAndroidInjector abstract fun contributesIncarnationInquirePacket(): IncarnationInquirePacket
+    @ContributesAndroidInjector abstract fun contributesIncarnationInquireResponsePacket(): IncarnationInquireResponsePacket
+    @ContributesAndroidInjector abstract fun contributesBolusSpeedSettingPacket(): BolusSpeedSettingPacket
+    @ContributesAndroidInjector abstract fun contributesBolusSpeedSettingResponsePacket(): BolusSpeedSettingResponsePacket
+    @ContributesAndroidInjector abstract fun contributesInjectionSpeedInquirePacket(): BolusSpeedInquirePacket
+    @ContributesAndroidInjector abstract fun contributesInjectionSpeedInquireResponsePacket(): BolusSpeedInquireResponsePacket
+    @ContributesAndroidInjector abstract fun contributesBolusSpeedSettingReportPacket(): BolusSpeedSettingReportPacket
+    @ContributesAndroidInjector abstract fun contributesSoundInquirePacket(): SoundInquirePacket
+    @ContributesAndroidInjector abstract fun contributesSoundInquireResponsePacket(): SoundInquireResponsePacket
+    @ContributesAndroidInjector abstract fun contributesDisplayTimeInquirePacket(): DisplayTimeInquirePacket
+    @ContributesAndroidInjector abstract fun contributesDisplayTimeInquireResponsePacket(): DisplayTimeInquireResponsePacket
+    @ContributesAndroidInjector abstract fun contributesLanguageInquirePacket(): LanguageInquirePacket
+    @ContributesAndroidInjector abstract fun contributesLanguageInquireResponsePacket(): LanguageInquireResponsePacket
+    @ContributesAndroidInjector abstract fun contributesBigAPSMainInfoInquirePacket(): BigAPSMainInfoInquirePacket
+    @ContributesAndroidInjector abstract fun contributesBigAPSMainInfoInquireResponsePacket(): BigAPSMainInfoInquireResponsePacket
+
+
+
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/di/DiaconnG8ServiceModule.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/di/DiaconnG8ServiceModule.kt
new file mode 100644
index 0000000000..ecc84e13d7
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/di/DiaconnG8ServiceModule.kt
@@ -0,0 +1,11 @@
+package info.nightscout.androidaps.diaconn.di
+
+import dagger.Module
+import dagger.android.ContributesAndroidInjector
+import info.nightscout.androidaps.diaconn.service.DiaconnG8Service
+
+@Module
+@Suppress("unused")
+abstract class DiaconnG8ServiceModule {
+    @ContributesAndroidInjector abstract fun contributesDiaconnG8Service(): DiaconnG8Service
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/di/DiaconnHistoryModule.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/di/DiaconnHistoryModule.kt
new file mode 100644
index 0000000000..fed5f0ed58
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/di/DiaconnHistoryModule.kt
@@ -0,0 +1,21 @@
+package info.nightscout.androidaps.diaconn.di
+
+import android.content.Context
+import dagger.Module
+import dagger.Provides
+import info.nightscout.androidaps.diaconn.database.DiaconnHistoryDatabase
+import info.nightscout.androidaps.diaconn.database.DiaconnHistoryRecordDao
+import javax.inject.Singleton
+
+@Module
+class DiaconnHistoryModule {
+
+    @Provides
+    @Singleton
+    internal fun provideDatabase(context: Context): DiaconnHistoryDatabase = DiaconnHistoryDatabase.build(context)
+
+    @Provides
+    @Singleton
+    internal fun provideHistoryRecordDao(diaconnHistoryDatabase: DiaconnHistoryDatabase): DiaconnHistoryRecordDao =
+        diaconnHistoryDatabase.historyRecordDao()
+}
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/events/EventDiaconnG8DeviceChange.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/events/EventDiaconnG8DeviceChange.kt
new file mode 100644
index 0000000000..a4c565ec9d
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/events/EventDiaconnG8DeviceChange.kt
@@ -0,0 +1,5 @@
+package info.nightscout.androidaps.diaconn.events
+
+import info.nightscout.androidaps.events.Event
+
+class EventDiaconnG8DeviceChange : Event()
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/events/EventDiaconnG8NewStatus.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/events/EventDiaconnG8NewStatus.kt
new file mode 100644
index 0000000000..b275db0111
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/events/EventDiaconnG8NewStatus.kt
@@ -0,0 +1,5 @@
+package info.nightscout.androidaps.diaconn.events
+
+import info.nightscout.androidaps.events.Event
+
+class EventDiaconnG8NewStatus : Event()
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/AppCancelSettingPacket.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/AppCancelSettingPacket.kt
new file mode 100644
index 0000000000..a3cfaed4ce
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/AppCancelSettingPacket.kt
@@ -0,0 +1,32 @@
+package info.nightscout.androidaps.diaconn.packet
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.diaconn.DiaconnG8Pump
+import info.nightscout.androidaps.logging.LTag
+import javax.inject.Inject
+
+/**
+ * AppCancelSettingPacket
+ */
+class AppCancelSettingPacket(
+    injector: HasAndroidInjector,
+    private var reqMsgType: Byte,
+) : DiaconnG8Packet(injector ) {
+
+    @Inject lateinit var diaconnG8Pump: DiaconnG8Pump
+
+    init {
+        msgType = 0x29
+        aapsLogger.debug(LTag.PUMPCOMM, "AppCancelSettingPacket init")
+    }
+
+    override fun encode(msgSeq:Int): ByteArray {
+        val buffer = prefixEncode(msgType, msgSeq, MSG_CON_END)
+        buffer.put(reqMsgType) // 명령코드
+        return suffixEncode(buffer)
+    }
+
+    override fun getFriendlyName(): String {
+        return "PUMP_APP_CANCEL_SETTING"
+    }
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/AppCancelSettingResponsePacket.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/AppCancelSettingResponsePacket.kt
new file mode 100644
index 0000000000..97f2e09403
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/AppCancelSettingResponsePacket.kt
@@ -0,0 +1,44 @@
+package info.nightscout.androidaps.diaconn.packet
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.diaconn.DiaconnG8Pump
+import info.nightscout.androidaps.logging.LTag
+import javax.inject.Inject
+
+/**
+ * AppCancelSettingResponsePacket
+ */
+class AppCancelSettingResponsePacket(
+    injector: HasAndroidInjector
+) : DiaconnG8Packet(injector ) {
+
+    @Inject lateinit var diaconnG8Pump: DiaconnG8Pump
+    var result =0
+    init {
+        msgType = 0xA9.toByte()
+        aapsLogger.debug(LTag.PUMPCOMM, "AppCancelSettingResPacket init ")
+    }
+
+    override fun handleMessage(data: ByteArray?) {
+        val defectCheck = defect(data)
+        if (defectCheck != 0) {
+            aapsLogger.debug(LTag.PUMPCOMM, "AppCancelSettingResponsePacket Got some Error")
+            failed = true
+            return
+        } else failed = false
+
+        val bufferData = prefixDecode(data)
+        result =  getByteToInt(bufferData)
+        if(!isSuccSettingResponseResult(result)) {
+            diaconnG8Pump.resultErrorCode = result
+            failed = true
+            return
+        }
+        aapsLogger.debug(LTag.PUMPCOMM, "Result --> ${result}")
+    }
+
+
+    override fun getFriendlyName(): String {
+        return "PUMP_APP_CANCEL_SETTING_RESPONSE"
+    }
+}
\ 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
new file mode 100644
index 0000000000..081362f1c6
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/AppConfirmSettingPacket.kt
@@ -0,0 +1,39 @@
+package info.nightscout.androidaps.diaconn.packet
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.diaconn.DiaconnG8Pump
+import info.nightscout.androidaps.logging.LTag
+import javax.inject.Inject
+
+/**
+ * AppConfirmSettingPacket
+ */
+class AppConfirmSettingPacket(
+    injector: HasAndroidInjector,
+    private var reqMsgType: Byte, // 명령코드
+    private var otp: Int // 응답시 전달받은 opt (random 6 digit numbner)
+) : DiaconnG8Packet(injector ) {
+
+    @Inject lateinit var diaconnG8Pump: DiaconnG8Pump
+
+    init {
+        msgType = 0x37
+        aapsLogger.debug(LTag.PUMPCOMM, "AppConfirmSettingPacket init")
+    }
+
+    override fun encode(msgSeq:Int): ByteArray {
+        val buffer = prefixEncode(msgType, msgSeq, MSG_CON_END)
+
+        buffer.put(reqMsgType)  // 명령코드
+        buffer.putInt(otp) //  응답시 전달받은 opt (random 6digit numbner)
+
+        aapsLogger.debug(LTag.PUMPCOMM, "reqMsgType -> ${reqMsgType}")
+        aapsLogger.debug(LTag.PUMPCOMM, "otp -> ${otp}")
+
+        return suffixEncode(buffer)
+    }
+
+    override fun getFriendlyName(): String {
+        return "PUMP_APP_CONFRIM_SETTING"
+    }
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/AppConfirmSettingResponsePacket.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/AppConfirmSettingResponsePacket.kt
new file mode 100644
index 0000000000..f54fc49d4a
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/AppConfirmSettingResponsePacket.kt
@@ -0,0 +1,43 @@
+package info.nightscout.androidaps.diaconn.packet
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.diaconn.DiaconnG8Pump
+import info.nightscout.androidaps.logging.LTag
+import javax.inject.Inject
+
+/**
+ * AppConfirmSettingResponsePacket
+ */
+class AppConfirmSettingResponsePacket(
+    injector: HasAndroidInjector
+) : DiaconnG8Packet(injector ) {
+
+    @Inject lateinit var diaconnG8Pump: DiaconnG8Pump
+    var result =0
+    init {
+        msgType = 0xB7.toByte()
+        aapsLogger.debug(LTag.PUMPCOMM, "AppConfirmSettingReqPacket Response ")
+    }
+
+    override fun handleMessage(data: ByteArray?) {
+        val defectCheck = defect(data)
+        if (defectCheck != 0) {
+            aapsLogger.debug(LTag.PUMPCOMM, "AppConfirmSettingResponsePacket Got some Error")
+            failed = true
+            return
+        } else failed = false
+        val bufferData = prefixDecode(data)
+        result =  getByteToInt(bufferData)
+        aapsLogger.debug(LTag.PUMPCOMM, "Result --> ${result}")
+
+        if(!isSuccSettingResponseResult(result)) {
+            diaconnG8Pump.resultErrorCode = result
+            failed = true
+            return
+        }
+    }
+
+    override fun getFriendlyName(): String {
+        return "PUMP_APP_CONFIRM_SETTING_RESPONSE"
+    }
+}
\ No newline at end of file
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
new file mode 100644
index 0000000000..5dc1860e03
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BasalLimitInquirePacket.kt
@@ -0,0 +1,30 @@
+package info.nightscout.androidaps.diaconn.packet
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.diaconn.DiaconnG8Pump
+import info.nightscout.androidaps.logging.LTag
+import javax.inject.Inject
+
+/**
+ * BasalLimitInquirePacket
+ */
+class BasalLimitInquirePacket(
+    injector: HasAndroidInjector
+) : DiaconnG8Packet(injector ) {
+
+    @Inject lateinit var diaconnG8Pump: DiaconnG8Pump
+
+    init {
+        msgType = 0x52.toByte()
+        aapsLogger.debug(LTag.PUMPCOMM, "BasalLimitInquirePacket init")
+    }
+
+    override fun encode(msgSeq:Int): ByteArray {
+        val buffer = prefixEncode(msgType, msgSeq, MSG_CON_END)
+        return suffixEncode(buffer)
+    }
+
+    override fun getFriendlyName(): String {
+        return "PUMP_BASAL_LIMIT_INQUIRE"
+    }
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BasalLimitInquireResponsePacket.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BasalLimitInquireResponsePacket.kt
new file mode 100644
index 0000000000..26bb9a78ab
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BasalLimitInquireResponsePacket.kt
@@ -0,0 +1,44 @@
+package info.nightscout.androidaps.diaconn.packet
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.diaconn.DiaconnG8Pump
+import info.nightscout.androidaps.logging.LTag
+import javax.inject.Inject
+
+/**
+ * BasalLimitInquireResponsePacket
+ */
+class BasalLimitInquireResponsePacket(injector: HasAndroidInjector) : DiaconnG8Packet(injector ) {
+
+    @Inject lateinit var diaconnG8Pump: DiaconnG8Pump
+
+    init {
+        msgType = 0x92.toByte()
+        aapsLogger.debug(LTag.PUMPCOMM, "BasalLimitInquireResponsePacket init")
+    }
+
+    override fun handleMessage(data: ByteArray?) {
+        val result = defect(data)
+        if (result != 0) {
+            aapsLogger.debug(LTag.PUMPCOMM, "BasalLimitInquireResponsePacket Got some Error")
+            failed = true
+            return
+        } else failed = false
+
+        val bufferData = prefixDecode(data)
+        val result2 =  getByteToInt(bufferData)
+        if(!isSuccInquireResponseResult(result2)) {
+            failed = true
+            return
+        }
+        diaconnG8Pump.maxBasalPerHours = getShortToInt(bufferData).toDouble() / 100.0  // not include tempbasal limit
+        diaconnG8Pump.maxBasal =  diaconnG8Pump.maxBasalPerHours * 2 // include tempbasal
+
+        aapsLogger.debug(LTag.PUMPCOMM, "Result --> ${diaconnG8Pump.result}")
+        aapsLogger.debug(LTag.PUMPCOMM, "maxBasal --> ${diaconnG8Pump.maxBasal}")
+    }
+
+    override fun getFriendlyName(): String {
+        return "PUMP_BASAL_LIMIT_INQUIRE_RESPONSE"
+    }
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BasalPauseReportPacket.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BasalPauseReportPacket.kt
new file mode 100644
index 0000000000..f1aac0371b
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BasalPauseReportPacket.kt
@@ -0,0 +1,37 @@
+package info.nightscout.androidaps.diaconn.packet
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.diaconn.DiaconnG8Pump
+import info.nightscout.androidaps.logging.LTag
+import javax.inject.Inject
+
+/**
+ * BasalPauseReportPacket
+ */
+class BasalPauseReportPacket(injector: HasAndroidInjector) : DiaconnG8Packet(injector ) {
+
+    @Inject lateinit var diaconnG8Pump: DiaconnG8Pump
+    var status:Int? = null
+
+    init {
+        msgType = 0xC3.toByte()
+        aapsLogger.debug(LTag.PUMPCOMM, "BasalPauseReportPacket init ")
+    }
+
+    override fun handleMessage(data: ByteArray?) {
+        val defectCheck = defect(data)
+        if (defectCheck != 0) {
+            aapsLogger.debug(LTag.PUMPCOMM, "BasalPauseReportPacket Got some Error")
+            failed = true
+            return
+        } else failed = false
+
+        val bufferData = prefixDecode(data)
+        status =  getByteToInt(bufferData) //(1: pauseed, 2: pause cancel)
+        aapsLogger.debug(LTag.PUMPCOMM, "status --> ${status}")
+    }
+
+    override fun getFriendlyName(): String {
+        return "PUMP_BASAL_PAUSE_REPORT"
+    }
+}
\ No newline at end of file
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
new file mode 100644
index 0000000000..e0557dd9ca
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BasalPauseSettingPacket.kt
@@ -0,0 +1,32 @@
+package info.nightscout.androidaps.diaconn.packet
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.diaconn.DiaconnG8Pump
+import info.nightscout.androidaps.logging.LTag
+import javax.inject.Inject
+
+/**
+ * Basal Pause Setting Packet
+ */
+class BasalPauseSettingPacket(
+    injector: HasAndroidInjector,
+    private var status:Int //(1:pause, 2: cancel pause)
+) : DiaconnG8Packet(injector ) {
+
+    @Inject lateinit var diaconnG8Pump: DiaconnG8Pump
+
+    init {
+        msgType = 0x03
+        aapsLogger.debug(LTag.PUMPCOMM, "BasalPauseSettingPacket Init")
+    }
+
+    override fun encode(msgSeq:Int): ByteArray {
+        val buffer = prefixEncode(msgType, msgSeq, MSG_CON_END)
+        buffer.put(status.toByte()) // (1:pause, 2: cancel pause)
+        return suffixEncode(buffer)
+    }
+
+    override fun getFriendlyName(): String {
+        return "PUMP_BASAL_PAUSE_SETTING"
+    }
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BasalPauseSettingResponsePacket.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BasalPauseSettingResponsePacket.kt
new file mode 100644
index 0000000000..5ec73cbe3c
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BasalPauseSettingResponsePacket.kt
@@ -0,0 +1,48 @@
+package info.nightscout.androidaps.diaconn.packet
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.diaconn.DiaconnG8Pump
+import info.nightscout.androidaps.logging.LTag
+import javax.inject.Inject
+
+/**
+ * BasalPauseSettingResponsePacket
+ */
+class BasalPauseSettingResponsePacket(
+    injector: HasAndroidInjector
+) : DiaconnG8Packet(injector ) {
+
+    @Inject lateinit var diaconnG8Pump: DiaconnG8Pump
+    var result = 0
+
+    init {
+        msgType = 0x83.toByte()
+        aapsLogger.debug(LTag.PUMPCOMM, "BasalPauseSettingResponsePacket Init")
+    }
+
+    override fun handleMessage(data: ByteArray?) {
+        val defectCheck = defect(data)
+        if (defectCheck != 0) {
+            aapsLogger.debug(LTag.PUMPCOMM, "BasalPauseSettingResponsePacket Got some Error")
+            failed = true
+            return
+        } else failed = false
+
+        val bufferData = prefixDecode(data)
+        result =  getByteToInt(bufferData)
+
+        if(!isSuccSettingResponseResult(result)) {
+            diaconnG8Pump.resultErrorCode = result
+            failed = true
+            return
+        }
+
+        diaconnG8Pump.otpNumber =  getIntToInt(bufferData)
+        aapsLogger.debug(LTag.PUMPCOMM, "Result --> ${result}")
+        aapsLogger.debug(LTag.PUMPCOMM, "otpNumber --> ${diaconnG8Pump.otpNumber}")
+    }
+
+    override fun getFriendlyName(): String {
+        return "PUMP_BASAL_PAUSE_SETTING_RESPONSE"
+    }
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BasalSettingPacket.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BasalSettingPacket.kt
new file mode 100644
index 0000000000..f5ddbbdaa8
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BasalSettingPacket.kt
@@ -0,0 +1,54 @@
+package info.nightscout.androidaps.diaconn.packet
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.diaconn.DiaconnG8Pump
+import info.nightscout.androidaps.logging.LTag
+import javax.inject.Inject
+
+/**
+ * BasalSettingPacket
+ */
+class BasalSettingPacket(
+    injector: HasAndroidInjector,
+    private var pattern: Int, // pattern(1=basic, 2=life1, 3=life2, 4=life3, 5=dr1, 6=dr2)
+    private var group: Int,  //hour group (1=00~05, 2=06~11, 3=12~17, 4=18~23)
+    private var amount1: Int,
+    private var amount2: Int,
+    private var amount3: Int,
+    private var amount4: Int,
+    private var amount5: Int,
+    private var amount6: Int
+) : DiaconnG8Packet(injector ) {
+
+    @Inject lateinit var diaconnG8Pump: DiaconnG8Pump
+
+    init {
+        msgType = 0x0B
+        aapsLogger.debug(LTag.PUMPCOMM, "Setting new basal rates for profile")
+
+    }
+
+    override fun encode(msgSeq:Int): ByteArray {
+        val buffer = if (group == 4) {
+            // 마지막 그룹일때
+            prefixEncode(msgType, msgSeq, MSG_CON_END)
+        } else {
+            // 1, 2, 3 그룹일때
+            prefixEncode(msgType, msgSeq, MSG_CON_CONTINUE)
+        }
+        buffer.put(pattern.toByte()) // 패턴 종류 (1=기본, 2=생활1, 3=생활2, 4=생활3, 5=닥터1, 6=닥터2)
+        buffer.put(group.toByte()) // 그룹 (1=00~05, 2=06~11, 3=12~17, 4=18~23)
+        buffer.putShort(amount1.toShort()) // 주입량 1
+        buffer.putShort(amount2.toShort()) // 주입량 2
+        buffer.putShort(amount3.toShort()) // 주입량 3
+        buffer.putShort(amount4.toShort()) // 주입량 4
+        buffer.putShort(amount5.toShort()) // 주입량 5
+        buffer.putShort(amount6.toShort()) // 주입량 6
+
+        return suffixEncode(buffer)
+    }
+
+    override fun getFriendlyName(): String {
+        return "PUMP_BASAL_SETTING"
+    }
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BasalSettingReportPacket.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BasalSettingReportPacket.kt
new file mode 100644
index 0000000000..3f28ffd3e8
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BasalSettingReportPacket.kt
@@ -0,0 +1,40 @@
+package info.nightscout.androidaps.diaconn.packet
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.diaconn.DiaconnG8Pump
+import info.nightscout.androidaps.logging.LTag
+import javax.inject.Inject
+
+/**
+ * BasalSettingReportPacket
+ */
+class BasalSettingReportPacket(
+    injector: HasAndroidInjector
+) : DiaconnG8Packet(injector ) {
+
+    @Inject lateinit var diaconnG8Pump: DiaconnG8Pump
+    var result = 0
+
+    init {
+        msgType = 0xCB.toByte()
+        aapsLogger.debug(LTag.PUMPCOMM, "BasalSettingReportPacket init ")
+    }
+
+    override fun handleMessage(data: ByteArray?) {
+        val defectCheck = defect(data)
+        if (defectCheck != 0) {
+            aapsLogger.debug(LTag.PUMPCOMM, "BasalSettingReportPacket Got some Error")
+            failed = true
+            return
+        } else failed = false
+
+        val bufferData = prefixDecode(data)
+        result =  getByteToInt(bufferData)
+        aapsLogger.debug(LTag.PUMPCOMM, "Result --> $result")
+        // no Response
+    }
+
+    override fun getFriendlyName(): String {
+        return "PUMP_BASAL_SETTING_REPORT"
+    }
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BasalSettingResponsePacket.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BasalSettingResponsePacket.kt
new file mode 100644
index 0000000000..d7902d76f9
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BasalSettingResponsePacket.kt
@@ -0,0 +1,46 @@
+package info.nightscout.androidaps.diaconn.packet
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.diaconn.DiaconnG8Pump
+import info.nightscout.androidaps.logging.LTag
+import javax.inject.Inject
+
+/**
+ * BasalSettingResponsePacket
+ */
+class BasalSettingResponsePacket(
+    injector: HasAndroidInjector
+) : DiaconnG8Packet(injector ) {
+
+    @Inject lateinit var diaconnG8Pump: DiaconnG8Pump
+    var result = 0
+
+    init {
+        msgType = 0x8B.toByte()
+        aapsLogger.debug(LTag.PUMPCOMM, "BasalSettingResponsePacket init")
+    }
+
+    override fun handleMessage(data: ByteArray?) {
+        val defectCheck = defect(data)
+        if (defectCheck != 0) {
+            aapsLogger.debug(LTag.PUMPCOMM, "BasalSettingResponsePacket Got some Error")
+            failed = true
+            return
+        } else failed = false
+
+        val bufferData = prefixDecode(data)
+        result =  getByteToInt(bufferData)
+        if(!isSuccSettingResponseResult(result)) {
+            diaconnG8Pump.resultErrorCode = result
+            failed = true
+            return
+        }
+        diaconnG8Pump.otpNumber =  getIntToInt(bufferData)
+        aapsLogger.debug(LTag.PUMPCOMM, "Result --> $result")
+        aapsLogger.debug(LTag.PUMPCOMM, "otpNumber --> ${diaconnG8Pump.otpNumber}")
+    }
+
+    override fun getFriendlyName(): String {
+        return "PUMP_BASAL_SETTING_RESPONSE"
+    }
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BatteryWarningReportPacket.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BatteryWarningReportPacket.kt
new file mode 100644
index 0000000000..260a5d7e02
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BatteryWarningReportPacket.kt
@@ -0,0 +1,44 @@
+package info.nightscout.androidaps.diaconn.packet
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.diaconn.DiaconnG8Pump
+import info.nightscout.androidaps.logging.LTag
+import javax.inject.Inject
+
+/**
+ * BatteryWarningReportPacket
+ */
+class BatteryWarningReportPacket(
+    injector: HasAndroidInjector
+) : DiaconnG8Packet(injector ) {
+
+    @Inject lateinit var diaconnG8Pump: DiaconnG8Pump
+
+    init {
+        msgType = 0xD7.toByte()
+        aapsLogger.debug(LTag.PUMPCOMM, "BatteryWarningReportPacket init ")
+    }
+
+    override fun handleMessage(data: ByteArray?) {
+        val defectCheck = defect(data)
+        if (defectCheck != 0) {
+            aapsLogger.debug(LTag.PUMPCOMM, "BatteryWarningReportPacket Got some Error")
+            failed = true
+            return
+        } else failed = false
+
+        val bufferData = prefixDecode(data)
+        diaconnG8Pump.batteryWaningGrade = getByteToInt(bufferData)
+        diaconnG8Pump.batteryWaningProcess = getByteToInt(bufferData)
+        diaconnG8Pump.batteryWaningRemain =  getByteToInt(bufferData)
+
+        aapsLogger.debug(LTag.PUMPCOMM, "batteryWaningGrade --> ${diaconnG8Pump.batteryWaningGrade} (1:info, 2: warning , 3: major , 4: critical)")
+        aapsLogger.debug(LTag.PUMPCOMM, "batteryWaningProcess --> ${diaconnG8Pump.batteryWaningProcess} (1:skip, 2: stop , 3: ignore ) ")
+        aapsLogger.debug(LTag.PUMPCOMM, "batteryWaningRemain --> ${diaconnG8Pump.batteryWaningRemain}   (0~100%) )")
+
+    }
+
+    override fun getFriendlyName(): String {
+        return "PUMP_BATTERY_WARNING_REPORT"
+    }
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BigAPSMainInfoInquirePacket.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BigAPSMainInfoInquirePacket.kt
new file mode 100644
index 0000000000..7f7fb4b343
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BigAPSMainInfoInquirePacket.kt
@@ -0,0 +1,33 @@
+package info.nightscout.androidaps.diaconn.packet
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.diaconn.DiaconnG8Pump
+import info.nightscout.androidaps.logging.LTag
+import javax.inject.Inject
+
+/**
+
+ * BigAPSMainInfoInquirePacket
+ */
+class BigAPSMainInfoInquirePacket(
+    injector: HasAndroidInjector
+) : DiaconnG8Packet(injector ) {
+
+    @Inject lateinit var diaconnG8Pump: DiaconnG8Pump
+
+    init {
+        msgType = 0x54
+        aapsLogger.debug(LTag.PUMPCOMM, "BigAPSMainInfoInquirePacket init")
+
+    }
+
+    override fun encode(msgSeq:Int): ByteArray {
+        val buffer = prefixEncode(msgType, msgSeq, MSG_CON_END)
+
+        return suffixEncode(buffer)
+    }
+
+    override fun getFriendlyName(): String {
+        return "PUMP_BIG_APS_MAIN_INFO_INQUIRE"
+    }
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BigAPSMainInfoInquireResponsePacket.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BigAPSMainInfoInquireResponsePacket.kt
new file mode 100644
index 0000000000..5b56b512df
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BigAPSMainInfoInquireResponsePacket.kt
@@ -0,0 +1,335 @@
+package info.nightscout.androidaps.diaconn.packet
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.diaconn.DiaconnG8Pump
+import info.nightscout.androidaps.diaconn.R
+import info.nightscout.androidaps.diaconn.pumplog.PumplogUtil
+import info.nightscout.androidaps.interfaces.PumpDescription
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.pump.common.defs.PumpType
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import info.nightscout.androidaps.utils.sharedPreferences.SP
+import org.joda.time.DateTime
+import javax.inject.Inject
+import kotlin.math.floor
+
+/**
+ * BigAPSMainInfoInquireResponsePacket
+ */
+class BigAPSMainInfoInquireResponsePacket(
+    injector: HasAndroidInjector
+) : DiaconnG8Packet(injector) {
+
+    @Inject lateinit var diaconnG8Pump: DiaconnG8Pump
+    @Inject lateinit var sp: SP
+    @Inject lateinit var resourceHelper: ResourceHelper
+    private var pumpDesc = PumpDescription(PumpType.DIACONN_G8)
+
+    init {
+        msgType = 0x94.toByte()
+        aapsLogger.debug(LTag.PUMPCOMM, "BigAPSMainInfoInquireResponsePacket init")
+    }
+
+    override fun handleMessage(data: ByteArray?) {
+        val result = defect(data)
+        if (result != 0) {
+            aapsLogger.debug(LTag.PUMPCOMM, "BigAPSMainInfoInquireResponsePacket Got some Error")
+            failed = true
+            return
+        } else failed = false
+
+        val bufferData = prefixDecode(data)
+        val result2 =  getByteToInt(bufferData)  // 결과비트 상위 4비트 제거
+        if(!isSuccInquireResponseResult(result2)) {
+            failed = true
+            return
+        }
+        // 1. pump system setting info
+        diaconnG8Pump.systemRemainInsulin = floor(getShortToInt(bufferData) / 100.0)  // 인슐린 잔량
+        diaconnG8Pump.systemRemainBattery = getByteToInt(bufferData) // 베터리잔량(1~100%)
+        diaconnG8Pump.systemBasePattern = getByteToInt(bufferData) // 기저주입 패턴(0=없음, 1=기본, 2=생활1, 3=생활2, 4=생활3, 5=닥터1, 6=닥터2)
+        diaconnG8Pump.systemTbStatus = getByteToInt(bufferData)    // 임시기저 상태(1=임시기저 중, 2=임시기저 해제)
+        diaconnG8Pump.systemInjectionMealStatus = getByteToInt(bufferData) // 식사주입 상태(1=주입중, 2=주입상태아님)
+        diaconnG8Pump.systemInjectionSnackStatus = getByteToInt(bufferData) // 일반간식 주입 상태(1=주입중, 2=주입상태아님)
+        diaconnG8Pump.systemInjectionSquareStatue = getByteToInt(bufferData) // 스퀘어회식 주입 상태(1=주입중, 2=주입상태아님)
+        diaconnG8Pump.systemInjectionDualStatus = getByteToInt(bufferData) // 더블회식 주입 상태(1=주입중, 2=주입상태아님)
+
+        // 2. basal injection suspend status (1:stop, 2:release)
+        diaconnG8Pump.basePauseStatus = getByteToInt(bufferData) // 상태(1=정지,2=해제)
+
+        // 3. Pump time
+        diaconnG8Pump.year = getByteToInt(bufferData) + 2000   // 년 (18~99)
+        diaconnG8Pump.month = getByteToInt(bufferData)  // 월 (1~12)
+        diaconnG8Pump.day = getByteToInt(bufferData)    // 일 (1~31)
+        diaconnG8Pump.hour = getByteToInt(bufferData)   // 시 (0~23)
+        diaconnG8Pump.minute = getByteToInt(bufferData) // 분 (0~59)
+        diaconnG8Pump.second = getByteToInt(bufferData) // 초 (0~59)
+
+        //4. pump system info
+        diaconnG8Pump.country = getByteToInt(bufferData).toChar().toString().toInt() // ASCII
+        diaconnG8Pump.productType = getByteToInt(bufferData).toChar().toString().toInt() // ASCII
+        diaconnG8Pump.makeYear = getByteToInt(bufferData)
+        diaconnG8Pump.makeMonth = getByteToInt(bufferData)
+        diaconnG8Pump.makeDay = getByteToInt(bufferData)
+        diaconnG8Pump.lotNo = getByteToInt(bufferData)// LOT NO
+        diaconnG8Pump.serialNo = getShortToInt(bufferData)
+        diaconnG8Pump.majorVersion = getByteToInt(bufferData)
+        diaconnG8Pump.minorVersion = getByteToInt(bufferData)
+
+        // save current pump firmware version
+        sp.putString(resourceHelper.gs(R.string.pumpversion), diaconnG8Pump.majorVersion.toString() + "." + diaconnG8Pump.minorVersion.toString())
+
+        // 5. pump log status
+        diaconnG8Pump.pumpLastLogNum = getShortToInt(bufferData) // last saved log no
+        diaconnG8Pump.pumpWrappingCount = getByteToInt(bufferData) // wrapping count
+
+        // 6. bolus speed status.
+        diaconnG8Pump.speed = getByteToInt(bufferData) // bolus speed (1~8)
+
+        // 7. Tempbasal status
+        diaconnG8Pump.tbStatus = getByteToInt(bufferData) // tempbasal status
+        diaconnG8Pump.tbTime = getByteToInt(bufferData)    // tempbasal durationn
+        diaconnG8Pump.tbInjectRateRatio = getShortToInt(bufferData) //rate/percent
+        diaconnG8Pump.tbElapsedTime = getShortToInt(bufferData) // tempbasal elapsed time(0~1425 min)
+
+        // 8. Basal status
+        diaconnG8Pump.baseStatus = getByteToInt(bufferData) // 기저주입 상태
+        diaconnG8Pump.baseHour = getByteToInt(bufferData) // 현재 주입시간
+        diaconnG8Pump.baseAmount = getShortToInt(bufferData) / 100.0 // 주입설정량
+        diaconnG8Pump.baseInjAmount = getShortToInt(bufferData) / 100.0 // 현재 주입량
+
+        // 9. snack bolus status
+        diaconnG8Pump.snackStatus = getByteToInt(bufferData) //주입상태
+        diaconnG8Pump.snackAmount = getShortToInt(bufferData) / 100.0 // 주입설정량
+        diaconnG8Pump.snackInjAmount = getShortToInt(bufferData) / 100.0 // 현재주입량
+        diaconnG8Pump.snackSpeed = getByteToInt(bufferData) //주입속도
+
+        // 10. square(extended) bolus status
+        diaconnG8Pump.squareStatus = getByteToInt(bufferData) // 주입상태
+        diaconnG8Pump.squareTime = getShortToInt(bufferData) // 설정 주입시간(10~300분)
+        diaconnG8Pump.squareInjTime = getShortToInt(bufferData) // 경과 주입시간(10~300분)
+        diaconnG8Pump.squareAmount = getShortToInt(bufferData) / 100.0  // 주입 설정량
+        diaconnG8Pump.squareInjAmount = getShortToInt(bufferData) / 100.0 // 현재 주입량
+
+        // 11. daul bolus status
+        diaconnG8Pump.dualStatus = getByteToInt(bufferData) // 주입상태
+        diaconnG8Pump.dualAmount = getShortToInt(bufferData) / 100.0 // 일반주입 설정량
+        diaconnG8Pump.dualInjAmount = getShortToInt(bufferData) / 100.0 // 일반주입량
+        diaconnG8Pump.dualSquareTime = getShortToInt(bufferData) // 스퀘어주입 설정시간(10~300분)
+        diaconnG8Pump.dualInjSquareTime = getShortToInt(bufferData) // 스퀘어주입 경과시간(10~300분)
+        diaconnG8Pump.dualSquareAmount = getShortToInt(bufferData) / 100.0 // 스퀘어주입 설정량
+        diaconnG8Pump.dualInjSquareAmount = getShortToInt(bufferData) / 100.0 // 스퀘어주입량
+
+        // 12. last injection  status
+        diaconnG8Pump.recentKind1 = getByteToInt(bufferData) // 최근-1 주입 종류(1=식사, 2=일반간식, 3=스퀘어회식, 4=더블회식)
+        diaconnG8Pump.recentTime1 = getIntToInt(bufferData) // 최근-1 주입 시간
+        diaconnG8Pump.recentAmount1 = getShortToInt(bufferData) / 100.0 // 최근-1 주입량
+        diaconnG8Pump.recentKind2 = getByteToInt(bufferData) // 최근-2 주입 종류(1=식사, 2=일반간식, 3=스퀘어회식, 4=더블회식)
+        diaconnG8Pump.recentTime2 = getIntToInt(bufferData) // 최근-2 주입 시간
+        diaconnG8Pump.recentAmount2 = getShortToInt(bufferData) / 100.0 // 최근-2 주입량
+
+        // 13. daily injection status
+        diaconnG8Pump.todayBaseAmount = getShortToInt(bufferData) / 100.0 // 기저주입 총량
+        diaconnG8Pump.todayMealAmount = getShortToInt(bufferData) / 100.0 // 식사주입 총량
+        diaconnG8Pump.todaySnackAmount = getShortToInt(bufferData) / 100.0  // 회식주입 총량
+
+        // 14. basal injection status at this hour
+        diaconnG8Pump.currentBasePattern = getByteToInt(bufferData) // 패턴 종류 (1=기본, 2=생활1, 3=생활2, 4=생활3, 5=닥터1, 6=닥터2)
+        diaconnG8Pump.currentBaseHour = getByteToInt(bufferData) // 현재주입시간(0~23)
+        diaconnG8Pump.currentBaseTbBeforeAmount = getShortToInt(bufferData) / 100.0 // 해당시간의 임시기저 계산 전 기저주입량: 기저주입막힘 발생 시 기저주입 막힘량 제외, 기저정지로 인해 주입되지 않은 량 제외, 리셋으로 인해 주입되지 않은 량 제외(47.5=4750)
+        diaconnG8Pump.currentBaseTbAfterAmount = getShortToInt(bufferData)/ 100.0 // 해당시간의 임시기저 계산 후 기저주입량: 기저주입막힘 발생 시 기저주입 막힘량 제외, 기저정지로 인해 주입되지 않은 량 제외, 리셋으로 인해 주입되지 않은 량 제외(47.5=4750)
+
+        // 15. saved basal pattern status
+        diaconnG8Pump.baseAmount1  = getShortToInt(bufferData) / 100.0  // 주입량 1(량*100, 23.25->2325, 15.2->1520)
+        diaconnG8Pump.baseAmount2  = getShortToInt(bufferData) / 100.0  // 주입량 2(량*100, 23.25->2325, 15.2->1520)
+        diaconnG8Pump.baseAmount3  = getShortToInt(bufferData) / 100.0  // 주입량 3(량*100, 23.25->2325, 15.2->1520)
+        diaconnG8Pump.baseAmount4  = getShortToInt(bufferData) / 100.0  // 주입량 4(량*100, 23.25->2325, 15.2->1520)
+        diaconnG8Pump.baseAmount5  = getShortToInt(bufferData) / 100.0  // 주입량 5(량*100, 23.25->2325, 15.2->1520)
+        diaconnG8Pump.baseAmount6  = getShortToInt(bufferData) / 100.0  // 주입량 6(량*100, 23.25->2325, 15.2->1520)
+        diaconnG8Pump.baseAmount7  = getShortToInt(bufferData) / 100.0  // 주입량 7(량*100, 23.25->2325, 15.2->1520)
+        diaconnG8Pump.baseAmount8  = getShortToInt(bufferData) / 100.0  // 주입량 8(량*100, 23.25->2325, 15.2->1520)
+        diaconnG8Pump.baseAmount9  = getShortToInt(bufferData) / 100.0  // 주입량 9(량*100, 23.25->2325, 15.2->1520)
+        diaconnG8Pump.baseAmount10 = getShortToInt(bufferData) / 100.0  // 주입량 10(량*100, 23.25->2325, 15.2->1520)
+        diaconnG8Pump.baseAmount11 = getShortToInt(bufferData) / 100.0  // 주입량 11(량*100, 23.25->2325, 15.2->1520)
+        diaconnG8Pump.baseAmount12 = getShortToInt(bufferData) / 100.0  // 주입량 12(량*100, 23.25->2325, 15.2->1520)
+        diaconnG8Pump.baseAmount13 = getShortToInt(bufferData) / 100.0  // 주입량 13(량*100, 23.25->2325, 15.2->1520)
+        diaconnG8Pump.baseAmount14 = getShortToInt(bufferData) / 100.0  // 주입량 14(량*100, 23.25->2325, 15.2->1520)
+        diaconnG8Pump.baseAmount15 = getShortToInt(bufferData) / 100.0  // 주입량 15(량*100, 23.25->2325, 15.2->1520)
+        diaconnG8Pump.baseAmount16 = getShortToInt(bufferData) / 100.0  // 주입량 16(량*100, 23.25->2325, 15.2->1520)
+        diaconnG8Pump.baseAmount17 = getShortToInt(bufferData) / 100.0  // 주입량 17(량*100, 23.25->2325, 15.2->1520)
+        diaconnG8Pump.baseAmount18 = getShortToInt(bufferData) / 100.0  // 주입량 18(량*100, 23.25->2325, 15.2->1520)
+        diaconnG8Pump.baseAmount19 = getShortToInt(bufferData) / 100.0  // 주입량 19(량*100, 23.25->2325, 15.2->1520)
+        diaconnG8Pump.baseAmount20 = getShortToInt(bufferData) / 100.0  // 주입량 20(량*100, 23.25->2325, 15.2->1520)
+        diaconnG8Pump.baseAmount21 = getShortToInt(bufferData) / 100.0  // 주입량 21(량*100, 23.25->2325, 15.2->1520)
+        diaconnG8Pump.baseAmount22 = getShortToInt(bufferData) / 100.0  // 주입량 22(량*100, 23.25->2325, 15.2->1520)
+        diaconnG8Pump.baseAmount23 = getShortToInt(bufferData) / 100.0  // 주입량 23(량*100, 23.25->2325, 15.2->1520)
+        diaconnG8Pump.baseAmount24 = getShortToInt(bufferData) / 100.0  // 주입량 24(량*100, 23.25->2325, 15.2->1520)
+
+        // 16. 1hour basal limit
+        diaconnG8Pump.maxBasalPerHours = getShortToInt(bufferData).toDouble() / 100.0  // not include tempbasal limit
+        diaconnG8Pump.maxBasal =  diaconnG8Pump.maxBasalPerHours * 2 // include tempbasal
+
+        // 17. snack limit
+        diaconnG8Pump.maxBolus =  getShortToInt(bufferData).toDouble() / 100
+        diaconnG8Pump.maxBolusePerDay =  getShortToInt(bufferData).toDouble() / 100
+
+        // 18. pump sound
+        diaconnG8Pump.beepAndAlarm =  getByteToInt(bufferData) -1
+        diaconnG8Pump.alarmIntesity =  getByteToInt(bufferData) -1
+
+        // 19. pump light time
+        diaconnG8Pump.lcdOnTimeSec =  getByteToInt(bufferData) // kind (1=30 sec, 2=40 sec, 3=50 sec)
+
+        // 20. language
+        diaconnG8Pump.selectedLanguage =  getByteToInt(bufferData) // language (1=Chiness, 2=Korean, 3=English)
+
+        // pump time setting 'yyyy-MM-dd'T'HH:mm:ssZ'	“2019-07-04T12:30:30+0530”
+        val time  = DateTime(diaconnG8Pump.year, diaconnG8Pump.month, diaconnG8Pump.day, diaconnG8Pump.hour, diaconnG8Pump.minute, diaconnG8Pump.second)
+        diaconnG8Pump.setPumpTime(time.millis)
+        aapsLogger.debug(LTag.PUMPCOMM, "Pump time " + dateUtil.dateAndTimeAndSecondsString(time.millis))
+
+        // basal pattern from pump
+        diaconnG8Pump.pumpProfiles = Array(4) { Array(24) { 0.0 } }
+        diaconnG8Pump.pumpProfiles!![diaconnG8Pump.activeProfile][0]  = diaconnG8Pump.baseAmount1
+        diaconnG8Pump.pumpProfiles!![diaconnG8Pump.activeProfile][1]  = diaconnG8Pump.baseAmount2
+        diaconnG8Pump.pumpProfiles!![diaconnG8Pump.activeProfile][2]  = diaconnG8Pump.baseAmount3
+        diaconnG8Pump.pumpProfiles!![diaconnG8Pump.activeProfile][3]  = diaconnG8Pump.baseAmount4
+        diaconnG8Pump.pumpProfiles!![diaconnG8Pump.activeProfile][4]  = diaconnG8Pump.baseAmount5
+        diaconnG8Pump.pumpProfiles!![diaconnG8Pump.activeProfile][5]  = diaconnG8Pump.baseAmount6
+        diaconnG8Pump.pumpProfiles!![diaconnG8Pump.activeProfile][6]  = diaconnG8Pump.baseAmount7
+        diaconnG8Pump.pumpProfiles!![diaconnG8Pump.activeProfile][7]  = diaconnG8Pump.baseAmount8
+        diaconnG8Pump.pumpProfiles!![diaconnG8Pump.activeProfile][8]  = diaconnG8Pump.baseAmount9
+        diaconnG8Pump.pumpProfiles!![diaconnG8Pump.activeProfile][9]  = diaconnG8Pump.baseAmount10
+        diaconnG8Pump.pumpProfiles!![diaconnG8Pump.activeProfile][10] = diaconnG8Pump.baseAmount11
+        diaconnG8Pump.pumpProfiles!![diaconnG8Pump.activeProfile][11] = diaconnG8Pump.baseAmount12
+        diaconnG8Pump.pumpProfiles!![diaconnG8Pump.activeProfile][12] = diaconnG8Pump.baseAmount13
+        diaconnG8Pump.pumpProfiles!![diaconnG8Pump.activeProfile][13] = diaconnG8Pump.baseAmount14
+        diaconnG8Pump.pumpProfiles!![diaconnG8Pump.activeProfile][14] = diaconnG8Pump.baseAmount15
+        diaconnG8Pump.pumpProfiles!![diaconnG8Pump.activeProfile][15] = diaconnG8Pump.baseAmount16
+        diaconnG8Pump.pumpProfiles!![diaconnG8Pump.activeProfile][16] = diaconnG8Pump.baseAmount17
+        diaconnG8Pump.pumpProfiles!![diaconnG8Pump.activeProfile][17] = diaconnG8Pump.baseAmount18
+        diaconnG8Pump.pumpProfiles!![diaconnG8Pump.activeProfile][18] = diaconnG8Pump.baseAmount19
+        diaconnG8Pump.pumpProfiles!![diaconnG8Pump.activeProfile][19] = diaconnG8Pump.baseAmount20
+        diaconnG8Pump.pumpProfiles!![diaconnG8Pump.activeProfile][20] = diaconnG8Pump.baseAmount21
+        diaconnG8Pump.pumpProfiles!![diaconnG8Pump.activeProfile][21] = diaconnG8Pump.baseAmount22
+        diaconnG8Pump.pumpProfiles!![diaconnG8Pump.activeProfile][22] = diaconnG8Pump.baseAmount23
+        diaconnG8Pump.pumpProfiles!![diaconnG8Pump.activeProfile][23] = diaconnG8Pump.baseAmount24
+
+        //incarnation no 처리
+        diaconnG8Pump.isPumpVersionGe2_63 = PumplogUtil.isPumpVersionGe(sp.getString(resourceHelper.gs(R.string.pumpversion), ""),2, 63)
+
+        aapsLogger.debug(LTag.PUMPCOMM, "result > " + diaconnG8Pump.result)
+        aapsLogger.debug(LTag.PUMPCOMM, "systemRemainInsulin > " + diaconnG8Pump.systemRemainInsulin)
+        aapsLogger.debug(LTag.PUMPCOMM, "systemRemainBattery > " + diaconnG8Pump.systemRemainBattery)
+        aapsLogger.debug(LTag.PUMPCOMM, "systemBasePattern > " + diaconnG8Pump.systemBasePattern)
+        aapsLogger.debug(LTag.PUMPCOMM, "systemTbStatus > " + diaconnG8Pump.systemTbStatus)
+        aapsLogger.debug(LTag.PUMPCOMM, "systemInjectionMealStatus > " + diaconnG8Pump.systemInjectionMealStatus)
+        aapsLogger.debug(LTag.PUMPCOMM, "systemInjectionSnackStatus > " + diaconnG8Pump.systemInjectionSnackStatus)
+        aapsLogger.debug(LTag.PUMPCOMM, "systemInjectionSquareStatue > " + diaconnG8Pump.systemInjectionSquareStatue)
+        aapsLogger.debug(LTag.PUMPCOMM, "systemInjectionDualStatus > " + diaconnG8Pump.systemInjectionDualStatus)
+        aapsLogger.debug(LTag.PUMPCOMM, "basePauseStatus > " + diaconnG8Pump.basePauseStatus)
+        aapsLogger.debug(LTag.PUMPCOMM, "year > " + diaconnG8Pump.year)
+        aapsLogger.debug(LTag.PUMPCOMM, "month > " + diaconnG8Pump.month)
+        aapsLogger.debug(LTag.PUMPCOMM, "day > " + diaconnG8Pump.day)
+        aapsLogger.debug(LTag.PUMPCOMM, "hour > " + diaconnG8Pump.hour)
+        aapsLogger.debug(LTag.PUMPCOMM, "minute > " + diaconnG8Pump.minute)
+        aapsLogger.debug(LTag.PUMPCOMM, "second > " + diaconnG8Pump.second)
+        aapsLogger.debug(LTag.PUMPCOMM, "country > " + diaconnG8Pump.country)
+        aapsLogger.debug(LTag.PUMPCOMM, "productType > " + diaconnG8Pump.productType)
+        aapsLogger.debug(LTag.PUMPCOMM, "makeYear > " + diaconnG8Pump.makeYear)
+        aapsLogger.debug(LTag.PUMPCOMM, "makeMonth > " + diaconnG8Pump.makeMonth)
+        aapsLogger.debug(LTag.PUMPCOMM, "makeDay > " + diaconnG8Pump.makeDay)
+        aapsLogger.debug(LTag.PUMPCOMM, "lotNo > " + diaconnG8Pump.lotNo)
+        aapsLogger.debug(LTag.PUMPCOMM, "serialNo > " + diaconnG8Pump.serialNo)
+        aapsLogger.debug(LTag.PUMPCOMM, "majorVersion > " + diaconnG8Pump.majorVersion)
+        aapsLogger.debug(LTag.PUMPCOMM, "minorVersion > " + diaconnG8Pump.minorVersion)
+        aapsLogger.debug(LTag.PUMPCOMM, "lastNum  > " + diaconnG8Pump.pumpLastLogNum)
+        aapsLogger.debug(LTag.PUMPCOMM, "wrappingCount > " + diaconnG8Pump.pumpWrappingCount)
+        aapsLogger.debug(LTag.PUMPCOMM, "speed > " + diaconnG8Pump.speed)
+        aapsLogger.debug(LTag.PUMPCOMM, "tbStatus > " + diaconnG8Pump.tbStatus)
+        aapsLogger.debug(LTag.PUMPCOMM, "tbTime> " + diaconnG8Pump.tbTime)
+        aapsLogger.debug(LTag.PUMPCOMM, "tbInjectRateRatio > " + diaconnG8Pump.tbInjectRateRatio)
+        aapsLogger.debug(LTag.PUMPCOMM, "tbElapsedTime > " + diaconnG8Pump.tbElapsedTime)
+        aapsLogger.debug(LTag.PUMPCOMM, "baseStatus > " + diaconnG8Pump.baseStatus)
+        aapsLogger.debug(LTag.PUMPCOMM, "baseHour > " + diaconnG8Pump.baseHour)
+        aapsLogger.debug(LTag.PUMPCOMM, "baseAmount > " + diaconnG8Pump.baseAmount)
+        aapsLogger.debug(LTag.PUMPCOMM, "baseInjAmount > " + diaconnG8Pump.baseInjAmount)
+        aapsLogger.debug(LTag.PUMPCOMM, "mealKind > " + diaconnG8Pump.mealKind)
+        aapsLogger.debug(LTag.PUMPCOMM, "mealStartTime > " + diaconnG8Pump.mealStartTime)
+        aapsLogger.debug(LTag.PUMPCOMM, "mealStatus > " + diaconnG8Pump.mealStatus)
+        aapsLogger.debug(LTag.PUMPCOMM, "mealAmount > " + diaconnG8Pump.mealAmount)
+        aapsLogger.debug(LTag.PUMPCOMM, "mealInjAmount > " + diaconnG8Pump.mealInjAmount)
+        aapsLogger.debug(LTag.PUMPCOMM, "mealSpeed > " + diaconnG8Pump.mealSpeed)
+        aapsLogger.debug(LTag.PUMPCOMM, "snackStatus > " + diaconnG8Pump.snackStatus)
+        aapsLogger.debug(LTag.PUMPCOMM, "snackAmount > " + diaconnG8Pump.snackAmount)
+        aapsLogger.debug(LTag.PUMPCOMM, "snackInjAmount > " + diaconnG8Pump.snackInjAmount)
+        aapsLogger.debug(LTag.PUMPCOMM, "snackSpeed > " + diaconnG8Pump.snackSpeed)
+        aapsLogger.debug(LTag.PUMPCOMM, "squareStatus > " + diaconnG8Pump.squareStatus)
+        aapsLogger.debug(LTag.PUMPCOMM, "squareTime > " + diaconnG8Pump.squareTime)
+        aapsLogger.debug(LTag.PUMPCOMM, "squareInjTime > " + diaconnG8Pump.squareInjTime)
+        aapsLogger.debug(LTag.PUMPCOMM, "squareAmount > " + diaconnG8Pump.squareAmount)
+        aapsLogger.debug(LTag.PUMPCOMM, "squareInjAmount > " + diaconnG8Pump.squareInjAmount)
+        aapsLogger.debug(LTag.PUMPCOMM, "dualStatus > " + diaconnG8Pump.dualStatus)
+        aapsLogger.debug(LTag.PUMPCOMM, "dualAmount > " + diaconnG8Pump.dualAmount)
+        aapsLogger.debug(LTag.PUMPCOMM, "dualInjAmount > " + diaconnG8Pump.dualInjAmount)
+        aapsLogger.debug(LTag.PUMPCOMM, "dualSquareTime > " + diaconnG8Pump.dualSquareTime)
+        aapsLogger.debug(LTag.PUMPCOMM, "dualInjSquareTime > " + diaconnG8Pump.dualInjSquareTime)
+        aapsLogger.debug(LTag.PUMPCOMM, "dualSquareAmount > " + diaconnG8Pump.dualSquareAmount)
+        aapsLogger.debug(LTag.PUMPCOMM, "dualInjSquareAmount> " + diaconnG8Pump.dualInjSquareAmount)
+        aapsLogger.debug(LTag.PUMPCOMM, "recentKind1  > " + diaconnG8Pump.recentKind1)
+        aapsLogger.debug(LTag.PUMPCOMM, "recentTime1  > " + diaconnG8Pump.recentTime1)
+        aapsLogger.debug(LTag.PUMPCOMM, "recentAmount1 > " + diaconnG8Pump.recentAmount1)
+        aapsLogger.debug(LTag.PUMPCOMM, "recentKind2  	> " + diaconnG8Pump.recentKind2)
+        aapsLogger.debug(LTag.PUMPCOMM, "recentTime2  	> " + diaconnG8Pump.recentTime2)
+        aapsLogger.debug(LTag.PUMPCOMM, "recentAmount2 > " + diaconnG8Pump.recentAmount2)
+        aapsLogger.debug(LTag.PUMPCOMM, "todayBaseAmount > " + diaconnG8Pump.todayBaseAmount)
+        aapsLogger.debug(LTag.PUMPCOMM, "todayMealAmount > " + diaconnG8Pump.todayMealAmount)
+        aapsLogger.debug(LTag.PUMPCOMM, "todaySnackAmount > " + diaconnG8Pump.todaySnackAmount)
+        aapsLogger.debug(LTag.PUMPCOMM, "morningHour  > " + diaconnG8Pump.morningHour)
+        aapsLogger.debug(LTag.PUMPCOMM, "morningAmount > " + diaconnG8Pump.morningAmount)
+        aapsLogger.debug(LTag.PUMPCOMM, "lunchHour  > " + diaconnG8Pump.lunchHour)
+        aapsLogger.debug(LTag.PUMPCOMM, "lunchAmount > " + diaconnG8Pump.lunchAmount)
+        aapsLogger.debug(LTag.PUMPCOMM, "dinnerHour  > " + diaconnG8Pump.dinnerHour)
+        aapsLogger.debug(LTag.PUMPCOMM, "dinnerAmount > " + diaconnG8Pump.dinnerAmount)
+        aapsLogger.debug(LTag.PUMPCOMM, "currentBasePattern > " + diaconnG8Pump.currentBasePattern)
+        aapsLogger.debug(LTag.PUMPCOMM, "currentBaseHour  > " + diaconnG8Pump.currentBaseHour)
+        aapsLogger.debug(LTag.PUMPCOMM, "currentBaseTbBeforeAmount > " + diaconnG8Pump.currentBaseTbBeforeAmount)
+        aapsLogger.debug(LTag.PUMPCOMM, "currentBaseTbAfterAmount > " + diaconnG8Pump.currentBaseTbAfterAmount)
+        aapsLogger.debug(LTag.PUMPCOMM, "baseAmount1  > " + diaconnG8Pump.baseAmount1)
+        aapsLogger.debug(LTag.PUMPCOMM, "baseAmount2  > " + diaconnG8Pump.baseAmount2)
+        aapsLogger.debug(LTag.PUMPCOMM, "baseAmount3  > " + diaconnG8Pump.baseAmount3)
+        aapsLogger.debug(LTag.PUMPCOMM, "baseAmount4  > " + diaconnG8Pump.baseAmount4)
+        aapsLogger.debug(LTag.PUMPCOMM, "baseAmount5  > " + diaconnG8Pump.baseAmount5)
+        aapsLogger.debug(LTag.PUMPCOMM, "baseAmount6  > " + diaconnG8Pump.baseAmount6)
+        aapsLogger.debug(LTag.PUMPCOMM, "baseAmount7  > " + diaconnG8Pump.baseAmount7)
+        aapsLogger.debug(LTag.PUMPCOMM, "baseAmount8  > " + diaconnG8Pump.baseAmount8)
+        aapsLogger.debug(LTag.PUMPCOMM, "baseAmount9  > " + diaconnG8Pump.baseAmount9)
+        aapsLogger.debug(LTag.PUMPCOMM, "baseAmount10 > " + diaconnG8Pump.baseAmount10)
+        aapsLogger.debug(LTag.PUMPCOMM, "baseAmount11 > " + diaconnG8Pump.baseAmount11)
+        aapsLogger.debug(LTag.PUMPCOMM, "baseAmount12 > " + diaconnG8Pump.baseAmount12)
+        aapsLogger.debug(LTag.PUMPCOMM, "baseAmount13 > " + diaconnG8Pump.baseAmount13)
+        aapsLogger.debug(LTag.PUMPCOMM, "baseAmount14 > " + diaconnG8Pump.baseAmount14)
+        aapsLogger.debug(LTag.PUMPCOMM, "baseAmount15 > " + diaconnG8Pump.baseAmount15)
+        aapsLogger.debug(LTag.PUMPCOMM, "baseAmount16 > " + diaconnG8Pump.baseAmount16)
+        aapsLogger.debug(LTag.PUMPCOMM, "baseAmount17 > " + diaconnG8Pump.baseAmount17)
+        aapsLogger.debug(LTag.PUMPCOMM, "baseAmount18 > " + diaconnG8Pump.baseAmount18)
+        aapsLogger.debug(LTag.PUMPCOMM, "baseAmount19 > " + diaconnG8Pump.baseAmount19)
+        aapsLogger.debug(LTag.PUMPCOMM, "baseAmount20 > " + diaconnG8Pump.baseAmount20)
+        aapsLogger.debug(LTag.PUMPCOMM, "baseAmount21 > " + diaconnG8Pump.baseAmount21)
+        aapsLogger.debug(LTag.PUMPCOMM, "baseAmount22 > " + diaconnG8Pump.baseAmount22)
+        aapsLogger.debug(LTag.PUMPCOMM, "baseAmount23 > " + diaconnG8Pump.baseAmount23)
+        aapsLogger.debug(LTag.PUMPCOMM, "baseAmount24 > " + diaconnG8Pump.baseAmount24)
+        aapsLogger.debug(LTag.PUMPCOMM, "maxBasalPerHours > " + diaconnG8Pump.maxBasalPerHours)
+        aapsLogger.debug(LTag.PUMPCOMM, "maxBasal > " + diaconnG8Pump.maxBasal)
+        aapsLogger.debug(LTag.PUMPCOMM, "maxBolus > " + diaconnG8Pump.maxBolus)
+        aapsLogger.debug(LTag.PUMPCOMM, "maxBolusePerDay > " + diaconnG8Pump.maxBolusePerDay)
+        aapsLogger.debug(LTag.PUMPCOMM, "beepAndAlarm > " + diaconnG8Pump.beepAndAlarm)
+        aapsLogger.debug(LTag.PUMPCOMM, "alarmIntesity > " + diaconnG8Pump.alarmIntesity)
+        aapsLogger.debug(LTag.PUMPCOMM, "lcdOnTimeSec > " + diaconnG8Pump.lcdOnTimeSec)
+        aapsLogger.debug(LTag.PUMPCOMM, "selectedLanguage > " + diaconnG8Pump.selectedLanguage)
+    }
+
+    override fun getFriendlyName(): String {
+        return "PUMP_BIG_APS_MAIN_INFO_INQUIRE_RESPONSE"
+    }
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BigLogInquirePacket.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BigLogInquirePacket.kt
new file mode 100644
index 0000000000..6a0bc9e4cb
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BigLogInquirePacket.kt
@@ -0,0 +1,35 @@
+package info.nightscout.androidaps.diaconn.packet
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.diaconn.DiaconnG8Pump
+import info.nightscout.androidaps.logging.LTag
+import javax.inject.Inject
+
+/**
+
+ * BigLogInquirePacket
+ */
+class BigLogInquirePacket(
+    injector: HasAndroidInjector,
+    private val start: Int,
+    private val end:Int,
+    private val delay:Int
+) : DiaconnG8Packet(injector ) {
+    @Inject lateinit var diaconnG8Pump: DiaconnG8Pump
+    init {
+        msgType = 0x72
+        aapsLogger.debug(LTag.PUMPCOMM, "BigLogInquirePacket init")
+    }
+
+    override fun encode(msgSeq:Int): ByteArray {
+        val buffer = prefixEncode(msgType, msgSeq, MSG_CON_END)
+        buffer.putShort(start.toShort())
+        buffer.putShort(end.toShort())
+        buffer.put(delay.toByte())
+        return suffixEncode(buffer)
+    }
+
+    override fun getFriendlyName(): String {
+        return "PUMP_BIG_LOG_INQUIRE"
+    }
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BigLogInquireResponsePacket.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BigLogInquireResponsePacket.kt
new file mode 100644
index 0000000000..e75008d66c
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BigLogInquireResponsePacket.kt
@@ -0,0 +1,767 @@
+package info.nightscout.androidaps.diaconn.packet
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.data.DetailedBolusInfo
+import info.nightscout.androidaps.diaconn.DiaconnG8Pump
+import info.nightscout.androidaps.diaconn.R
+import info.nightscout.androidaps.diaconn.common.RecordTypes
+import info.nightscout.androidaps.diaconn.database.DiaconnHistoryRecord
+import info.nightscout.androidaps.diaconn.database.DiaconnHistoryRecordDao
+import info.nightscout.androidaps.diaconn.pumplog.*
+import info.nightscout.androidaps.events.EventPumpStatusChanged
+import info.nightscout.androidaps.interfaces.ActivePlugin
+import info.nightscout.androidaps.interfaces.PumpDescription
+import info.nightscout.androidaps.interfaces.PumpSync
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.pump.common.bolusInfo.DetailedBolusInfoStorage
+import info.nightscout.androidaps.plugins.pump.common.bolusInfo.TemporaryBasalStorage
+import info.nightscout.androidaps.plugins.pump.common.defs.PumpType
+import info.nightscout.androidaps.utils.T
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import info.nightscout.androidaps.utils.sharedPreferences.SP
+import org.apache.commons.lang3.time.DateUtils
+import org.joda.time.DateTime
+import javax.inject.Inject
+
+/**
+ * BigLogInquireResponsePacket
+ */
+class BigLogInquireResponsePacket(
+    injector: HasAndroidInjector
+) : DiaconnG8Packet(injector) {
+
+    @Inject lateinit var rxBus: RxBusWrapper
+    @Inject lateinit var resourceHelper: ResourceHelper
+    @Inject lateinit var activePlugin: ActivePlugin
+    @Inject lateinit var diaconnG8Pump: DiaconnG8Pump
+    @Inject lateinit var detailedBolusInfoStorage: DetailedBolusInfoStorage
+    @Inject lateinit var temporaryBasalStorage: TemporaryBasalStorage
+    @Inject lateinit var sp: SP
+    @Inject lateinit var pumpSync: PumpSync
+    @Inject lateinit var diaconnHistoryRecordDao: DiaconnHistoryRecordDao
+    var result = 0// 조회결과
+    private var pumpDesc = PumpDescription(PumpType.DIACONN_G8)
+    init {
+        msgType = 0xb2.toByte()
+        aapsLogger.debug(LTag.PUMPCOMM, "BigLogInquireResponsePacket init")
+    }
+
+    override fun handleMessage(data: ByteArray?) {
+        val result = defect(data)
+        if (result != 0) {
+            aapsLogger.debug(LTag.PUMPCOMM, "BigLogInquireResponsePacket Got some Error")
+            failed = true
+            return
+        } else failed = false
+
+        val bufferData = prefixDecode(data) // 데이타 영역 15바이트 버퍼
+        val result2 =  getByteToInt(bufferData)  // 조회결과 1 byte
+        if(!isSuccInquireResponseResult(result2)) {
+            failed = true
+            return
+        }
+        val logLength = getByteToInt(bufferData) // 로그의 갯수. 1byte
+
+        // initalize
+        val dailyMaxvalInfo = mutableMapOf<String, MutableMap<String, Double>>()
+        dailyMaxvalInfo[""] = mutableMapOf()
+
+        // 15 byte를 로그갯수만큼 돌기.
+        for(i in 0 until logLength) {
+            val wrapingCount = getByteToInt(bufferData) // 1byte
+            val logNum =  getShortToInt(bufferData)  // 2byte
+            // log Data Parsing
+            val logdata = byteArrayOf(
+                PumplogUtil.getByte(bufferData),
+                PumplogUtil.getByte(bufferData),
+                PumplogUtil.getByte(bufferData),
+                PumplogUtil.getByte(bufferData),
+                PumplogUtil.getByte(bufferData),
+                PumplogUtil.getByte(bufferData),
+                PumplogUtil.getByte(bufferData),
+                PumplogUtil.getByte(bufferData),
+                PumplogUtil.getByte(bufferData),
+                PumplogUtil.getByte(bufferData),
+                PumplogUtil.getByte(bufferData),
+                PumplogUtil.getByte(bufferData)
+            )
+
+            diaconnG8Pump.apsWrappingCount = wrapingCount
+            diaconnG8Pump.apslastLogNum  = logNum
+            sp.putInt(resourceHelper.gs(R.string.apslastLogNum), logNum)
+            sp.putInt(resourceHelper.gs(R.string.apsWrappingCount), wrapingCount)
+
+            // process Log to DB
+            val logDataToHexString = toNarrowHex(logdata)
+            val pumplogKind: Byte = PumplogUtil.getKind(logDataToHexString)
+            var status: String
+            val diaconnG8HistoryRecord = DiaconnHistoryRecord(0)
+            when(pumplogKind) {
+
+                LOG_INJECT_MEAL_SUCCESS.LOG_KIND -> {
+                    val logItem = LOG_INJECT_MEAL_SUCCESS.parse(logDataToHexString)
+                    aapsLogger.debug(LTag.PUMPCOMM, "$logItem ")
+                    val logStartDate = DateUtils.parseDate(logItem.dttm, "yyyy-MM-dd HH:mm:ss")
+                    val logDateTime = logStartDate.time
+                    val detailedBolusInfo = detailedBolusInfoStorage.findDetailedBolusInfo(logDateTime, logItem.injectAmount / 100.0)
+                    val newRecord = pumpSync.syncBolusWithPumpId(
+                        timestamp = logDateTime,
+                        amount = logItem.injectAmount / 100.0,
+                        type = detailedBolusInfo?.bolusType,
+                        pumpId = logDateTime,
+                        pumpType = PumpType.DIACONN_G8,
+                        pumpSerial = diaconnG8Pump.serialNo.toString())
+                    aapsLogger.debug(LTag.PUMPCOMM, (if (newRecord) "**NEW** " else "") + "EVENT MEALBOLUS (" + pumplogKind + ") " + dateUtil.dateAndTimeString(logDateTime) + " (" + logDateTime + ")" + " Bolus: " + logItem.injectAmount / 100.0 + "U ")
+                    diaconnG8HistoryRecord.code = RecordTypes.RECORD_TYPE_BOLUS
+                    diaconnG8HistoryRecord.timestamp = logDateTime
+                    diaconnG8HistoryRecord.value = logItem.injectAmount / 100.0
+                    diaconnG8HistoryRecord.duration =  logItem.getInjectTime()
+                    diaconnG8HistoryRecord.bolusType = "M" // meal bolus
+                    diaconnG8HistoryRecord.stringValue = resourceHelper.gs(R.string.diaconn_g8_logmealsuccess)
+                    diaconnHistoryRecordDao.createOrUpdate(diaconnG8HistoryRecord)
+                    status = "MEALBOLUSSUCCESS" + dateUtil.timeString(logDateTime)
+                }
+
+                LOG_INJECT_MEAL_FAIL.LOG_KIND -> {
+                    val logItem = LOG_INJECT_MEAL_FAIL.parse(logDataToHexString)
+                    aapsLogger.debug(LTag.PUMPCOMM, "$logItem ")
+                    val logStartDate = DateUtils.parseDate(logItem.dttm, "yyyy-MM-dd HH:mm:ss")
+                    val logDateTime = logStartDate.time
+                    val detailedBolusInfo = detailedBolusInfoStorage.findDetailedBolusInfo(logDateTime, logItem.injectAmount / 100.0)
+                    val newRecord = pumpSync.syncBolusWithPumpId(
+                        timestamp = logDateTime,
+                        amount = logItem.injectAmount / 100.0,
+                        type = detailedBolusInfo?.bolusType,
+                        pumpId = logDateTime,
+                        pumpType = PumpType.DIACONN_G8,
+                        pumpSerial = diaconnG8Pump.serialNo.toString())
+                    aapsLogger.debug(LTag.PUMPCOMM, (if (newRecord) "**NEW** " else "") + "EVENT MEALBOLUS (" + pumplogKind + ") " + dateUtil.dateAndTimeString(logDateTime) + " (" + logDateTime + ")" + " Bolus: " + logItem.injectAmount / 100.0 + "U ")
+                    diaconnG8HistoryRecord.code = RecordTypes.RECORD_TYPE_BOLUS
+                    diaconnG8HistoryRecord.timestamp = logDateTime
+                    diaconnG8HistoryRecord.value = if ((logItem.injectAmount / 100.0) < 0) 0.0 else (logItem.injectAmount / 100.0)
+                    diaconnG8HistoryRecord.duration = logItem.getInjectTime()
+                    diaconnG8HistoryRecord.bolusType = "M" // Meal bolus
+                    diaconnG8HistoryRecord.stringValue = resourceHelper.gs(R.string.diaconn_g8_logmealfail)
+                    diaconnHistoryRecordDao.createOrUpdate(diaconnG8HistoryRecord)
+                    status = "MEALBOLUSFAIL " + dateUtil.timeString(logDateTime)
+                }
+
+                LOG_INJECT_NORMAL_SUCCESS.LOG_KIND -> {
+                    val logItem = LOG_INJECT_NORMAL_SUCCESS.parse(logDataToHexString)
+                    aapsLogger.debug(LTag.PUMPCOMM, "$logItem ")
+
+                    val logStartDate = DateUtils.parseDate(logItem.dttm, "yyyy-MM-dd HH:mm:ss")
+                    val logDateTime = logStartDate.time
+                    val detailedBolusInfo = detailedBolusInfoStorage.findDetailedBolusInfo(logDateTime, logItem.injectAmount / 100.0)
+                    val newRecord = pumpSync.syncBolusWithPumpId(
+                        timestamp = logDateTime,
+                        amount = logItem.injectAmount / 100.0,
+                        type = detailedBolusInfo?.bolusType,
+                        pumpId = logDateTime,
+                        pumpType = PumpType.DIACONN_G8,
+                        pumpSerial = diaconnG8Pump.serialNo.toString())
+                    aapsLogger.debug(LTag.PUMPCOMM, (if (newRecord) "**NEW** " else "") + "EVENT BOLUS (" + pumplogKind + ") " + dateUtil.dateAndTimeString(logDateTime) + " (" + logDateTime + ")" + " Bolus: " + logItem.injectAmount / 100.0 + "U ")
+                    diaconnG8HistoryRecord.code = RecordTypes.RECORD_TYPE_BOLUS
+                    diaconnG8HistoryRecord.timestamp = logDateTime
+                    diaconnG8HistoryRecord.value = logItem.injectAmount / 100.0
+                    diaconnG8HistoryRecord.duration = logItem.getInjectTime()
+                    diaconnG8HistoryRecord.bolusType = "B" // bolus
+                    diaconnG8HistoryRecord.stringValue = resourceHelper.gs(R.string.diaconn_g8_logsuccess)
+                    diaconnHistoryRecordDao.createOrUpdate(diaconnG8HistoryRecord)
+                    status = "BOLUSSUCCESS" + dateUtil.timeString(logDateTime)
+                }
+
+                LOG_INJECT_NORMAL_FAIL.LOG_KIND -> {
+                    val logItem = LOG_INJECT_NORMAL_FAIL.parse(logDataToHexString)
+                    aapsLogger.debug(LTag.PUMPCOMM, "$logItem ")
+                    val logStartDate = DateUtils.parseDate(logItem.dttm, "yyyy-MM-dd HH:mm:ss")
+                    val logDateTime = logStartDate.time
+
+                    // APS DB process
+                    val detailedBolusInfo = detailedBolusInfoStorage.findDetailedBolusInfo(logDateTime, logItem.injectAmount / 100.0)
+                    val newRecord = pumpSync.syncBolusWithPumpId(
+                        timestamp = logDateTime,
+                        amount = logItem.injectAmount / 100.0,
+                        type = detailedBolusInfo?.bolusType,
+                        pumpId = logDateTime,
+                        pumpType = PumpType.DIACONN_G8,
+                        pumpSerial = diaconnG8Pump.serialNo.toString())
+                    aapsLogger.debug(LTag.PUMPCOMM, (if (newRecord) "**NEW** " else "") + "EVENT BOLUS (" + pumplogKind + ") " + dateUtil.dateAndTimeString(logDateTime) + " (" + logDateTime + ")" + " Bolus: " + logItem.injectAmount / 100.0 + "U ")
+                    // Diaconn History Process
+                    diaconnG8HistoryRecord.code = RecordTypes.RECORD_TYPE_BOLUS
+                    diaconnG8HistoryRecord.timestamp = logDateTime
+                    diaconnG8HistoryRecord.value = if ((logItem.injectAmount / 100.0) < 0) 0.0 else (logItem.injectAmount / 100.0)
+                    diaconnG8HistoryRecord.duration = logItem.getInjectTime()
+                    diaconnG8HistoryRecord.bolusType = "B" // bolus
+                    diaconnG8HistoryRecord.stringValue = getReasonName(pumplogKind, logItem.reason)
+                    diaconnHistoryRecordDao.createOrUpdate(diaconnG8HistoryRecord)
+                    status = "BOLUSFAIL " + dateUtil.timeString(logDateTime)
+                }
+
+                LOG_SET_SQUARE_INJECTION.LOG_KIND -> {
+                    val logItem = LOG_SET_SQUARE_INJECTION.parse(logDataToHexString)
+                    aapsLogger.debug(LTag.PUMPCOMM, "$logItem ")
+                    val logStartDate = DateUtils.parseDate(logItem.dttm, "yyyy-MM-dd HH:mm:ss")
+                    val logDateTime = logStartDate.time
+                    val newRecord = pumpSync.syncExtendedBolusWithPumpId(
+                        timestamp = logDateTime,
+                        amount = logItem.setAmount / 100.0,
+                        duration = T.mins((logItem.getInjectTime() * 10).toLong()).msecs(),
+                        isEmulatingTB = false,
+                        pumpId = logDateTime,
+                        pumpType = PumpType.DIACONN_G8,
+                        pumpSerial = diaconnG8Pump.serialNo.toString())
+                    aapsLogger.debug(LTag.PUMPCOMM, (if (newRecord) "**NEW** " else "") + "EVENT EXTENDEDSTART (" + pumplogKind + ") " + dateUtil.dateAndTimeString(logDateTime) + " (" + logDateTime + ")" + " Amount: " + logItem.setAmount / 100.0 + "U Duration: " + logItem.getInjectTime() * 10 + "min")
+                    diaconnG8HistoryRecord.code = RecordTypes.RECORD_TYPE_BOLUS
+                    diaconnG8HistoryRecord.timestamp = logDateTime
+                    diaconnG8HistoryRecord.value = logItem.setAmount / 100.0
+                    diaconnG8HistoryRecord.duration = logItem.getInjectTime()
+                    diaconnG8HistoryRecord.stringValue = resourceHelper.gs(R.string.diaconn_g8_logsquarestart)
+                    diaconnG8HistoryRecord.bolusType = "E" // Extended
+                    diaconnHistoryRecordDao.createOrUpdate(diaconnG8HistoryRecord)
+                    status = "EXTENDEDBOLUSSTART " + dateUtil.timeString(logDateTime)
+                }
+
+                LOG_INJECT_SQUARE_SUCCESS.LOG_KIND -> {
+                    val logItem = LOG_INJECT_SQUARE_SUCCESS.parse(logDataToHexString)
+                    aapsLogger.debug(LTag.PUMPCOMM, "$logItem ")
+                    val logStartDate = DateUtils.parseDate(logItem.dttm, "yyyy-MM-dd HH:mm:ss")
+                    val logDateTime = logStartDate.time
+                    diaconnG8HistoryRecord.code = RecordTypes.RECORD_TYPE_BOLUS
+                    diaconnG8HistoryRecord.timestamp = logDateTime
+                    diaconnG8HistoryRecord.duration = logItem.getInjectTime()
+                    diaconnG8HistoryRecord.stringValue = resourceHelper.gs(R.string.diaconn_g8_logsquaresuccess)
+                    diaconnG8HistoryRecord.bolusType = "E" // Extended
+                    diaconnHistoryRecordDao.createOrUpdate(diaconnG8HistoryRecord)
+                    status = "EXTENDEDBOLUSEND " + dateUtil.timeString(logDateTime)
+                }
+
+                LOG_INJECT_SQUARE_FAIL.LOG_KIND -> {
+                    val logItem = LOG_INJECT_SQUARE_FAIL.parse(logDataToHexString)
+                    aapsLogger.debug(LTag.PUMPCOMM, "$logItem ")
+                    val logStartDate = DateUtils.parseDate(logItem.dttm, "yyyy-MM-dd HH:mm:ss")
+                    val logDateTime = logStartDate.time
+                    val newRecord = pumpSync.syncStopExtendedBolusWithPumpId(
+                        timestamp = logDateTime,
+                        endPumpId = logDateTime,
+                        pumpType = PumpType.DIACONN_G8,
+                        pumpSerial = diaconnG8Pump.serialNo.toString())
+                    aapsLogger.debug(LTag.PUMPCOMM, (if (newRecord) "**NEW** " else "") + "EVENT EXTENDEDSTOP (" + pumplogKind + ") " + dateUtil.dateAndTimeString(logDateTime) + " (" + logDateTime + ")" + " Delivered: " + logItem.injectAmount / 100.0 + "U RealDuration: " + logItem.getInjectTime() + "min")
+                    diaconnG8HistoryRecord.code = RecordTypes.RECORD_TYPE_BOLUS
+                    diaconnG8HistoryRecord.timestamp = logDateTime
+                    diaconnG8HistoryRecord.value = logItem.injectAmount / 100.0
+                    diaconnG8HistoryRecord.duration = logItem.getInjectTime()
+                    diaconnG8HistoryRecord.stringValue = getReasonName(pumplogKind, logItem.reason)
+                    diaconnG8HistoryRecord.bolusType = "E"
+                    diaconnHistoryRecordDao.createOrUpdate(diaconnG8HistoryRecord)
+                    status = "EXTENDEDBOLUSFAIL " + dateUtil.timeString(logDateTime)
+                }
+
+                LOG_SET_DUAL_INJECTION.LOG_KIND -> {
+                    val logItem = LOG_SET_DUAL_INJECTION.parse(logDataToHexString)
+                    aapsLogger.debug(LTag.PUMPCOMM, "$logItem ")
+                    val logStartDate = DateUtils.parseDate(logItem.dttm, "yyyy-MM-dd HH:mm:ss")
+                    val logDateTime = logStartDate.time
+
+                    // dual square 처리.
+                    val newRecord = pumpSync.syncExtendedBolusWithPumpId(
+                        timestamp = logDateTime,
+                        amount = logItem.setSquareAmount / 100.0,
+                        duration = T.mins((logItem.getInjectTime() * 10).toLong()).msecs(),
+                        isEmulatingTB = false,
+                        pumpId = logDateTime,
+                        pumpType = PumpType.DIACONN_G8,
+                        pumpSerial = diaconnG8Pump.serialNo.toString())
+                    aapsLogger.debug(LTag.PUMPCOMM, (if (newRecord) "**NEW** " else "") + "EVENT EXTENDEDSTART (" + pumplogKind + ") " + dateUtil.dateAndTimeString(logDateTime) + " (" + logDateTime + ")" + " Amount: " + logItem.setSquareAmount / 100.0 + "U Duration: " + logItem.getInjectTime() * 10 + "min")
+                    diaconnG8HistoryRecord.code = RecordTypes.RECORD_TYPE_BOLUS
+                    diaconnG8HistoryRecord.timestamp = logDateTime
+                    diaconnG8HistoryRecord.value = logItem.setSquareAmount / 100.0
+                    diaconnG8HistoryRecord.duration = logItem.getInjectTime() * 10 // (1~30) 1:10min 30:300min
+                    diaconnG8HistoryRecord.stringValue = resourceHelper.gs(R.string.diaconn_g8_logdualsquarestart)
+                    diaconnG8HistoryRecord.bolusType = "D" // Extended
+                    diaconnHistoryRecordDao.createOrUpdate(diaconnG8HistoryRecord)
+
+                    status = "DUALEXTENTEDSTART " + dateUtil.timeString(logDateTime)
+                }
+
+                LOG_INJECTION_DUAL_NORMAL.LOG_KIND -> {
+                    val logItem = LOG_INJECTION_DUAL_NORMAL.parse(logDataToHexString)
+                    aapsLogger.debug(LTag.PUMPCOMM, "$logItem ")
+                    val logStartDate = DateUtils.parseDate(logItem.dttm, "yyyy-MM-dd HH:mm:ss")
+                    val logDateTime = logStartDate.time
+                    val detailedBolusInfo = detailedBolusInfoStorage.findDetailedBolusInfo(logDateTime, logItem.injectAmount / 100.0)
+                    val newRecord = pumpSync.syncBolusWithPumpId(
+                        timestamp = logDateTime,
+                        amount = logItem.injectAmount / 100.0,
+                        type = detailedBolusInfo?.bolusType,
+                        pumpId = logDateTime,
+                        pumpType = PumpType.DIACONN_G8,
+                        pumpSerial = diaconnG8Pump.serialNo.toString())
+                    aapsLogger.debug(LTag.PUMPCOMM, (if (newRecord) "**NEW** " else "") + "EVENT DUALBOLUS (" + pumplogKind + ") " + dateUtil.dateAndTimeString(logDateTime) + " (" + logDateTime + ")" + " Bolus: " + logItem.injectAmount / 100.0 + "U Duration: " + logItem.getInjectTime() + "min")
+
+                    diaconnG8Pump.lastBolusAmount = logItem.injectAmount / 100.0
+                    diaconnG8Pump.lastBolusTime = logDateTime
+
+                    //Diaconn History
+                    diaconnG8HistoryRecord.code = RecordTypes.RECORD_TYPE_BOLUS
+                    diaconnG8HistoryRecord.timestamp = logDateTime
+                    diaconnG8HistoryRecord.value = logItem.injectAmount / 100.0
+                    diaconnG8HistoryRecord.duration = logItem.getInjectTime()
+                    diaconnG8HistoryRecord.bolusType = "D" // bolus
+                    diaconnG8HistoryRecord.stringValue = resourceHelper.gs(R.string.diaconn_g8_logdualnormalsuccess)
+                    diaconnHistoryRecordDao.createOrUpdate(diaconnG8HistoryRecord)
+                    status = "DUALBOLUS" + dateUtil.timeString(logDateTime)
+                }
+
+                LOG_INJECT_DUAL_SUCCESS.LOG_KIND -> {
+                    val logItem = LOG_INJECT_DUAL_SUCCESS.parse(logDataToHexString)
+                    aapsLogger.debug(LTag.PUMPCOMM, "$logItem ")
+                    val logStartDate = DateUtils.parseDate(logItem.dttm, "yyyy-MM-dd HH:mm:ss")
+                    val logDateTime = logStartDate.time
+
+                    diaconnG8HistoryRecord.code = RecordTypes.RECORD_TYPE_BOLUS
+                    diaconnG8HistoryRecord.timestamp = logDateTime
+                    diaconnG8HistoryRecord.value = logItem.injectSquareAmount / 100.0
+                    diaconnG8HistoryRecord.duration = logItem.getInjectTime()
+                    diaconnG8HistoryRecord.bolusType = "D"
+                    diaconnG8HistoryRecord.stringValue = resourceHelper.gs(R.string.diaconn_g8_logdualsquaresuccess)
+                    diaconnHistoryRecordDao.createOrUpdate(diaconnG8HistoryRecord)
+                    status = "DUALBOLUS SQUARESUCCESS " + dateUtil.timeString(logDateTime)
+                }
+
+                LOG_INJECT_DUAL_FAIL.LOG_KIND -> {
+                    val logItem = LOG_INJECT_DUAL_FAIL.parse(logDataToHexString)
+                    aapsLogger.debug(LTag.PUMPCOMM, "$logItem ")
+                    val logStartDate = DateUtils.parseDate(logItem.dttm, "yyyy-MM-dd HH:mm:ss")
+                    val logDateTime = logStartDate.time
+                    val newRecord = pumpSync.syncStopExtendedBolusWithPumpId(
+                        timestamp = logDateTime,
+                        endPumpId = logDateTime,
+                        pumpType = PumpType.DIACONN_G8,
+                        pumpSerial = diaconnG8Pump.serialNo.toString())
+                    aapsLogger.debug(LTag.PUMPCOMM, (if (newRecord) "**NEW** " else "") + "EVENT EXTENDEDSTOP (" + pumplogKind + ") " + dateUtil.dateAndTimeString(logDateTime) + " (" + logDateTime + ")" + " Delivered: " + logItem.injectSquareAmount / 100.0 + "U RealDuration: " + logItem.getInjectTime() + "min")
+
+                    diaconnG8HistoryRecord.code = RecordTypes.RECORD_TYPE_BOLUS
+                    diaconnG8HistoryRecord.timestamp = logDateTime
+                    diaconnG8HistoryRecord.value = logItem.injectNormAmount / 100.0 + logItem.injectSquareAmount / 100.0
+                    diaconnG8HistoryRecord.duration = logItem.getInjectTime()
+                    diaconnG8HistoryRecord.bolusType = "D"
+                    diaconnG8HistoryRecord.stringValue = getReasonName(pumplogKind, logItem.reason)
+                    diaconnHistoryRecordDao.createOrUpdate(diaconnG8HistoryRecord)
+                    status = "DUALBOLUS FAIL " + dateUtil.timeString(logDateTime)
+                }
+
+                LOG_INJECTION_1HOUR_BASAL.LOG_KIND -> {
+                    val logItem = LOG_INJECTION_1HOUR_BASAL.parse(logDataToHexString)
+                    aapsLogger.debug(LTag.PUMPCOMM, "$logItem ")
+                    val logStartDate = DateUtils.parseDate(logItem.dttm, "yyyy-MM-dd HH:mm:ss")
+                    val logDateTime = logStartDate.time
+                    diaconnG8HistoryRecord.code = RecordTypes.RECORD_TYPE_BASALHOUR
+                    diaconnG8HistoryRecord.timestamp = logDateTime
+                    diaconnG8HistoryRecord.value = logItem.beforeAmount / 100.0
+                    diaconnG8HistoryRecord.stringValue = "TB before: ${logItem.beforeAmount / 100.0} / TB after: ${logItem.afterAmount / 100.0}"
+                    diaconnHistoryRecordDao.createOrUpdate(diaconnG8HistoryRecord)
+                    status = "1HOUR BASAL " + dateUtil.dateAndTimeString(logDateTime)
+                }
+
+                LOG_SUSPEND_V2.LOG_KIND -> {
+                    val logItem = LOG_SUSPEND_V2.parse(logDataToHexString)
+                    aapsLogger.debug(LTag.PUMPCOMM, "$logItem ")
+                    val logStartDate = DateUtils.parseDate(logItem.dttm, "yyyy-MM-dd HH:mm:ss")
+                    val logDateTime = logStartDate.time
+                    diaconnG8HistoryRecord.code = RecordTypes.RECORD_TYPE_SUSPEND
+                    diaconnG8HistoryRecord.timestamp = logDateTime
+                    diaconnG8HistoryRecord.stringValue = resourceHelper.gs(R.string.diaconn_g8_lgosuspend, logItem.getBasalPattern())
+                    diaconnHistoryRecordDao.createOrUpdate(diaconnG8HistoryRecord)
+                    status = "SUSPEND " + dateUtil.timeString(logDateTime)
+                }
+
+                LOG_SUSPEND_RELEASE_V2.LOG_KIND -> {
+                    val logItem = LOG_SUSPEND_RELEASE_V2.parse(logDataToHexString)
+                    aapsLogger.debug(LTag.PUMPCOMM, "$logItem ")
+                    val logStartDate = DateUtils.parseDate(logItem.dttm, "yyyy-MM-dd HH:mm:ss")
+                    val logDateTime = logStartDate.time
+                    diaconnG8HistoryRecord.code = RecordTypes.RECORD_TYPE_SUSPEND
+                    diaconnG8HistoryRecord.timestamp = logDateTime
+                    diaconnG8HistoryRecord.stringValue = resourceHelper.gs(R.string.diaconn_g8_lgorelease, logItem.getBasalPattern())
+                    diaconnHistoryRecordDao.createOrUpdate(diaconnG8HistoryRecord)
+                    status = "SUSPENDRELEASE " + dateUtil.timeString(logDateTime)
+                }
+
+                LOG_CHANGE_INJECTOR_SUCCESS.LOG_KIND -> {
+                    val logItem = LOG_CHANGE_INJECTOR_SUCCESS.parse(logDataToHexString)
+                    aapsLogger.debug(LTag.PUMPCOMM, "$logItem ")
+                    val logStartDate = DateUtils.parseDate(logItem.dttm, "yyyy-MM-dd HH:mm:ss")
+                    val logDateTime = logStartDate.time
+                    if (sp.getBoolean(R.string.key_diaconn_g8_loginsulinchange, true)) {
+                        val newRecord = pumpSync.insertTherapyEventIfNewWithTimestamp(
+                            timestamp = logDateTime,
+                            type = DetailedBolusInfo.EventType.INSULIN_CHANGE,
+                            pumpId = logDateTime,
+                            pumpType = PumpType.DIACONN_G8,
+                            pumpSerial = diaconnG8Pump.serialNo.toString()
+                        )
+                        aapsLogger.debug(LTag.PUMPCOMM, (if (newRecord) "**NEW** " else "") + "EVENT INSULINCHANGE(" + pumplogKind + ") " + dateUtil.dateAndTimeString(logDateTime) + " (" + logDateTime + ")" + " Amount: " + logItem.remainAmount / 100.0 + "U")
+                    }
+                    diaconnG8HistoryRecord.code = RecordTypes.RECORD_TYPE_REFILL
+                    diaconnG8HistoryRecord.timestamp = logDateTime
+                    diaconnG8HistoryRecord.value = logItem.remainAmount / 100.0
+                    diaconnG8HistoryRecord.stringValue = resourceHelper.gs(R.string.diaconn_g8_loginjectorprime, logItem.primeAmount / 100.0)
+                    diaconnHistoryRecordDao.createOrUpdate(diaconnG8HistoryRecord)
+                    status = "INSULINCHANGE " + dateUtil.timeString(logDateTime)
+                }
+
+                LOG_CHANGE_TUBE_SUCCESS.LOG_KIND -> {
+                    val logItem = LOG_CHANGE_TUBE_SUCCESS.parse(logDataToHexString)
+                    aapsLogger.debug(LTag.PUMPCOMM, "$logItem ")
+                    val logStartDate = DateUtils.parseDate(logItem.dttm, "yyyy-MM-dd HH:mm:ss")
+                    val logDateTime = logStartDate.time
+                    if (sp.getBoolean(R.string.key_diaconn_g8_logtubechange, true)) {
+                        val newRecord = pumpSync.insertTherapyEventIfNewWithTimestamp(
+                            timestamp = logDateTime,
+                            type = DetailedBolusInfo.EventType.NOTE,
+                            note = resourceHelper.gs(R.string.diaconn_g8_logtubeprime, logItem.primeAmount / 100.0),
+                            pumpId = logDateTime,
+                            pumpType = PumpType.DIACONN_G8,
+                            pumpSerial = diaconnG8Pump.serialNo.toString()
+                        )
+                        aapsLogger.debug(LTag.PUMPCOMM, (if (newRecord) "**NEW** " else "") + "EVENT TUBECHANGE(" + pumplogKind + ") " + dateUtil.dateAndTimeString(logDateTime) + " (" + logDateTime + ")" + " Amount: " + logItem.primeAmount / 100.0 + "U")
+                    }
+
+
+                    diaconnG8HistoryRecord.code = RecordTypes.RECORD_TYPE_REFILL
+                    diaconnG8HistoryRecord.timestamp = logDateTime
+                    diaconnG8HistoryRecord.value = logItem.remainAmount / 100.0
+                    diaconnG8HistoryRecord.stringValue = resourceHelper.gs(R.string.diaconn_g8_logtubeprime, logItem.primeAmount / 100.0)
+                    diaconnHistoryRecordDao.createOrUpdate(diaconnG8HistoryRecord)
+                    status = "TUBECHANGE " + dateUtil.timeString(logDateTime)
+                }
+
+                LOG_INJECTION_1DAY.LOG_KIND -> { // Daily Bolus Log
+                    val logItem = LOG_INJECTION_1DAY.parse(logDataToHexString)
+                    aapsLogger.debug(LTag.PUMPCOMM, "$logItem ")
+                    val logStartDate = DateUtils.parseDate(logItem.dttm, "yyyy-MM-dd HH:mm:ss")
+                    val logDateTime = logStartDate.time
+
+                    diaconnG8HistoryRecord.code = RecordTypes.RECORD_TYPE_DAILY
+                    diaconnG8HistoryRecord.timestamp = DateTime(logDateTime).withTimeAtStartOfDay().millis
+                    diaconnG8HistoryRecord.dailyBolus = logItem.extAmount / 100.0 + logItem.mealAmount / 100.0
+
+                    val recordDateStr = "" + diaconnG8HistoryRecord.timestamp
+                    var recordMap: MutableMap<String, Double> = mutableMapOf("dummy" to 0.0)
+
+                    if (dailyMaxvalInfo.containsKey(recordDateStr)) {
+                        recordMap = dailyMaxvalInfo[recordDateStr]!!
+                    } else {
+                        recordMap["bolus"] = 0.0
+                        recordMap["basal"] = 0.0
+                        dailyMaxvalInfo[recordDateStr] = recordMap
+                    }
+
+                    if (diaconnG8HistoryRecord.dailyBolus > recordMap["bolus"]!!) {
+                        recordMap["bolus"] = diaconnG8HistoryRecord.dailyBolus
+                    } else {
+                        diaconnG8HistoryRecord.dailyBolus = recordMap["bolus"]!!
+                    }
+
+                    if (recordMap["basal"]!! > 0.0) {
+                        diaconnG8HistoryRecord.dailyBasal = recordMap["basal"]!!
+                    }
+
+                    diaconnHistoryRecordDao.createOrUpdate(diaconnG8HistoryRecord)
+
+                    //If it is a TDD, store it for stats also.
+                    pumpSync.createOrUpdateTotalDailyDose(
+                        timestamp = diaconnG8HistoryRecord.timestamp,
+                        bolusAmount = diaconnG8HistoryRecord.dailyBolus,
+                        basalAmount = diaconnG8HistoryRecord.dailyBasal,
+                        totalAmount = 0.0,
+                        pumpId = null,
+                        pumpType = PumpType.DIACONN_G8,
+                        diaconnG8Pump.serialNo.toString()
+                    )
+
+                    status = "DAILYBOLUS " + dateUtil.timeString(logDateTime)
+                }
+
+                LOG_INJECTION_1DAY_BASAL.LOG_KIND -> { // Daily Basal Log
+                    val logItem = LOG_INJECTION_1DAY_BASAL.parse(logDataToHexString)
+                    aapsLogger.debug(LTag.PUMPCOMM, "$logItem ")
+                    val logStartDate = DateUtils.parseDate(logItem.dttm, "yyyy-MM-dd HH:mm:ss")
+                    val logDateTime = logStartDate.time
+
+                    diaconnG8HistoryRecord.code = RecordTypes.RECORD_TYPE_DAILY
+                    diaconnG8HistoryRecord.timestamp = DateTime(logDateTime).withTimeAtStartOfDay().millis
+                    diaconnG8HistoryRecord.dailyBasal = logItem.amount / 100.0
+
+                    val recordDateStr = "" + diaconnG8HistoryRecord.timestamp
+                    var recordMap: MutableMap<String, Double> = mutableMapOf("dummy" to 0.0)
+
+                    if (dailyMaxvalInfo.containsKey(recordDateStr)) {
+                        recordMap = dailyMaxvalInfo[recordDateStr]!!
+                    } else {
+                        recordMap["bolus"] = 0.0
+                        recordMap["basal"] = 0.0
+                        dailyMaxvalInfo[recordDateStr] = recordMap
+                    }
+
+                    if (diaconnG8HistoryRecord.dailyBasal > recordMap["basal"]!!) {
+                        recordMap["basal"] = diaconnG8HistoryRecord.dailyBasal
+                    } else {
+                        diaconnG8HistoryRecord.dailyBasal = recordMap["basal"]!!
+                    }
+
+                    if (recordMap["bolus"]!! > 0.0) {
+                        diaconnG8HistoryRecord.dailyBolus = recordMap["bolus"]!!
+                    }
+
+                    diaconnHistoryRecordDao.createOrUpdate(diaconnG8HistoryRecord)
+
+                    //If it is a TDD, store it for stats also.
+                    // pumpSync.createOrUpdateTotalDailyDose(
+                    //     timestamp = diaconnG8HistoryRecord.timestamp,
+                    //     bolusAmount = diaconnG8HistoryRecord.dailyBolus,
+                    //     basalAmount = diaconnG8HistoryRecord.dailyBasal,
+                    //     totalAmount = 0.0,
+                    //     pumpId = null,
+                    //     pumpType = PumpType.DIACONN_G8,
+                    //     diaconnG8Pump.serialNo.toString()
+                    // )
+
+
+                    status = "DAILYBASAL " + dateUtil.timeString(logDateTime)
+                }
+
+                LOG_CHANGE_NEEDLE_SUCCESS.LOG_KIND -> {
+                    val logItem = LOG_CHANGE_NEEDLE_SUCCESS.parse(logDataToHexString)
+                    aapsLogger.debug(LTag.PUMPCOMM, "$logItem ")
+                    val logStartDate = DateUtils.parseDate(logItem.dttm, "yyyy-MM-dd HH:mm:ss")
+                    val logDateTime = logStartDate.time
+                    if (sp.getBoolean(R.string.key_diaconn_g8_logneedlechange, true)) {
+                        val newRecord = pumpSync.insertTherapyEventIfNewWithTimestamp(
+                            timestamp = logDateTime,
+                            type = DetailedBolusInfo.EventType.CANNULA_CHANGE,
+                            pumpId = logDateTime,
+                            pumpType = PumpType.DIACONN_G8,
+                            pumpSerial = diaconnG8Pump.serialNo.toString()
+                        )
+                        aapsLogger.debug(LTag.PUMPCOMM,  (if (newRecord) "**NEW** " else "") + "EVENT NEEDLECHANGE(" + pumplogKind + ") " + dateUtil.dateAndTimeString(logDateTime) + " (" + logDateTime + ")" + " Amount: " + logItem.remainAmount / 100.0 + "U")
+                    }
+
+                    diaconnG8HistoryRecord.code = RecordTypes.RECORD_TYPE_REFILL
+                    diaconnG8HistoryRecord.timestamp = logDateTime
+                    diaconnG8HistoryRecord.value = logItem.remainAmount / 100.0
+                    diaconnG8HistoryRecord.stringValue = resourceHelper.gs(R.string.diaconn_g8_logneedleprime, logItem.primeAmount / 100.0)
+                    diaconnHistoryRecordDao.createOrUpdate(diaconnG8HistoryRecord)
+                    status = "NEEDLECHANGE " + dateUtil.timeString(logDateTime)
+                }
+
+                LOG_TB_START_V3.LOG_KIND -> {
+                    val logItem = LOG_TB_START_V3.parse(logDataToHexString)
+                    aapsLogger.debug(LTag.PUMPCOMM, "$logItem ")
+
+                    val logStartDate = DateUtils.parseDate(logItem.dttm, "yyyy-MM-dd HH:mm:ss")
+                    val logDateTime = logStartDate.time
+                    var absoluteRate = 0.0
+                    if (logItem.getTbInjectRateRatio() >= 50000) {
+                        val tempBasalPercent = logItem.getTbInjectRateRatio() - 50000
+                        absoluteRate = pumpDesc.pumpType.determineCorrectBasalSize(diaconnG8Pump.baseAmount * (tempBasalPercent / 100.0))
+                    }
+
+                    if (logItem.getTbInjectRateRatio() in 1000..1600) {
+                        absoluteRate = (logItem.getTbInjectRateRatio() - 1000) / 100.0
+                    }
+
+                    val temporaryBasalInfo = temporaryBasalStorage.findTemporaryBasal(logDateTime, absoluteRate)
+                    val newRecord = pumpSync.syncTemporaryBasalWithPumpId(
+                        timestamp = logDateTime,
+                        rate = absoluteRate,
+                        duration = T.mins((logItem.tbTime * 15).toLong()).msecs(),
+                        isAbsolute = true,
+                        type = temporaryBasalInfo?.type,
+                        pumpId = logDateTime,
+                        pumpType = PumpType.DIACONN_G8,
+                        pumpSerial = diaconnG8Pump.serialNo.toString())
+                   aapsLogger.debug(LTag.PUMPCOMM, (if (newRecord) "**NEW** " else "") + "EVENT TEMPSTART (" + pumplogKind + ") " + dateUtil.dateAndTimeString(logDateTime) + " (" + logDateTime + ")" + " Ratio: " + absoluteRate + "U Duration: " + logItem.tbTime * 15 + "min")
+
+                    diaconnG8HistoryRecord.code = RecordTypes.RECORD_TYPE_TB
+                    diaconnG8HistoryRecord.timestamp = logDateTime
+                    diaconnG8HistoryRecord.duration = logItem.tbTime * 15
+                    diaconnG8HistoryRecord.value = absoluteRate
+                    diaconnG8HistoryRecord.stringValue =  resourceHelper.gs(R.string.diaconn_g8_logtempstart)
+                    diaconnHistoryRecordDao.createOrUpdate(diaconnG8HistoryRecord)
+                    status = "TEMPSTART " + dateUtil.timeString(logDateTime)
+                }
+
+                LOG_TB_STOP_V3.LOG_KIND -> {
+                    val logItem = LOG_TB_STOP_V3.parse(logDataToHexString)
+                    aapsLogger.debug(LTag.PUMPCOMM, "$logItem ")
+                    val logStartDate = DateUtils.parseDate(logItem.dttm, "yyyy-MM-dd HH:mm:ss")
+                    val logDateTime = logStartDate.time
+                    var absoluteRate = 0.0
+                    if (logItem.getTbInjectRateRatio() >= 50000) {
+                        val tempBasalPercent = logItem.getTbInjectRateRatio() - 50000
+                        absoluteRate = diaconnG8Pump.baseAmount * (tempBasalPercent / 100.0)
+                    }
+                    if (logItem.getTbInjectRateRatio() in 1000..1600) {
+                        absoluteRate = (logItem.getTbInjectRateRatio() - 1000) / 100.0
+                    }
+
+                    val newRecord = pumpSync.syncStopTemporaryBasalWithPumpId(
+                        timestamp = logDateTime,
+                        endPumpId = dateUtil.now(),
+                        pumpType = PumpType.DIACONN_G8,
+                        pumpSerial = diaconnG8Pump.serialNo.toString())
+                    aapsLogger.debug(LTag.PUMPCOMM, (if (newRecord) "**NEW** " else "") + "EVENT TEMPSTOP (" + pumplogKind + ") " + dateUtil.dateAndTimeString(logDateTime) + " (" + logDateTime + ")")
+
+
+                    diaconnG8HistoryRecord.code = RecordTypes.RECORD_TYPE_TB
+                    diaconnG8HistoryRecord.timestamp = logDateTime
+                    diaconnG8HistoryRecord.value = absoluteRate
+                    diaconnG8HistoryRecord.stringValue = getReasonName(pumplogKind, logItem.reason)
+                    diaconnHistoryRecordDao.createOrUpdate(diaconnG8HistoryRecord)
+                    status = "TEMPSTOP " + dateUtil.timeString(logDateTime)
+                }
+
+                LOG_ALARM_BATTERY.LOG_KIND -> { // BATTERY SHORTAGE ALARM
+                    val logItem = LOG_ALARM_BATTERY.parse(logDataToHexString)
+                    aapsLogger.debug(LTag.PUMPCOMM, "$logItem ")
+                    val logStartDate = DateUtils.parseDate(logItem.dttm, "yyyy-MM-dd HH:mm:ss")
+                    val logDateTime = logStartDate.time
+
+                    diaconnG8HistoryRecord.code = RecordTypes.RECORD_TYPE_ALARM
+                    diaconnG8HistoryRecord.timestamp = logDateTime
+                    diaconnG8HistoryRecord.stringValue = resourceHelper.gs(R.string.diaconn_g8_logbatteryshorage)
+                    diaconnHistoryRecordDao.createOrUpdate(diaconnG8HistoryRecord)
+                    status = "BATTERYALARM " + dateUtil.timeString(logDateTime)
+                }
+
+                LOG_ALARM_BLOCK.LOG_KIND -> { // INJECTION BLOCKED ALARM
+                    val logItem = LOG_ALARM_BLOCK.parse(logDataToHexString)
+                    aapsLogger.debug(LTag.PUMPCOMM, "$logItem ")
+
+                    val logStartDate = DateUtils.parseDate(logItem.dttm, "yyyy-MM-dd HH:mm:ss")
+                    val logDateTime = logStartDate.time
+
+                    diaconnG8HistoryRecord.code = RecordTypes.RECORD_TYPE_ALARM
+                    diaconnG8HistoryRecord.timestamp = logDateTime
+                    diaconnG8HistoryRecord.value = logItem.amount / 100.0
+                    diaconnG8HistoryRecord.stringValue = resourceHelper.gs(R.string.diaconn_g8_logalarmblock, getReasonName(pumplogKind, logItem.reason))
+                    diaconnHistoryRecordDao.createOrUpdate(diaconnG8HistoryRecord)
+                    status = "BLOCKALARM " + dateUtil.timeString(logDateTime)
+                }
+
+                LOG_ALARM_SHORTAGE.LOG_KIND -> { // INSULIN SHORTAGE ALARM
+                    val logItem = LOG_ALARM_SHORTAGE.parse(logDataToHexString)
+                    aapsLogger.debug(LTag.PUMPCOMM, "$logItem ")
+
+                    val logStartDate = DateUtils.parseDate(logItem.dttm, "yyyy-MM-dd HH:mm:ss")
+                    val logDateTime = logStartDate.time
+
+                    diaconnG8HistoryRecord.code = RecordTypes.RECORD_TYPE_ALARM
+                    diaconnG8HistoryRecord.timestamp = logDateTime
+                    diaconnG8HistoryRecord.value = logItem.remain.toDouble()
+                    diaconnG8HistoryRecord.stringValue = resourceHelper.gs(R.string.diaconn_g8_loginsulinshorage)
+                    diaconnHistoryRecordDao.createOrUpdate(diaconnG8HistoryRecord)
+                    status = "SHORTAGEALARM " + dateUtil.timeString(logDateTime)
+                }
+
+                LOG_RESET_SYS_V3.LOG_KIND -> {
+                    val logItem = LOG_RESET_SYS_V3.parse(logDataToHexString)
+                    aapsLogger.debug(LTag.PUMPCOMM, "$logItem ")
+
+                    val logStartDate = DateUtils.parseDate(logItem.dttm, "yyyy-MM-dd HH:mm:ss")
+                    val logDateTime = logStartDate.time
+
+                    diaconnG8HistoryRecord.code = RecordTypes.RECORD_TYPE_ALARM
+                    diaconnG8HistoryRecord.timestamp = logDateTime
+                    diaconnG8HistoryRecord.stringValue = getReasonName(pumplogKind, logItem.reason)
+                    diaconnHistoryRecordDao.createOrUpdate(diaconnG8HistoryRecord)
+                    if (logItem.reason == 3.toByte()) {
+                        if (sp.getBoolean(R.string.key_diaconn_g8_logbatterychange, true)) {
+                            val newRecord = pumpSync.insertTherapyEventIfNewWithTimestamp(
+                                timestamp = logDateTime,
+                                type = DetailedBolusInfo.EventType.PUMP_BATTERY_CHANGE,
+                                pumpId = logDateTime,
+                                pumpType = PumpType.DIACONN_G8,
+                                pumpSerial = diaconnG8Pump.serialNo.toString()
+                            )
+                            aapsLogger.debug(LTag.PUMPCOMM,  (if (newRecord) "**NEW** " else "") + "EVENT BATTERYCHANGE(" + pumplogKind + ") " + dateUtil.dateAndTimeString(logDateTime) + " (" + logDateTime + ")" + " remainAmount: " + logItem.batteryRemain.toInt() + "%")
+                        }
+                    }
+                    status = "RESET " + dateUtil.timeString(logDateTime)
+                }
+
+                else       -> {
+                    status = resourceHelper.gs(R.string.diaconn_g8_logsyncinprogress)
+                    rxBus.send(EventPumpStatusChanged(status))
+                    continue
+                }
+            }
+            rxBus.send(EventPumpStatusChanged(resourceHelper.gs(R.string.processinghistory) + ": " + status))
+        }
+    }
+
+    override fun getFriendlyName(): String {
+        return "BIG_LOG_INQUIRE_RESPONSE"
+    }
+
+    private fun getReasonName(logKind: Byte, reason: Byte): String{
+        val logInjectNormalFail: Byte = 0x0B
+        val logInjectSquareFail: Byte = 0x0E
+        val logInjectDualFail: Byte = 0x11
+        val logTBStopV3: Byte = 0x13
+        val logResetSysV3: Byte = 0x01
+        val logALarmBlock: Byte = 0x29
+
+        return when (logKind) {
+            logInjectNormalFail, logInjectSquareFail, logInjectDualFail, logTBStopV3 -> failLog(reason)
+            logResetSysV3 -> resetLog(reason)
+            logALarmBlock -> blockLog(reason)
+            else    -> ""
+        }
+    }
+
+    private fun failLog(reason: Byte): String {
+        return when (reason) {
+            //1=Injection blockage, 2=Battery shortage, 3=Drug shortage, 4=User shutdown, 5=System reset, 6=Other, 7=Emergency shutdown
+            0.toByte() -> resourceHelper.gs(R.string.diaconn_g8_reasoncomplete)
+            1.toByte() -> resourceHelper.gs(R.string.diaconn_g8_reasoninjectonblock)
+            2.toByte() -> resourceHelper.gs(R.string.diaconn_g8_reasonbatteryshortage)
+            3.toByte() -> resourceHelper.gs(R.string.diaconn_g8_reasoninsulinshortage)
+            4.toByte() -> resourceHelper.gs(R.string.diaconn_g8_reasonuserstop)
+            5.toByte() -> resourceHelper.gs(R.string.diaconn_g8_reasonsystemreset)
+            6.toByte() -> resourceHelper.gs(R.string.diaconn_g8_reasonother)
+            7.toByte() -> resourceHelper.gs(R.string.diaconn_g8_reasonemergencystop)
+            else       -> "No Reason"
+        }
+    }
+
+    private fun resetLog(reason: Byte): String {
+        return when (reason.toInt()) {
+            1 -> resourceHelper.gs(R.string.diaconn_g8_resetfactoryreset)
+            2 -> resourceHelper.gs(R.string.diaconn_g8_resetemergencyoff)
+            3 -> resourceHelper.gs(R.string.diaconn_g8_resetbatteryreplacement)
+            4 -> resourceHelper.gs(R.string.diaconn_g8_resetaftercalibration)
+            5 -> resourceHelper.gs(R.string.diaconn_g8_resetpreshipment)
+            9 -> resourceHelper.gs(R.string.diaconn_g8_resetunexpected)
+            else -> ""
+        }
+    }
+
+    private fun blockLog(reason: Byte): String {
+        return when (reason.toInt()) {
+            1 -> resourceHelper.gs(R.string.diacon_g8_blockbasal)
+            2 -> resourceHelper.gs(R.string.diacon_g8_blockmealbolus)
+            3 -> resourceHelper.gs(R.string.diacon_g8_blocknormalbolus)
+            4 -> resourceHelper.gs(R.string.diacon_g8_blocksquarebolus)
+            5 -> resourceHelper.gs(R.string.diacon_g8_blockdualbolus)
+            6 -> resourceHelper.gs(R.string.diacon_g8_blockreplacetube)
+            7 -> resourceHelper.gs(R.string.diacon_g8_blockreplaceneedle)
+            8 -> resourceHelper.gs(R.string.diacon_g8_blockreplacesyringe)
+            else -> ""
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BigMainInfoInquirePacket.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BigMainInfoInquirePacket.kt
new file mode 100644
index 0000000000..ddf9a2f465
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BigMainInfoInquirePacket.kt
@@ -0,0 +1,33 @@
+package info.nightscout.androidaps.diaconn.packet
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.diaconn.DiaconnG8Pump
+import info.nightscout.androidaps.logging.LTag
+import javax.inject.Inject
+
+/**
+
+ * BigMainInfoInquirePacket
+ */
+class BigMainInfoInquirePacket(
+    injector: HasAndroidInjector
+) : DiaconnG8Packet(injector ) {
+
+    @Inject lateinit var diaconnG8Pump: DiaconnG8Pump
+
+    init {
+        msgType = 0x73
+        aapsLogger.debug(LTag.PUMPCOMM, "BigMainInfoInquirePacket init")
+
+    }
+
+    override fun encode(msgSeq:Int): ByteArray {
+        val buffer = prefixEncode(msgType, msgSeq, MSG_CON_END)
+
+        return suffixEncode(buffer)
+    }
+
+    override fun getFriendlyName(): String {
+        return "PUMP_BIG_MAIN_INFO_INQUIRE"
+    }
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BigMainInfoInquireResponsePacket.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BigMainInfoInquireResponsePacket.kt
new file mode 100644
index 0000000000..42aca3f51e
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BigMainInfoInquireResponsePacket.kt
@@ -0,0 +1,324 @@
+package info.nightscout.androidaps.diaconn.packet
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.diaconn.DiaconnG8Pump
+import info.nightscout.androidaps.diaconn.R
+import info.nightscout.androidaps.diaconn.pumplog.PumplogUtil
+import info.nightscout.androidaps.interfaces.PumpDescription
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.pump.common.defs.PumpType
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import info.nightscout.androidaps.utils.sharedPreferences.SP
+import org.joda.time.DateTime
+import javax.inject.Inject
+import kotlin.math.floor
+
+/**
+ * BigMainInfoInquireResponsePacket
+ */
+class BigMainInfoInquireResponsePacket(
+    injector: HasAndroidInjector
+) : DiaconnG8Packet(injector) {
+
+    @Inject lateinit var diaconnG8Pump: DiaconnG8Pump
+    @Inject lateinit var sp: SP
+    @Inject lateinit var resourceHelper: ResourceHelper
+    private var pumpDesc = PumpDescription(PumpType.DIACONN_G8)
+
+    init {
+        msgType = 0xb3.toByte()
+        aapsLogger.debug(LTag.PUMPCOMM, "BigMainInfoInquireResponsePacket init")
+    }
+
+    override fun handleMessage(data: ByteArray?) {
+        val result = defect(data)
+        if (result != 0) {
+            aapsLogger.debug(LTag.PUMPCOMM, "BigMainInfoInquireResponsePacket Got some Error")
+            failed = true
+            return
+        } else failed = false
+
+        val bufferData = prefixDecode(data)
+        val result2 =  getByteToInt(bufferData)  // 결과비트 상위 4비트 제거
+        if(!isSuccInquireResponseResult(result2)) {
+            failed = true
+            return
+        }
+        // 1. pump system setting info
+        diaconnG8Pump.systemRemainInsulin = floor(getShortToInt(bufferData) / 100.0)  // 인슐린 잔량
+        diaconnG8Pump.systemRemainBattery = getByteToInt(bufferData) // 베터리잔량(1~100%)
+        diaconnG8Pump.systemBasePattern = getByteToInt(bufferData) // 기저주입 패턴(0=없음, 1=기본, 2=생활1, 3=생활2, 4=생활3, 5=닥터1, 6=닥터2)
+        diaconnG8Pump.systemTbStatus = getByteToInt(bufferData)    // 임시기저 상태(1=임시기저 중, 2=임시기저 해제)
+        diaconnG8Pump.systemInjectionMealStatus = getByteToInt(bufferData) // 식사주입 상태(1=주입중, 2=주입상태아님)
+        diaconnG8Pump.systemInjectionSnackStatus = getByteToInt(bufferData) // 일반간식 주입 상태(1=주입중, 2=주입상태아님)
+        diaconnG8Pump.systemInjectionSquareStatue = getByteToInt(bufferData) // 스퀘어회식 주입 상태(1=주입중, 2=주입상태아님)
+        diaconnG8Pump.systemInjectionDualStatus = getByteToInt(bufferData) // 더블회식 주입 상태(1=주입중, 2=주입상태아님)
+
+        // 2. basal injection suspend status (1:stop, 2:release)
+        diaconnG8Pump.basePauseStatus = getByteToInt(bufferData) // 상태(1=정지,2=해제)
+
+        // 3. Pump time
+        diaconnG8Pump.year = getByteToInt(bufferData) + 2000   // 년 (18~99)
+        diaconnG8Pump.month = getByteToInt(bufferData)  // 월 (1~12)
+        diaconnG8Pump.day = getByteToInt(bufferData)    // 일 (1~31)
+        diaconnG8Pump.hour = getByteToInt(bufferData)   // 시 (0~23)
+        diaconnG8Pump.minute = getByteToInt(bufferData) // 분 (0~59)
+        diaconnG8Pump.second = getByteToInt(bufferData) // 초 (0~59)
+
+        //4. pump system info
+        diaconnG8Pump.country = getByteToInt(bufferData).toChar().toString().toInt() // ASCII
+        diaconnG8Pump.productType = getByteToInt(bufferData).toChar().toString().toInt() // ASCII
+        diaconnG8Pump.makeYear = getByteToInt(bufferData)
+        diaconnG8Pump.makeMonth = getByteToInt(bufferData)
+        diaconnG8Pump.makeDay = getByteToInt(bufferData)
+        diaconnG8Pump.lotNo = getByteToInt(bufferData)// LOT NO
+        diaconnG8Pump.serialNo = getShortToInt(bufferData)
+        diaconnG8Pump.majorVersion = getByteToInt(bufferData)
+        diaconnG8Pump.minorVersion = getByteToInt(bufferData)
+
+        sp.putString(resourceHelper.gs(R.string.pumpversion), diaconnG8Pump.majorVersion.toString() + "." + diaconnG8Pump.minorVersion.toString())
+
+        // 5. pump log status
+        diaconnG8Pump.pumpLastLogNum = getShortToInt(bufferData) // last saved log no
+        diaconnG8Pump.pumpWrappingCount = getByteToInt(bufferData) // wrapping count
+
+        // 6. bolus speed status.
+        diaconnG8Pump.speed = getByteToInt(bufferData) // 식사주입속도
+
+        // 7. Tempbasal status
+        diaconnG8Pump.tbStatus = getByteToInt(bufferData) // 임시기저 상태
+        diaconnG8Pump.tbTime = getByteToInt(bufferData)    // 임시기저시간
+        diaconnG8Pump.tbInjectRateRatio = getShortToInt(bufferData) //임시기저 주입량/률
+        diaconnG8Pump.tbElapsedTime = getShortToInt(bufferData) // 임시기저 경과시간
+
+        // 8. Basal status
+        diaconnG8Pump.baseStatus = getByteToInt(bufferData) // 기저주입 상태
+        diaconnG8Pump.baseHour = getByteToInt(bufferData) // 현재 주입시간
+        diaconnG8Pump.baseAmount = getShortToInt(bufferData) / 100.0 // 주입설정량
+        diaconnG8Pump.baseInjAmount = getShortToInt(bufferData) / 100.0 // 현재 주입량
+
+        // 9. meal bolus status
+        diaconnG8Pump.mealKind = getByteToInt(bufferData) //식사주입 종류
+        diaconnG8Pump.mealStartTime = getIntToInt(bufferData) // 주입시작시간
+        diaconnG8Pump.mealStatus = getByteToInt(bufferData)  // 주입상태
+        diaconnG8Pump.mealAmount = getShortToInt(bufferData) / 100.0 // 주입설정량
+        diaconnG8Pump.mealInjAmount = getShortToInt(bufferData) / 100.0 // 주입량
+        diaconnG8Pump.mealSpeed = getByteToInt(bufferData) // 주입속도
+
+        // 10. snack bolus status
+        diaconnG8Pump.snackStatus = getByteToInt(bufferData) //주입상태
+        diaconnG8Pump.snackAmount = getShortToInt(bufferData) / 100.0 // 주입설정량
+        diaconnG8Pump.snackInjAmount = getShortToInt(bufferData) / 100.0 // 현재주입량
+        diaconnG8Pump.snackSpeed = getByteToInt(bufferData) //주입속도
+
+        // 11. square(extended) bolus status
+        diaconnG8Pump.squareStatus = getByteToInt(bufferData) // 주입상태
+        diaconnG8Pump.squareTime = getShortToInt(bufferData) // 설정 주입시간(10~300분)
+        diaconnG8Pump.squareInjTime = getShortToInt(bufferData) // 경과 주입시간(10~300분)
+        diaconnG8Pump.squareAmount = getShortToInt(bufferData) / 100.0  // 주입 설정량
+        diaconnG8Pump.squareInjAmount = getShortToInt(bufferData) / 100.0 // 현재 주입량
+
+        // 12. daul bolus status
+        diaconnG8Pump.dualStatus = getByteToInt(bufferData) // 주입상태
+        diaconnG8Pump.dualAmount = getShortToInt(bufferData) / 100.0 // 일반주입 설정량
+        diaconnG8Pump.dualInjAmount = getShortToInt(bufferData) / 100.0 // 일반주입량
+        diaconnG8Pump.dualSquareTime = getShortToInt(bufferData) // 스퀘어주입 설정시간(10~300분)
+        diaconnG8Pump.dualInjSquareTime = getShortToInt(bufferData) // 스퀘어주입 경과시간(10~300분)
+        diaconnG8Pump.dualSquareAmount = getShortToInt(bufferData) / 100.0 // 스퀘어주입 설정량
+        diaconnG8Pump.dualInjSquareAmount = getShortToInt(bufferData) / 100.0 // 스퀘어주입량
+
+        // 13. last injection  status
+        diaconnG8Pump.recentKind1 = getByteToInt(bufferData) // 최근-1 주입 종류(1=식사, 2=일반간식, 3=스퀘어회식, 4=더블회식)
+        diaconnG8Pump.recentTime1 = getIntToInt(bufferData) // 최근-1 주입 시간
+        diaconnG8Pump.recentAmount1 = getShortToInt(bufferData) / 100.0 // 최근-1 주입량
+        diaconnG8Pump.recentKind2 = getByteToInt(bufferData) // 최근-2 주입 종류(1=식사, 2=일반간식, 3=스퀘어회식, 4=더블회식)
+        diaconnG8Pump.recentTime2 = getIntToInt(bufferData) // 최근-2 주입 시간
+        diaconnG8Pump.recentAmount2 = getShortToInt(bufferData) / 100.0 // 최근-2 주입량
+
+        // 14. daily injection status
+        diaconnG8Pump.todayBaseAmount = getShortToInt(bufferData) / 100.0 // 기저주입 총량
+        diaconnG8Pump.todayMealAmount = getShortToInt(bufferData) / 100.0 // 식사주입 총량
+        diaconnG8Pump.todaySnackAmount = getShortToInt(bufferData) / 100.0  // 회식주입 총량
+
+        // 15. meat setting status
+        diaconnG8Pump.morningHour = getByteToInt(bufferData) // 아침 개시 시간(0~23)
+        diaconnG8Pump.morningAmount = getShortToInt(bufferData) / 100.0 // 아침 식전량
+        diaconnG8Pump.lunchHour = getByteToInt(bufferData) // 점심 개시 시간(0~23)
+        diaconnG8Pump.lunchAmount = getShortToInt(bufferData) / 100.0 // 점심 식전량
+        diaconnG8Pump.dinnerHour = getByteToInt(bufferData) // 저녁 개시 시간(0~23)
+        diaconnG8Pump.dinnerAmount = getShortToInt(bufferData) / 100.0 // 저녁 식전량
+
+        // 16. basal injection status at this hour
+        diaconnG8Pump.currentBasePattern = getByteToInt(bufferData) // 패턴 종류 (1=기본, 2=생활1, 3=생활2, 4=생활3, 5=닥터1, 6=닥터2)
+        diaconnG8Pump.currentBaseHour = getByteToInt(bufferData) // 현재주입시간(0~23)
+        diaconnG8Pump.currentBaseTbBeforeAmount = getShortToInt(bufferData) / 100.0 // 해당시간의 임시기저 계산 전 기저주입량: 기저주입막힘 발생 시 기저주입 막힘량 제외, 기저정지로 인해 주입되지 않은 량 제외, 리셋으로 인해 주입되지 않은 량 제외(47.5=4750)
+        diaconnG8Pump.currentBaseTbAfterAmount = getShortToInt(bufferData)/ 100.0 // 해당시간의 임시기저 계산 후 기저주입량: 기저주입막힘 발생 시 기저주입 막힘량 제외, 기저정지로 인해 주입되지 않은 량 제외, 리셋으로 인해 주입되지 않은 량 제외(47.5=4750)
+
+        // 17. saved basal pattern status
+        diaconnG8Pump.baseAmount1  = getShortToInt(bufferData) / 100.0  // 주입량 1(량*100, 23.25->2325, 15.2->1520)
+        diaconnG8Pump.baseAmount2  = getShortToInt(bufferData) / 100.0  // 주입량 2(량*100, 23.25->2325, 15.2->1520)
+        diaconnG8Pump.baseAmount3  = getShortToInt(bufferData) / 100.0  // 주입량 3(량*100, 23.25->2325, 15.2->1520)
+        diaconnG8Pump.baseAmount4  = getShortToInt(bufferData) / 100.0  // 주입량 4(량*100, 23.25->2325, 15.2->1520)
+        diaconnG8Pump.baseAmount5  = getShortToInt(bufferData) / 100.0  // 주입량 5(량*100, 23.25->2325, 15.2->1520)
+        diaconnG8Pump.baseAmount6  = getShortToInt(bufferData) / 100.0  // 주입량 6(량*100, 23.25->2325, 15.2->1520)
+        diaconnG8Pump.baseAmount7  = getShortToInt(bufferData) / 100.0  // 주입량 7(량*100, 23.25->2325, 15.2->1520)
+        diaconnG8Pump.baseAmount8  = getShortToInt(bufferData) / 100.0  // 주입량 8(량*100, 23.25->2325, 15.2->1520)
+        diaconnG8Pump.baseAmount9  = getShortToInt(bufferData) / 100.0  // 주입량 9(량*100, 23.25->2325, 15.2->1520)
+        diaconnG8Pump.baseAmount10 = getShortToInt(bufferData) / 100.0  // 주입량 10(량*100, 23.25->2325, 15.2->1520)
+        diaconnG8Pump.baseAmount11 = getShortToInt(bufferData) / 100.0  // 주입량 11(량*100, 23.25->2325, 15.2->1520)
+        diaconnG8Pump.baseAmount12 = getShortToInt(bufferData) / 100.0  // 주입량 12(량*100, 23.25->2325, 15.2->1520)
+        diaconnG8Pump.baseAmount13 = getShortToInt(bufferData) / 100.0  // 주입량 13(량*100, 23.25->2325, 15.2->1520)
+        diaconnG8Pump.baseAmount14 = getShortToInt(bufferData) / 100.0  // 주입량 14(량*100, 23.25->2325, 15.2->1520)
+        diaconnG8Pump.baseAmount15 = getShortToInt(bufferData) / 100.0  // 주입량 15(량*100, 23.25->2325, 15.2->1520)
+        diaconnG8Pump.baseAmount16 = getShortToInt(bufferData) / 100.0  // 주입량 16(량*100, 23.25->2325, 15.2->1520)
+        diaconnG8Pump.baseAmount17 = getShortToInt(bufferData) / 100.0  // 주입량 17(량*100, 23.25->2325, 15.2->1520)
+        diaconnG8Pump.baseAmount18 = getShortToInt(bufferData) / 100.0  // 주입량 18(량*100, 23.25->2325, 15.2->1520)
+        diaconnG8Pump.baseAmount19 = getShortToInt(bufferData) / 100.0  // 주입량 19(량*100, 23.25->2325, 15.2->1520)
+        diaconnG8Pump.baseAmount20 = getShortToInt(bufferData) / 100.0  // 주입량 20(량*100, 23.25->2325, 15.2->1520)
+        diaconnG8Pump.baseAmount21 = getShortToInt(bufferData) / 100.0  // 주입량 21(량*100, 23.25->2325, 15.2->1520)
+        diaconnG8Pump.baseAmount22 = getShortToInt(bufferData) / 100.0  // 주입량 22(량*100, 23.25->2325, 15.2->1520)
+        diaconnG8Pump.baseAmount23 = getShortToInt(bufferData) / 100.0  // 주입량 23(량*100, 23.25->2325, 15.2->1520)
+        diaconnG8Pump.baseAmount24 = getShortToInt(bufferData) / 100.0  // 주입량 24(량*100, 23.25->2325, 15.2->1520)
+
+        // pump time setting 'yyyy-MM-dd'T'HH:mm:ssZ'	“2019-07-04T12:30:30+0530”
+        val time  = DateTime(diaconnG8Pump.year, diaconnG8Pump.month, diaconnG8Pump.day, diaconnG8Pump.hour, diaconnG8Pump.minute, diaconnG8Pump.second)
+        diaconnG8Pump.setPumpTime(time.millis)
+        aapsLogger.debug(LTag.PUMPCOMM, "Pump time " + dateUtil.dateAndTimeAndSecondsString(time.millis))
+
+        // basal pattern from pump
+        diaconnG8Pump.pumpProfiles = Array(4) { Array(24) { 0.0 } }
+        diaconnG8Pump.pumpProfiles!![diaconnG8Pump.activeProfile][0]  = diaconnG8Pump.baseAmount1
+        diaconnG8Pump.pumpProfiles!![diaconnG8Pump.activeProfile][1]  = diaconnG8Pump.baseAmount2
+        diaconnG8Pump.pumpProfiles!![diaconnG8Pump.activeProfile][2]  = diaconnG8Pump.baseAmount3
+        diaconnG8Pump.pumpProfiles!![diaconnG8Pump.activeProfile][3]  = diaconnG8Pump.baseAmount4
+        diaconnG8Pump.pumpProfiles!![diaconnG8Pump.activeProfile][4]  = diaconnG8Pump.baseAmount5
+        diaconnG8Pump.pumpProfiles!![diaconnG8Pump.activeProfile][5]  = diaconnG8Pump.baseAmount6
+        diaconnG8Pump.pumpProfiles!![diaconnG8Pump.activeProfile][6]  = diaconnG8Pump.baseAmount7
+        diaconnG8Pump.pumpProfiles!![diaconnG8Pump.activeProfile][7]  = diaconnG8Pump.baseAmount8
+        diaconnG8Pump.pumpProfiles!![diaconnG8Pump.activeProfile][8]  = diaconnG8Pump.baseAmount9
+        diaconnG8Pump.pumpProfiles!![diaconnG8Pump.activeProfile][9]  = diaconnG8Pump.baseAmount10
+        diaconnG8Pump.pumpProfiles!![diaconnG8Pump.activeProfile][10] = diaconnG8Pump.baseAmount11
+        diaconnG8Pump.pumpProfiles!![diaconnG8Pump.activeProfile][11] = diaconnG8Pump.baseAmount12
+        diaconnG8Pump.pumpProfiles!![diaconnG8Pump.activeProfile][12] = diaconnG8Pump.baseAmount13
+        diaconnG8Pump.pumpProfiles!![diaconnG8Pump.activeProfile][13] = diaconnG8Pump.baseAmount14
+        diaconnG8Pump.pumpProfiles!![diaconnG8Pump.activeProfile][14] = diaconnG8Pump.baseAmount15
+        diaconnG8Pump.pumpProfiles!![diaconnG8Pump.activeProfile][15] = diaconnG8Pump.baseAmount16
+        diaconnG8Pump.pumpProfiles!![diaconnG8Pump.activeProfile][16] = diaconnG8Pump.baseAmount17
+        diaconnG8Pump.pumpProfiles!![diaconnG8Pump.activeProfile][17] = diaconnG8Pump.baseAmount18
+        diaconnG8Pump.pumpProfiles!![diaconnG8Pump.activeProfile][18] = diaconnG8Pump.baseAmount19
+        diaconnG8Pump.pumpProfiles!![diaconnG8Pump.activeProfile][19] = diaconnG8Pump.baseAmount20
+        diaconnG8Pump.pumpProfiles!![diaconnG8Pump.activeProfile][20] = diaconnG8Pump.baseAmount21
+        diaconnG8Pump.pumpProfiles!![diaconnG8Pump.activeProfile][21] = diaconnG8Pump.baseAmount22
+        diaconnG8Pump.pumpProfiles!![diaconnG8Pump.activeProfile][22] = diaconnG8Pump.baseAmount23
+        diaconnG8Pump.pumpProfiles!![diaconnG8Pump.activeProfile][23] = diaconnG8Pump.baseAmount24
+
+        //incarnation no 처리
+        diaconnG8Pump.isPumpVersionGe2_63 = PumplogUtil.isPumpVersionGe(sp.getString(resourceHelper.gs(R.string.pumpversion), ""),2, 63)
+
+        aapsLogger.debug(LTag.PUMPCOMM, "result > " + diaconnG8Pump.result)
+        aapsLogger.debug(LTag.PUMPCOMM, "systemRemainInsulin > " + diaconnG8Pump.systemRemainInsulin)
+        aapsLogger.debug(LTag.PUMPCOMM, "systemRemainBattery > " + diaconnG8Pump.systemRemainBattery)
+        aapsLogger.debug(LTag.PUMPCOMM, "systemBasePattern > " + diaconnG8Pump.systemBasePattern)
+        aapsLogger.debug(LTag.PUMPCOMM, "systemTbStatus > " + diaconnG8Pump.systemTbStatus)
+        aapsLogger.debug(LTag.PUMPCOMM, "systemInjectionMealStatus > " + diaconnG8Pump.systemInjectionMealStatus)
+        aapsLogger.debug(LTag.PUMPCOMM, "systemInjectionSnackStatus > " + diaconnG8Pump.systemInjectionSnackStatus)
+        aapsLogger.debug(LTag.PUMPCOMM, "systemInjectionSquareStatue > " + diaconnG8Pump.systemInjectionSquareStatue)
+        aapsLogger.debug(LTag.PUMPCOMM, "systemInjectionDualStatus > " + diaconnG8Pump.systemInjectionDualStatus)
+        aapsLogger.debug(LTag.PUMPCOMM, "basePauseStatus > " + diaconnG8Pump.basePauseStatus)
+        aapsLogger.debug(LTag.PUMPCOMM, "year > " + diaconnG8Pump.year)
+        aapsLogger.debug(LTag.PUMPCOMM, "month > " + diaconnG8Pump.month)
+        aapsLogger.debug(LTag.PUMPCOMM, "day > " + diaconnG8Pump.day)
+        aapsLogger.debug(LTag.PUMPCOMM, "hour > " + diaconnG8Pump.hour)
+        aapsLogger.debug(LTag.PUMPCOMM, "minute > " + diaconnG8Pump.minute)
+        aapsLogger.debug(LTag.PUMPCOMM, "second > " + diaconnG8Pump.second)
+        aapsLogger.debug(LTag.PUMPCOMM, "country > " + diaconnG8Pump.country)
+        aapsLogger.debug(LTag.PUMPCOMM, "productType > " + diaconnG8Pump.productType)
+        aapsLogger.debug(LTag.PUMPCOMM, "makeYear > " + diaconnG8Pump.makeYear)
+        aapsLogger.debug(LTag.PUMPCOMM, "makeMonth > " + diaconnG8Pump.makeMonth)
+        aapsLogger.debug(LTag.PUMPCOMM, "makeDay > " + diaconnG8Pump.makeDay)
+        aapsLogger.debug(LTag.PUMPCOMM, "lotNo > " + diaconnG8Pump.lotNo)
+        aapsLogger.debug(LTag.PUMPCOMM, "serialNo > " + diaconnG8Pump.serialNo)
+        aapsLogger.debug(LTag.PUMPCOMM, "majorVersion > " + diaconnG8Pump.majorVersion)
+        aapsLogger.debug(LTag.PUMPCOMM, "minorVersion > " + diaconnG8Pump.minorVersion)
+        aapsLogger.debug(LTag.PUMPCOMM, "lastNum  > " + diaconnG8Pump.pumpLastLogNum)
+        aapsLogger.debug(LTag.PUMPCOMM, "wrappingCount > " + diaconnG8Pump.pumpWrappingCount)
+        aapsLogger.debug(LTag.PUMPCOMM, "speed > " + diaconnG8Pump.speed)
+        aapsLogger.debug(LTag.PUMPCOMM, "tbStatus > " + diaconnG8Pump.tbStatus)
+        aapsLogger.debug(LTag.PUMPCOMM, "tbTime> " + diaconnG8Pump.tbTime)
+        aapsLogger.debug(LTag.PUMPCOMM, "tbInjectRateRatio > " + diaconnG8Pump.tbInjectRateRatio)
+        aapsLogger.debug(LTag.PUMPCOMM, "tbElapsedTime > " + diaconnG8Pump.tbElapsedTime)
+        aapsLogger.debug(LTag.PUMPCOMM, "baseStatus > " + diaconnG8Pump.baseStatus)
+        aapsLogger.debug(LTag.PUMPCOMM, "baseHour > " + diaconnG8Pump.baseHour)
+        aapsLogger.debug(LTag.PUMPCOMM, "baseAmount > " + diaconnG8Pump.baseAmount)
+        aapsLogger.debug(LTag.PUMPCOMM, "baseInjAmount > " + diaconnG8Pump.baseInjAmount)
+        aapsLogger.debug(LTag.PUMPCOMM, "mealKind > " + diaconnG8Pump.mealKind)
+        aapsLogger.debug(LTag.PUMPCOMM, "mealStartTime > " + diaconnG8Pump.mealStartTime)
+        aapsLogger.debug(LTag.PUMPCOMM, "mealStatus > " + diaconnG8Pump.mealStatus)
+        aapsLogger.debug(LTag.PUMPCOMM, "mealAmount > " + diaconnG8Pump.mealAmount)
+        aapsLogger.debug(LTag.PUMPCOMM, "mealInjAmount > " + diaconnG8Pump.mealInjAmount)
+        aapsLogger.debug(LTag.PUMPCOMM, "mealSpeed > " + diaconnG8Pump.mealSpeed)
+        aapsLogger.debug(LTag.PUMPCOMM, "snackStatus > " + diaconnG8Pump.snackStatus)
+        aapsLogger.debug(LTag.PUMPCOMM, "snackAmount > " + diaconnG8Pump.snackAmount)
+        aapsLogger.debug(LTag.PUMPCOMM, "snackInjAmount > " + diaconnG8Pump.snackInjAmount)
+        aapsLogger.debug(LTag.PUMPCOMM, "snackSpeed > " + diaconnG8Pump.snackSpeed)
+        aapsLogger.debug(LTag.PUMPCOMM, "squareStatus > " + diaconnG8Pump.squareStatus)
+        aapsLogger.debug(LTag.PUMPCOMM, "squareTime > " + diaconnG8Pump.squareTime)
+        aapsLogger.debug(LTag.PUMPCOMM, "squareInjTime > " + diaconnG8Pump.squareInjTime)
+        aapsLogger.debug(LTag.PUMPCOMM, "squareAmount > " + diaconnG8Pump.squareAmount)
+        aapsLogger.debug(LTag.PUMPCOMM, "squareInjAmount > " + diaconnG8Pump.squareInjAmount)
+        aapsLogger.debug(LTag.PUMPCOMM, "dualStatus > " + diaconnG8Pump.dualStatus)
+        aapsLogger.debug(LTag.PUMPCOMM, "dualAmount > " + diaconnG8Pump.dualAmount)
+        aapsLogger.debug(LTag.PUMPCOMM, "dualInjAmount > " + diaconnG8Pump.dualInjAmount)
+        aapsLogger.debug(LTag.PUMPCOMM, "dualSquareTime > " + diaconnG8Pump.dualSquareTime)
+        aapsLogger.debug(LTag.PUMPCOMM, "dualInjSquareTime > " + diaconnG8Pump.dualInjSquareTime)
+        aapsLogger.debug(LTag.PUMPCOMM, "dualSquareAmount > " + diaconnG8Pump.dualSquareAmount)
+        aapsLogger.debug(LTag.PUMPCOMM, "dualInjSquareAmount> " + diaconnG8Pump.dualInjSquareAmount)
+        aapsLogger.debug(LTag.PUMPCOMM, "recentKind1  > " + diaconnG8Pump.recentKind1)
+        aapsLogger.debug(LTag.PUMPCOMM, "recentTime1  > " + diaconnG8Pump.recentTime1)
+        aapsLogger.debug(LTag.PUMPCOMM, "recentAmount1 > " + diaconnG8Pump.recentAmount1)
+        aapsLogger.debug(LTag.PUMPCOMM, "recentKind2  	> " + diaconnG8Pump.recentKind2)
+        aapsLogger.debug(LTag.PUMPCOMM, "recentTime2  	> " + diaconnG8Pump.recentTime2)
+        aapsLogger.debug(LTag.PUMPCOMM, "recentAmount2 > " + diaconnG8Pump.recentAmount2)
+        aapsLogger.debug(LTag.PUMPCOMM, "todayBaseAmount > " + diaconnG8Pump.todayBaseAmount)
+        aapsLogger.debug(LTag.PUMPCOMM, "todayMealAmount > " + diaconnG8Pump.todayMealAmount)
+        aapsLogger.debug(LTag.PUMPCOMM, "todaySnackAmount > " + diaconnG8Pump.todaySnackAmount)
+        aapsLogger.debug(LTag.PUMPCOMM, "morningHour  > " + diaconnG8Pump.morningHour)
+        aapsLogger.debug(LTag.PUMPCOMM, "morningAmount > " + diaconnG8Pump.morningAmount)
+        aapsLogger.debug(LTag.PUMPCOMM, "lunchHour  > " + diaconnG8Pump.lunchHour)
+        aapsLogger.debug(LTag.PUMPCOMM, "lunchAmount > " + diaconnG8Pump.lunchAmount)
+        aapsLogger.debug(LTag.PUMPCOMM, "dinnerHour  > " + diaconnG8Pump.dinnerHour)
+        aapsLogger.debug(LTag.PUMPCOMM, "dinnerAmount > " + diaconnG8Pump.dinnerAmount)
+        aapsLogger.debug(LTag.PUMPCOMM, "currentBasePattern > " + diaconnG8Pump.currentBasePattern)
+        aapsLogger.debug(LTag.PUMPCOMM, "currentBaseHour  > " + diaconnG8Pump.currentBaseHour)
+        aapsLogger.debug(LTag.PUMPCOMM, "currentBaseTbBeforeAmount > " + diaconnG8Pump.currentBaseTbBeforeAmount)
+        aapsLogger.debug(LTag.PUMPCOMM, "currentBaseTbAfterAmount > " + diaconnG8Pump.currentBaseTbAfterAmount)
+        aapsLogger.debug(LTag.PUMPCOMM, "baseAmount1  > " + diaconnG8Pump.baseAmount1)
+        aapsLogger.debug(LTag.PUMPCOMM, "baseAmount2  > " + diaconnG8Pump.baseAmount2)
+        aapsLogger.debug(LTag.PUMPCOMM, "baseAmount3  > " + diaconnG8Pump.baseAmount3)
+        aapsLogger.debug(LTag.PUMPCOMM, "baseAmount4  > " + diaconnG8Pump.baseAmount4)
+        aapsLogger.debug(LTag.PUMPCOMM, "baseAmount5  > " + diaconnG8Pump.baseAmount5)
+        aapsLogger.debug(LTag.PUMPCOMM, "baseAmount6  > " + diaconnG8Pump.baseAmount6)
+        aapsLogger.debug(LTag.PUMPCOMM, "baseAmount7  > " + diaconnG8Pump.baseAmount7)
+        aapsLogger.debug(LTag.PUMPCOMM, "baseAmount8  > " + diaconnG8Pump.baseAmount8)
+        aapsLogger.debug(LTag.PUMPCOMM, "baseAmount9  > " + diaconnG8Pump.baseAmount9)
+        aapsLogger.debug(LTag.PUMPCOMM, "baseAmount10 > " + diaconnG8Pump.baseAmount10)
+        aapsLogger.debug(LTag.PUMPCOMM, "baseAmount11 > " + diaconnG8Pump.baseAmount11)
+        aapsLogger.debug(LTag.PUMPCOMM, "baseAmount12 > " + diaconnG8Pump.baseAmount12)
+        aapsLogger.debug(LTag.PUMPCOMM, "baseAmount13 > " + diaconnG8Pump.baseAmount13)
+        aapsLogger.debug(LTag.PUMPCOMM, "baseAmount14 > " + diaconnG8Pump.baseAmount14)
+        aapsLogger.debug(LTag.PUMPCOMM, "baseAmount15 > " + diaconnG8Pump.baseAmount15)
+        aapsLogger.debug(LTag.PUMPCOMM, "baseAmount16 > " + diaconnG8Pump.baseAmount16)
+        aapsLogger.debug(LTag.PUMPCOMM, "baseAmount17 > " + diaconnG8Pump.baseAmount17)
+        aapsLogger.debug(LTag.PUMPCOMM, "baseAmount18 > " + diaconnG8Pump.baseAmount18)
+        aapsLogger.debug(LTag.PUMPCOMM, "baseAmount19 > " + diaconnG8Pump.baseAmount19)
+        aapsLogger.debug(LTag.PUMPCOMM, "baseAmount20 > " + diaconnG8Pump.baseAmount20)
+        aapsLogger.debug(LTag.PUMPCOMM, "baseAmount21 > " + diaconnG8Pump.baseAmount21)
+        aapsLogger.debug(LTag.PUMPCOMM, "baseAmount22 > " + diaconnG8Pump.baseAmount22)
+        aapsLogger.debug(LTag.PUMPCOMM, "baseAmount23 > " + diaconnG8Pump.baseAmount23)
+        aapsLogger.debug(LTag.PUMPCOMM, "baseAmount24 > " + diaconnG8Pump.baseAmount24)
+    }
+
+    override fun getFriendlyName(): String {
+        return "PUMP_BIG_MAIN_INFO_INQUIRE_RESPONSE"
+    }
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BolusSpeedInquirePacket.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BolusSpeedInquirePacket.kt
new file mode 100644
index 0000000000..085bc5c294
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BolusSpeedInquirePacket.kt
@@ -0,0 +1,27 @@
+package info.nightscout.androidaps.diaconn.packet
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.diaconn.DiaconnG8Pump
+import info.nightscout.androidaps.logging.LTag
+import javax.inject.Inject
+
+/**
+ * BolusSpeedInquirePacket
+ */
+class BolusSpeedInquirePacket(injector: HasAndroidInjector) : DiaconnG8Packet(injector ) {
+
+    @Inject lateinit var diaconnG8Pump: DiaconnG8Pump
+    init {
+        msgType = 0x45.toByte()
+        aapsLogger.debug(LTag.PUMPCOMM, "BolusSpeedInquirePacket init ")
+    }
+
+    override fun encode(msgSeq:Int): ByteArray {
+        return suffixEncode(prefixEncode(msgType, msgSeq, MSG_CON_END))
+    }
+
+    override fun getFriendlyName(): String {
+        return "PUMP_BOLUS_SPEED_INQUIRE"
+
+    }
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BolusSpeedInquireResponsePacket.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BolusSpeedInquireResponsePacket.kt
new file mode 100644
index 0000000000..ccf9be256a
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BolusSpeedInquireResponsePacket.kt
@@ -0,0 +1,49 @@
+package info.nightscout.androidaps.diaconn.packet
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.diaconn.DiaconnG8Pump
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.utils.sharedPreferences.SP
+import javax.inject.Inject
+
+/**
+ * BolusSpeedInquireResponsePacket
+ */
+class BolusSpeedInquireResponsePacket(injector: HasAndroidInjector) : DiaconnG8Packet(injector ) {
+
+    @Inject lateinit var diaconnG8Pump: DiaconnG8Pump
+    @Inject lateinit var sp: SP
+
+    init {
+        msgType = 0x85.toByte()
+        aapsLogger.debug(LTag.PUMPCOMM, "BolusSpeedInquireResponsePacket init")
+    }
+
+    override fun handleMessage(data: ByteArray?) {
+        val defectResult = defect(data)
+        if (defectResult != 0) {
+            aapsLogger.debug(LTag.PUMPCOMM, "BolusSpeedInquireResponsePacket Got some Error")
+            failed = true
+            return
+        } else failed = false
+
+        val bufferData = prefixDecode(data)
+        val result =  getByteToInt(bufferData)
+
+        if(!isSuccInquireResponseResult(result)) {
+            failed = true
+            return
+        }
+
+        diaconnG8Pump.speed = getByteToInt(bufferData) //주입속도
+        sp.putString("g8_bolusspeed", diaconnG8Pump.speed.toString())
+
+        aapsLogger.debug(LTag.PUMPCOMM, "Result --> ${diaconnG8Pump.result}")
+        aapsLogger.debug(LTag.PUMPCOMM, "bolusSpeed > " + diaconnG8Pump.speed)
+    }
+
+    override fun getFriendlyName(): String {
+        return "PUMP_BOLUS_SPEED_INQUIRE_RESPONSE"
+    }
+
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BolusSpeedSettingPacket.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BolusSpeedSettingPacket.kt
new file mode 100644
index 0000000000..ff4005a937
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BolusSpeedSettingPacket.kt
@@ -0,0 +1,32 @@
+package info.nightscout.androidaps.diaconn.packet
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.diaconn.DiaconnG8Pump
+import info.nightscout.androidaps.logging.LTag
+import javax.inject.Inject
+
+/**
+ * BolusSpeedSettingPacket
+ */
+class BolusSpeedSettingPacket(
+    injector: HasAndroidInjector,
+    private var type: Int
+) : DiaconnG8Packet(injector) {
+
+    @Inject lateinit var diaconnG8Pump: DiaconnG8Pump
+
+    init {
+        msgType = 0x05
+        aapsLogger.debug(LTag.PUMPCOMM, "BolusSpeedSettingPacket init")
+    }
+
+    override fun encode(msgSeq:Int): ByteArray {
+        val buffer = prefixEncode(msgType, msgSeq, MSG_CON_END)
+        buffer.put(type.toByte()) // 명령코드
+        return suffixEncode(buffer)
+    }
+
+    override fun getFriendlyName(): String {
+        return "PUMP_BOLUS_SPEED_SETTING_PACKET"
+    }
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BolusSpeedSettingReportPacket.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BolusSpeedSettingReportPacket.kt
new file mode 100644
index 0000000000..6008c76d12
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BolusSpeedSettingReportPacket.kt
@@ -0,0 +1,40 @@
+package info.nightscout.androidaps.diaconn.packet
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.diaconn.DiaconnG8Pump
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.utils.sharedPreferences.SP
+import javax.inject.Inject
+
+/**
+ * BolusSpeedSettingReportPacket
+ */
+class BolusSpeedSettingReportPacket(
+    injector: HasAndroidInjector
+) : DiaconnG8Packet(injector ) {
+
+    @Inject lateinit var diaconnG8Pump: DiaconnG8Pump
+    @Inject lateinit var sp: SP
+    init {
+        msgType = 0xC5.toByte()
+        aapsLogger.debug(LTag.PUMPCOMM, "BolusSpeedSettingReportPacket init ")
+    }
+
+    override fun handleMessage(data: ByteArray?) {
+        val defectCheck = defect(data)
+        if (defectCheck != 0) {
+            aapsLogger.debug(LTag.PUMPCOMM, "BolusSpeedSettingReportPacket Report Packet Got some Error")
+            failed = true
+            return
+        } else failed = false
+
+        val bufferData = prefixDecode(data)
+        diaconnG8Pump.speed   = getByteToInt(bufferData) // speed result
+        sp.putBoolean("diaconn_g8_isbolusspeedsync", true)
+        aapsLogger.debug(LTag.PUMPCOMM, "bolusSpeed   --> ${diaconnG8Pump.speed  }")
+    }
+
+    override fun getFriendlyName(): String {
+        return "PUMP_BOLUS_SPEED_SETTING_REPORT"
+    }
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BolusSpeedSettingResponsePacket.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BolusSpeedSettingResponsePacket.kt
new file mode 100644
index 0000000000..8a5b22f5da
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BolusSpeedSettingResponsePacket.kt
@@ -0,0 +1,47 @@
+package info.nightscout.androidaps.diaconn.packet
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.diaconn.DiaconnG8Pump
+import info.nightscout.androidaps.logging.LTag
+import javax.inject.Inject
+
+/**
+ * BolusSpeedSettingResponsePacket
+ */
+class BolusSpeedSettingResponsePacket(
+    injector: HasAndroidInjector
+) : DiaconnG8Packet(injector) {
+
+    @Inject lateinit var diaconnG8Pump: DiaconnG8Pump
+    var result = 0
+    init {
+        msgType = 0x85.toByte()
+        aapsLogger.debug(LTag.PUMPCOMM, "BolusSpeedSettingResponsePacket init")
+    }
+
+    override fun handleMessage(data: ByteArray?) {
+        val defectCheck = defect(data)
+        if (defectCheck != 0) {
+            aapsLogger.debug(LTag.PUMPCOMM, "BolusSpeedSettingResponsePacket Got some Error")
+            failed = true
+            return
+        } else failed = false
+
+        val bufferData = prefixDecode(data)
+        result =  getByteToInt(bufferData)
+
+        if(!isSuccSettingResponseResult(result)) {
+            diaconnG8Pump.resultErrorCode = result
+            failed = true
+            return
+        }
+
+        diaconnG8Pump.otpNumber =  getIntToInt(bufferData)
+        aapsLogger.debug(LTag.PUMPCOMM, "Result --> $result")
+        aapsLogger.debug(LTag.PUMPCOMM, "otpNumber --> ${diaconnG8Pump.otpNumber}")
+    }
+
+    override fun getFriendlyName(): String {
+        return "PUMP_BOLUS_SPEED_SETTING_RESPONSE"
+    }
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/ConfirmReportPacket.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/ConfirmReportPacket.kt
new file mode 100644
index 0000000000..cb516e30fa
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/ConfirmReportPacket.kt
@@ -0,0 +1,38 @@
+package info.nightscout.androidaps.diaconn.packet
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.diaconn.DiaconnG8Pump
+import info.nightscout.androidaps.logging.LTag
+import javax.inject.Inject
+
+/**
+ * ConfirmReportPacket
+ */
+class ConfirmReportPacket(
+    injector: HasAndroidInjector
+) : DiaconnG8Packet(injector ) {
+
+    @Inject lateinit var diaconnG8Pump: DiaconnG8Pump
+    var reqMsgType:Int? = null
+    init {
+        msgType = 0xE8.toByte()
+        aapsLogger.debug(LTag.PUMPCOMM, "ConfirmReportPacket init ")
+    }
+
+    override fun handleMessage(data: ByteArray?) {
+        val defectCheck = defect(data)
+        if (defectCheck != 0) {
+            aapsLogger.debug(LTag.PUMPCOMM, "ConfirmReportPacket Got some Error")
+            failed = true
+            return
+        } else failed = false
+
+        val bufferData = prefixDecode(data)
+        reqMsgType =  getByteToInt(bufferData)
+        aapsLogger.debug(LTag.PUMPCOMM, "Pump Report Confirm reqMsgType --> ${reqMsgType}")
+    }
+
+    override fun getFriendlyName(): String {
+        return "PUMP_CONFIRM_REPORT"
+    }
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/DiaconnG8Packet.java b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/DiaconnG8Packet.java
new file mode 100644
index 0000000000..922335e612
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/DiaconnG8Packet.java
@@ -0,0 +1,320 @@
+package info.nightscout.androidaps.diaconn.packet;
+
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+
+import javax.inject.Inject;
+
+import dagger.android.HasAndroidInjector;
+import info.nightscout.androidaps.logging.AAPSLogger;
+import info.nightscout.androidaps.logging.LTag;
+import info.nightscout.androidaps.utils.DateUtil;
+
+public class DiaconnG8Packet {
+
+    @Inject AAPSLogger aapsLogger;
+    @Inject DateUtil dateUtil;
+
+    protected HasAndroidInjector injector;
+    private boolean received;
+    public boolean failed;
+    public byte msgType;
+
+    public static final int MSG_LEN = 20; // 메시지 길이(20바이트 패킷)
+    public static final int MSG_LEN_BIG = 182; // 메시지 길이(182바이트 대량패킷)
+    public static final byte SOP = (byte) 0xef; // 패킷 시작 바이트(20바이트 패킷)
+    public static final byte SOP_BIG =  (byte) 0xed; // 대량 패킷 시작 바이트(182바이트 대량패킷)
+    public static final byte MSG_TYPE_LOC = 1; // 메시지 종류 위치
+    public static final byte MSG_SEQ_LOC = 2; // 메시지 시퀀스번호 위치
+    public static final byte BT_MSG_DATA_LOC = 4; // 데이터 위치
+    public static final byte MSG_PAD =  (byte) 0xff; // 메시지 뒷부분 빈공간을 채우는 값
+    public static final byte MSG_CON_END =  (byte) 0x00; // 패킷 내용 끝
+    public static final byte MSG_CON_CONTINUE =  (byte) 0x01; // 패킷 내용 계속
+
+    /**
+     *  CRC 정보
+     */
+    private static final byte[] crc_table = {
+        (byte) 0x00, (byte) 0x25, (byte) 0x4A, (byte) 0x6F, (byte) 0x94, (byte) 0xB1, (byte) 0xDE, (byte) 0xFB,
+        (byte) 0x0D, (byte) 0x28, (byte) 0x47, (byte) 0x62, (byte) 0x99, (byte) 0xBC, (byte) 0xD3, (byte) 0xF6,
+        (byte) 0x1A, (byte) 0x3F, (byte) 0x50, (byte) 0x75, (byte) 0x8E, (byte) 0xAB, (byte) 0xC4, (byte) 0xE1,
+        (byte) 0x17, (byte) 0x32, (byte) 0x5D, (byte) 0x78, (byte) 0x83, (byte) 0xA6, (byte) 0xC9, (byte) 0xEC,
+        (byte) 0x34, (byte) 0x11, (byte) 0x7E, (byte) 0x5B, (byte) 0xA0, (byte) 0x85, (byte) 0xEA, (byte) 0xCF,
+        (byte) 0x39, (byte) 0x1C, (byte) 0x73, (byte) 0x56, (byte) 0xAD, (byte) 0x88, (byte) 0xE7, (byte) 0xC2,
+        (byte) 0x2E, (byte) 0x0B, (byte) 0x64, (byte) 0x41, (byte) 0xBA, (byte) 0x9F, (byte) 0xF0, (byte) 0xD5,
+        (byte) 0x23, (byte) 0x06, (byte) 0x69, (byte) 0x4C, (byte) 0xB7, (byte) 0x92, (byte) 0xFD, (byte) 0xD8,
+        (byte) 0x68, (byte) 0x4D, (byte) 0x22, (byte) 0x07, (byte) 0xFC, (byte) 0xD9, (byte) 0xB6, (byte) 0x93,
+        (byte) 0x65, (byte) 0x40, (byte) 0x2F, (byte) 0x0A, (byte) 0xF1, (byte) 0xD4, (byte) 0xBB, (byte) 0x9E,
+        (byte) 0x72, (byte) 0x57, (byte) 0x38, (byte) 0x1D, (byte) 0xE6, (byte) 0xC3, (byte) 0xAC, (byte) 0x89,
+        (byte) 0x7F, (byte) 0x5A, (byte) 0x35, (byte) 0x10, (byte) 0xEB, (byte) 0xCE, (byte) 0xA1, (byte) 0x84,
+        (byte) 0x5C, (byte) 0x79, (byte) 0x16, (byte) 0x33, (byte) 0xC8, (byte) 0xED, (byte) 0x82, (byte) 0xA7,
+        (byte) 0x51, (byte) 0x74, (byte) 0x1B, (byte) 0x3E, (byte) 0xC5, (byte) 0xE0, (byte) 0x8F, (byte) 0xAA,
+        (byte) 0x46, (byte) 0x63, (byte) 0x0C, (byte) 0x29, (byte) 0xD2, (byte) 0xF7, (byte) 0x98, (byte) 0xBD,
+        (byte) 0x4B, (byte) 0x6E, (byte) 0x01, (byte) 0x24, (byte) 0xDF, (byte) 0xFA, (byte) 0x95, (byte) 0xB0,
+        (byte) 0xD0, (byte) 0xF5, (byte) 0x9A, (byte) 0xBF, (byte) 0x44, (byte) 0x61, (byte) 0x0E, (byte) 0x2B,
+        (byte) 0xDD, (byte) 0xF8, (byte) 0x97, (byte) 0xB2, (byte) 0x49, (byte) 0x6C, (byte) 0x03, (byte) 0x26,
+        (byte) 0xCA, (byte) 0xEF, (byte) 0x80, (byte) 0xA5, (byte) 0x5E, (byte) 0x7B, (byte) 0x14, (byte) 0x31,
+        (byte) 0xC7, (byte) 0xE2, (byte) 0x8D, (byte) 0xA8, (byte) 0x53, (byte) 0x76, (byte) 0x19, (byte) 0x3C,
+        (byte) 0xE4, (byte) 0xC1, (byte) 0xAE, (byte) 0x8B, (byte) 0x70, (byte) 0x55, (byte) 0x3A, (byte) 0x1F,
+        (byte) 0xE9, (byte) 0xCC, (byte) 0xA3, (byte) 0x86, (byte) 0x7D, (byte) 0x58, (byte) 0x37, (byte) 0x12,
+        (byte) 0xFE, (byte) 0xDB, (byte) 0xB4, (byte) 0x91, (byte) 0x6A, (byte) 0x4F, (byte) 0x20, (byte) 0x05,
+        (byte) 0xF3, (byte) 0xD6, (byte) 0xB9, (byte) 0x9C, (byte) 0x67, (byte) 0x42, (byte) 0x2D, (byte) 0x08,
+        (byte) 0xB8, (byte) 0x9D, (byte) 0xF2, (byte) 0xD7, (byte) 0x2C, (byte) 0x09, (byte) 0x66, (byte) 0x43,
+        (byte) 0xB5, (byte) 0x90, (byte) 0xFF, (byte) 0xDA, (byte) 0x21, (byte) 0x04, (byte) 0x6B, (byte) 0x4E,
+        (byte) 0xA2, (byte) 0x87, (byte) 0xE8, (byte) 0xCD, (byte) 0x36, (byte) 0x13, (byte) 0x7C, (byte) 0x59,
+        (byte) 0xAF, (byte) 0x8A, (byte) 0xE5, (byte) 0xC0, (byte) 0x3B, (byte) 0x1E, (byte) 0x71, (byte) 0x54,
+        (byte) 0x8C, (byte) 0xA9, (byte) 0xC6, (byte) 0xE3, (byte) 0x18, (byte) 0x3D, (byte) 0x52, (byte) 0x77,
+        (byte) 0x81, (byte) 0xA4, (byte) 0xCB, (byte) 0xEE, (byte) 0x15, (byte) 0x30, (byte) 0x5F, (byte) 0x7A,
+        (byte) 0x96, (byte) 0xB3, (byte) 0xDC, (byte) 0xF9, (byte) 0x02, (byte) 0x27, (byte) 0x48, (byte) 0x6D,
+        (byte) 0x9B, (byte) 0xBE, (byte) 0xD1, (byte) 0xF4, (byte) 0x0F, (byte) 0x2A, (byte) 0x45, (byte) 0x60
+    };
+
+    public DiaconnG8Packet(HasAndroidInjector injector) {
+        this.received = false;
+        this.failed = false;
+        this.injector = injector;
+        injector.androidInjector().inject(this);
+    }
+
+    public boolean success() {
+        return !failed;
+    }
+    public void setReceived() {
+        received = true;
+    }
+
+    public boolean isReceived() {
+        return received;
+    }
+
+    // 패킷 인코딩 앞부분
+    public ByteBuffer prefixEncode(byte msgType, int msgSeq, byte msgConEnd) {
+        ByteBuffer buffer = ByteBuffer.allocate(MSG_LEN);
+        buffer.order(ByteOrder.LITTLE_ENDIAN);
+        buffer.put(SOP);
+        buffer.put(msgType);
+        buffer.put((byte) msgSeq);
+        buffer.put(msgConEnd);
+        return buffer;
+    }
+
+    // 패킷 인코딩 뒷부분
+    public byte[] suffixEncode(ByteBuffer buffer) {
+        int remainSize = MSG_LEN - buffer.position() - 1;
+        for (int i = 0; i < remainSize; i++) {
+            buffer.put(MSG_PAD);
+        }
+        byte crc = getCRC(buffer.array(), MSG_LEN - 1);
+        buffer.put(crc);
+        return buffer.array();
+    }
+
+    // 패킷 디코딩 앞부분
+    protected static ByteBuffer prefixDecode(byte[] bytes) {
+        ByteBuffer buffer = ByteBuffer.wrap(bytes);
+        buffer.order(ByteOrder.LITTLE_ENDIAN);
+        buffer.position(BT_MSG_DATA_LOC);
+        return buffer;
+    }
+
+    public int getType(byte[] bytes) {
+        return (bytes[MSG_TYPE_LOC] & 0xC0) >> 6;
+    } //상위 2비트 획득
+
+    public int getCmd(byte[] bytes) {
+        return bytes[MSG_TYPE_LOC];
+    }
+
+    public int getSeq(byte[] bytes) {
+        return bytes[MSG_SEQ_LOC];
+    }
+
+    public static int getByteToInt(ByteBuffer buffer) {
+        return buffer.get() & 0xff;
+    }
+
+    public static int getShortToInt(ByteBuffer buffer) {
+        return buffer.getShort() & 0xffff;
+    }
+
+    public static int getIntToInt(ByteBuffer buffer) {
+        return buffer.getInt();
+    }
+
+    public static byte[] getBytes(ByteBuffer buffer, int limit) {
+        ByteBuffer data = ByteBuffer.allocate(MSG_LEN);
+        int orgPos = buffer.position();
+        int orgLimit = buffer.limit();
+        buffer.limit(buffer.position() + limit);
+        data.put(buffer);
+        buffer.position(orgPos);
+        buffer.limit(orgLimit);
+        return data.array();
+    }
+
+    // CRC 체크
+    static byte getCRC(byte[] data, int length) {
+        int i = 0;
+        byte crc = 0;
+        while (length-- != 0) {
+            crc = crc_table[(crc ^ data[i]) & 0xFF];
+            i++;
+        }
+        return crc;
+    }
+
+    // 패킷 결함 체크
+    public static int defect(byte[] bytes) {
+        int result = 0;
+        if (bytes[0] != SOP && bytes[0] != SOP_BIG) {
+            // Start Code Check
+            result = 98;
+        } else if ((bytes[0] == SOP && bytes.length != MSG_LEN) ||
+            (bytes[0] == SOP_BIG && bytes.length != MSG_LEN_BIG)) {
+            // 패킷 길이 체크
+            result = 97;
+        } else if (bytes[bytes.length - 1] != getCRC(bytes, bytes.length - 1)) {
+            // CRC 체크
+            result = 99;
+        }
+        return result;
+    }
+
+    public byte[] encode(int msgSeq) { return new byte[0]; }
+
+
+    public static String toHex(byte[] bytes) {
+        StringBuilder sb = new StringBuilder();
+        for (final byte b : bytes)
+            sb.append(String.format("%02x ", b & 0xff));
+        return sb.toString();
+    }
+
+    public static String toNarrowHex(byte[] packet) {
+        StringBuilder sb = new StringBuilder();
+        for (final byte b : packet)
+            sb.append(String.format("%02x", b & 0xff));
+        return sb.toString();
+    }
+
+    public void handleMessage(byte[] data) { }
+
+    public String getFriendlyName() {
+        return "UNKNOWN_PACKET";
+    }
+
+    public Boolean isSuccInquireResponseResult(int result) {
+        boolean isSuccess = false;
+        switch (result) {
+            case 16 :
+                isSuccess =  true;
+                break;
+            case 17 :
+                aapsLogger.error(LTag.PUMPCOMM, "Packet CRC error");
+                break;
+
+            case 18 :
+                aapsLogger.error(LTag.PUMPCOMM, "Parameter error.");
+                break;
+
+            case 19 :
+                aapsLogger.error(LTag.PUMPCOMM, "Protocol specification error.");
+                break;
+
+            default:
+                aapsLogger.error(LTag.PUMPCOMM, "System error.");
+                break;
+        }
+        return isSuccess;
+    }
+
+    public Boolean isSuccSettingResponseResult(int result) {
+        boolean isSuccess = false;
+        switch (result) {
+            case 0:
+                isSuccess = true;
+                break;
+            case 1:
+                aapsLogger.error(LTag.PUMPCOMM, "Packet CRC error");
+                break;
+
+            case 2:
+                aapsLogger.error(LTag.PUMPCOMM, "Parameter error.");
+                break;
+
+            case 3:
+                aapsLogger.error(LTag.PUMPCOMM, "Protocol specification error.");
+                break;
+
+            case 4:
+                aapsLogger.error(LTag.PUMPCOMM, "Eating timeout, not injectable.");
+                break;
+
+            case 6:
+                aapsLogger.error(LTag.PUMPCOMM, "Pump canceled it.");
+                break;
+
+            case 7:
+                aapsLogger.error(LTag.PUMPCOMM, "In the midst of other operations, limited app setup capabilities");
+                break;
+
+            case 8:
+                aapsLogger.error(LTag.PUMPCOMM, "During another bolus injection, injection is restricted");
+                break;
+
+            case 9:
+                aapsLogger.error(LTag.PUMPCOMM, "Basal release is required.");
+                break;
+
+            case 10:
+                aapsLogger.error(LTag.PUMPCOMM, "Canceled due to the opt number did not match.");
+                break;
+
+            case 11:
+                aapsLogger.error(LTag.PUMPCOMM, "Injection is not possible due to low battery.");
+                break;
+
+            case 12:
+                aapsLogger.error(LTag.PUMPCOMM, "Injection is not possible due to low insulin. ");
+                break;
+
+            case 13:
+                aapsLogger.error(LTag.PUMPCOMM, "Can't inject due to 1 time limit exceeded.");
+                break;
+
+            case 14:
+                aapsLogger.error(LTag.PUMPCOMM, "It cannot be injected due to an excess of injection volume today");
+                break;
+
+            case 15:
+                aapsLogger.error(LTag.PUMPCOMM, "After base setting is completed, base injection can be made.");
+                break;
+
+            case 32:
+                aapsLogger.error(LTag.PUMPCOMM, "During LGS running, injection is restricted");
+                break;
+
+            case 33:
+                aapsLogger.error(LTag.PUMPCOMM, "LGS status is ON, ON Command is declined.");
+                break;
+
+            case 34:
+                aapsLogger.error(LTag.PUMPCOMM, "LGS status is OFF, OFF Command is declined.");
+                break;
+
+            case 35:
+                aapsLogger.error(LTag.PUMPCOMM, "Tempbasal start is rejected  when tempbasal is running");
+                break;
+
+            case 36:
+                aapsLogger.error(LTag.PUMPCOMM, "Tempbasal stop is rejected  when tempbasal is not running");
+                break;
+
+            default:
+                aapsLogger.error(LTag.PUMPCOMM, "It cannot be set to a system error.");
+                break;
+
+        }
+        return isSuccess;
+    }
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/DiaconnG8ResponseMessageHashTable.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/DiaconnG8ResponseMessageHashTable.kt
new file mode 100644
index 0000000000..5c6c984e14
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/DiaconnG8ResponseMessageHashTable.kt
@@ -0,0 +1,53 @@
+package info.nightscout.androidaps.diaconn.packet
+
+import dagger.android.HasAndroidInjector
+import java.util.*
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class DiaconnG8ResponseMessageHashTable @Inject constructor(val injector: HasAndroidInjector) {
+    var messages: HashMap<Int, DiaconnG8Packet> = HashMap()
+
+    fun put(message: DiaconnG8Packet) {
+        messages[message.msgType.toInt()] = message
+    }
+
+    fun findMessage(command: Int): DiaconnG8Packet {
+        return messages[command] ?: DiaconnG8Packet(injector)
+    }
+
+    init {
+        put(BigMainInfoInquireResponsePacket(injector))
+        put(BigAPSMainInfoInquireResponsePacket(injector))
+        put(BigLogInquireResponsePacket(injector))
+        put(InjectionSnackInquireResponsePacket(injector))
+        put(SneckLimitInquireResponsePacket(injector))
+        put(BasalLimitInquireResponsePacket(injector))
+        put(TempBasalInquireResponsePacket(injector))
+        put(TimeInquirePacket(injector))
+        put(TimeInquireResponsePacket(injector))
+        put(TimeReportPacket(injector))
+        put(LogStatusInquireResponsePacket(injector))
+        put(IncarnationInquireResponsePacket(injector))
+        put(BolusSpeedInquireResponsePacket(injector))
+        put(SoundInquireResponsePacket(injector))
+        put(DisplayTimeInquireResponsePacket(injector))
+        put(LanguageInquireResponsePacket(injector))
+
+
+        // Report Packet
+        put(BasalPauseReportPacket(injector))
+        put(BasalSettingReportPacket(injector))
+        put(ConfirmReportPacket(injector))
+        put(InjectionBasalReportPacket(injector))
+        put(RejectReportPacket(injector))
+        put(TempBasalReportPacket(injector))
+        put(InjectionSnackResultReportPacket(injector))
+        put(InjectionExtendedBolusResultReportPacket(injector))
+        put(InsulinLackReportPacket(injector))
+        put(BatteryWarningReportPacket(injector))
+        put(InjectionBlockReportPacket(injector))
+        put(BolusSpeedSettingReportPacket(injector))
+    }
+}
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/DiaconnG8SettingResponseMessageHashTable.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/DiaconnG8SettingResponseMessageHashTable.kt
new file mode 100644
index 0000000000..cd2d32a293
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/DiaconnG8SettingResponseMessageHashTable.kt
@@ -0,0 +1,36 @@
+package info.nightscout.androidaps.diaconn.packet
+
+import dagger.android.HasAndroidInjector
+import java.util.*
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class DiaconnG8SettingResponseMessageHashTable @Inject constructor(val injector: HasAndroidInjector) {
+    var messages: HashMap<Int, DiaconnG8Packet> = HashMap()
+
+    fun put(message: DiaconnG8Packet) {
+        messages[message.msgType.toInt()] = message
+    }
+
+    fun findMessage(command: Int): DiaconnG8Packet {
+        return messages[command] ?: DiaconnG8Packet(injector)
+    }
+
+    init {
+        put(AppCancelSettingResponsePacket(injector))
+        put(AppConfirmSettingResponsePacket(injector))
+        put(BasalPauseSettingResponsePacket(injector))
+        put(BasalSettingResponsePacket(injector))
+        put(TempBasalSettingResponsePacket(injector))
+        put(TimeSettingResponsePacket(injector))
+        put(InjectionBasalSettingResponsePacket(injector))
+        put(InjectionSnackSettingResponsePacket(injector))
+        put(InjectionExtendedBolusSettingResponsePacket(injector))
+        put(InjectionCancelSettingResponsePacket(injector))
+        put(SoundSettingResponsePacket(injector))
+        put(DisplayTimeoutSettingResponsePacket(injector))
+        put(LanguageSettingResponsePacket(injector))
+        put(BolusSpeedSettingResponsePacket(injector))
+    }
+}
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
new file mode 100644
index 0000000000..3d9f9d2769
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/DisplayTimeInquirePacket.kt
@@ -0,0 +1,30 @@
+package info.nightscout.androidaps.diaconn.packet
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.diaconn.DiaconnG8Pump
+import info.nightscout.androidaps.logging.LTag
+import javax.inject.Inject
+
+/**
+ * DisplayTimeInquirePacket
+ */
+class DisplayTimeInquirePacket(
+    injector: HasAndroidInjector
+) : DiaconnG8Packet(injector ) {
+
+    @Inject lateinit var diaconnG8Pump: DiaconnG8Pump
+
+    init {
+        msgType = 0x4E.toByte()
+        aapsLogger.debug(LTag.PUMPCOMM, "DisplayTimeInquirePacket request")
+    }
+
+    override fun encode(msgSeq:Int): ByteArray {
+        val buffer = prefixEncode(msgType, msgSeq, MSG_CON_END)
+        return suffixEncode(buffer)
+    }
+
+    override fun getFriendlyName(): String {
+        return "PUMP_DISPLAY_TIME_INQUIRE"
+    }
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/DisplayTimeInquireResponsePacket.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/DisplayTimeInquireResponsePacket.kt
new file mode 100644
index 0000000000..5d1b7df047
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/DisplayTimeInquireResponsePacket.kt
@@ -0,0 +1,45 @@
+package info.nightscout.androidaps.diaconn.packet
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.diaconn.DiaconnG8Pump
+import info.nightscout.androidaps.logging.LTag
+import javax.inject.Inject
+
+/**
+ * DisplayTimeInquireResponsePacket
+ */
+class DisplayTimeInquireResponsePacket(injector: HasAndroidInjector) : DiaconnG8Packet(injector ) {
+
+    @Inject lateinit var diaconnG8Pump: DiaconnG8Pump
+
+    init {
+        msgType = 0x8E.toByte()
+        aapsLogger.debug(LTag.PUMPCOMM, "DisplayTimeInquireResponsePacket init")
+    }
+
+    override fun handleMessage(data: ByteArray?) {
+        val result = defect(data)
+        if (result != 0) {
+            aapsLogger.debug(LTag.PUMPCOMM, "DisplayTimeInquireResponsePacket Got some Error")
+            failed = true
+            return
+        } else failed = false
+
+        val bufferData = prefixDecode(data)
+        val result2 =  getByteToInt(bufferData)
+        if(!isSuccInquireResponseResult(result2)) {
+            failed = true
+            return
+        }
+
+        diaconnG8Pump.lcdOnTimeSec =  getByteToInt(bufferData)
+
+
+        aapsLogger.debug(LTag.PUMPCOMM, "Result --> ${diaconnG8Pump.result}")
+        aapsLogger.debug(LTag.PUMPCOMM, "lcdOnTimeSec --> ${diaconnG8Pump.lcdOnTimeSec}")
+    }
+
+    override fun getFriendlyName(): String {
+        return "PUMP_DISPLAY_TIME_INQUIRE_RESPONSE"
+    }
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/DisplayTimeoutSettingPacket.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/DisplayTimeoutSettingPacket.kt
new file mode 100644
index 0000000000..bbd462cc0c
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/DisplayTimeoutSettingPacket.kt
@@ -0,0 +1,32 @@
+package info.nightscout.androidaps.diaconn.packet
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.diaconn.DiaconnG8Pump
+import info.nightscout.androidaps.logging.LTag
+import javax.inject.Inject
+
+/**
+ * DisplayTimeoutSettingPacket
+ */
+class DisplayTimeoutSettingPacket(
+    injector: HasAndroidInjector,
+    private var type: Int
+) : DiaconnG8Packet(injector ) {
+
+    @Inject lateinit var diaconnG8Pump: DiaconnG8Pump
+
+    init {
+        msgType = 0x0E
+        aapsLogger.debug(LTag.PUMPCOMM, "DisplayTimeoutSettingPacket init")
+    }
+
+    override fun encode(msgSeq:Int): ByteArray {
+        val buffer = prefixEncode(msgType, msgSeq, MSG_CON_END)
+        buffer.put(type.toByte()) // cmd
+        return suffixEncode(buffer)
+    }
+
+    override fun getFriendlyName(): String {
+        return "PUMP_DISPLAY_TIMEOUT_SETTING_PACKET"
+    }
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/DisplayTimeoutSettingResponsePacket.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/DisplayTimeoutSettingResponsePacket.kt
new file mode 100644
index 0000000000..d3a1aff191
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/DisplayTimeoutSettingResponsePacket.kt
@@ -0,0 +1,46 @@
+package info.nightscout.androidaps.diaconn.packet
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.diaconn.DiaconnG8Pump
+import info.nightscout.androidaps.logging.LTag
+import javax.inject.Inject
+
+/**
+ * DisplayTimeoutSettingResponsePacket
+ */
+class DisplayTimeoutSettingResponsePacket(
+    injector: HasAndroidInjector
+) : DiaconnG8Packet(injector ) {
+
+    @Inject lateinit var diaconnG8Pump: DiaconnG8Pump
+    var result = 0
+    init {
+        msgType = 0x8E.toByte()
+        aapsLogger.debug(LTag.PUMPCOMM, "DisplayTimeoutSettingResponsePacket init ")
+    }
+
+    override fun handleMessage(data: ByteArray?) {
+        val defectCheck = defect(data)
+        if (defectCheck != 0) {
+            aapsLogger.debug(LTag.PUMPCOMM, "DisplayTimeoutSettingResponsePacket Got some Error")
+            failed = true
+            return
+        } else failed = false
+
+        val bufferData = prefixDecode(data)
+        result = getByteToInt(bufferData)
+
+        if(!isSuccSettingResponseResult(result)) {
+            diaconnG8Pump.resultErrorCode = result
+            failed = true
+            return
+        }
+        diaconnG8Pump.otpNumber =  getIntToInt(bufferData)
+        aapsLogger.debug(LTag.PUMPCOMM, "Result --> $result")
+        aapsLogger.debug(LTag.PUMPCOMM, "otpNumber --> ${diaconnG8Pump.otpNumber}")
+    }
+
+    override fun getFriendlyName(): String {
+        return "PUMP_DISPLAY_TIMEOUT_SETTING_RESPONSE"
+    }
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/IncarnationInquirePacket.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/IncarnationInquirePacket.kt
new file mode 100644
index 0000000000..34f99c6ff6
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/IncarnationInquirePacket.kt
@@ -0,0 +1,29 @@
+package info.nightscout.androidaps.diaconn.packet
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.diaconn.DiaconnG8Pump
+import info.nightscout.androidaps.logging.LTag
+import javax.inject.Inject
+
+/**
+
+ * IncarnationInquirePacket
+ */
+class IncarnationInquirePacket(
+    injector: HasAndroidInjector
+) : DiaconnG8Packet(injector ) {
+    @Inject lateinit var diaconnG8Pump: DiaconnG8Pump
+    init {
+        msgType = 0x7A
+        aapsLogger.debug(LTag.PUMPCOMM, "IncarnationInquirePacket init")
+    }
+
+    override fun encode(msgSeq:Int): ByteArray {
+        val buffer = prefixEncode(msgType, msgSeq, MSG_CON_END)
+        return suffixEncode(buffer)
+    }
+
+    override fun getFriendlyName(): String {
+        return "PUMP_INCARNATION_INQUIRE"
+    }
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/IncarnationInquireResponsePacket.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/IncarnationInquireResponsePacket.kt
new file mode 100644
index 0000000000..55aedbcf05
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/IncarnationInquireResponsePacket.kt
@@ -0,0 +1,50 @@
+package info.nightscout.androidaps.diaconn.packet
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.diaconn.DiaconnG8Pump
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import info.nightscout.androidaps.utils.sharedPreferences.SP
+import javax.inject.Inject
+
+/**
+ * IncarnationInquireResponsePacket
+ */
+open class IncarnationInquireResponsePacket(
+    injector: HasAndroidInjector
+) : DiaconnG8Packet(injector ) {
+
+    @Inject lateinit var diaconnG8Pump: DiaconnG8Pump
+    @Inject lateinit var sp: SP
+    @Inject lateinit var resourceHelper: ResourceHelper
+
+    var result = 0
+    init {
+        msgType = 0xBA.toByte()
+        aapsLogger.debug(LTag.PUMPCOMM, "IncarnationInquireResponsePacket init")
+    }
+
+    override fun handleMessage(data: ByteArray?) {
+        val defectCheck = defect(data)
+        if (defectCheck != 0) {
+            aapsLogger.debug(LTag.PUMPCOMM, "IncarnationInquireResponsePacket Got some Error")
+            failed = true
+            return
+        } else failed = false
+
+        val bufferData = prefixDecode(data)
+        result =  getByteToInt(bufferData)
+        if(!isSuccInquireResponseResult(result)) {
+            failed = true
+            return
+        }
+        // 5. 로그상태 조회
+        diaconnG8Pump.pumpIncarnationNum = getShortToInt(bufferData) // 펌프 Incarnation 번호
+        aapsLogger.debug(LTag.PUMPCOMM, "Result --> $result")
+        aapsLogger.debug(LTag.PUMPCOMM, "pumpIncarnationNum > " + diaconnG8Pump.pumpIncarnationNum)
+    }
+
+    override fun getFriendlyName(): String {
+        return "PUMP_INCARNATION_INQUIRE_RESPONSE"
+    }
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InjectionBasalReportPacket.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InjectionBasalReportPacket.kt
new file mode 100644
index 0000000000..503c5bacb1
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InjectionBasalReportPacket.kt
@@ -0,0 +1,37 @@
+package info.nightscout.androidaps.diaconn.packet
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.diaconn.DiaconnG8Pump
+import info.nightscout.androidaps.logging.LTag
+import javax.inject.Inject
+
+/**
+ * InjectionBasalReportPacket
+ */
+class InjectionBasalReportPacket(
+    injector: HasAndroidInjector
+) : DiaconnG8Packet(injector ) {
+
+    @Inject lateinit var diaconnG8Pump: DiaconnG8Pump
+    init {
+        msgType = 0xCC.toByte()
+        aapsLogger.debug(LTag.PUMPCOMM, "InjectionBasalReportPacket init ")
+    }
+
+    override fun handleMessage(data: ByteArray?) {
+        val defectCheck = defect(data)
+        if (defectCheck != 0) {
+            aapsLogger.debug(LTag.PUMPCOMM, "InjectionBasalReportPacket Got some Error")
+            failed = true
+            return
+        } else failed = false
+
+        val bufferData = prefixDecode(data)
+        diaconnG8Pump.systemBasePattern =  getByteToInt(bufferData)
+        aapsLogger.debug(LTag.PUMPCOMM, "Pump Report BasalPattern --> ${diaconnG8Pump.systemBasePattern} (1:basic, 2: life1 , 3: life2 , 4: life3 , 5:dr1, 6:dr2) ")
+    }
+
+    override fun getFriendlyName(): String {
+        return "PUMP_INJECTION_BASAL_REPORT"
+    }
+}
\ No newline at end of file
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
new file mode 100644
index 0000000000..a912b284d7
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InjectionBasalSettingPacket.kt
@@ -0,0 +1,31 @@
+package info.nightscout.androidaps.diaconn.packet
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.diaconn.DiaconnG8Pump
+import info.nightscout.androidaps.logging.LTag
+import javax.inject.Inject
+
+/**
+ * InjectionBasalSettingPacket
+ */
+class InjectionBasalSettingPacket(
+    injector: HasAndroidInjector,
+    private val pattern:Int
+) : DiaconnG8Packet(injector ) {
+
+    @Inject lateinit var diaconnG8Pump: DiaconnG8Pump
+    init {
+        msgType = 0x0C.toByte()
+        aapsLogger.debug(LTag.PUMPCOMM, "InjectionBasalSettingPacket init ")
+    }
+
+    override fun encode(msgSeq:Int): ByteArray {
+        val buffer = prefixEncode(msgType, msgSeq, MSG_CON_END)
+        buffer.put(pattern.toByte())
+        return suffixEncode(buffer)
+    }
+
+    override fun getFriendlyName(): String {
+        return "PUMP_INJECTION_BASAL_SETTING"
+    }
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InjectionBasalSettingResponsePacket.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InjectionBasalSettingResponsePacket.kt
new file mode 100644
index 0000000000..921b7cfdf8
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InjectionBasalSettingResponsePacket.kt
@@ -0,0 +1,47 @@
+package info.nightscout.androidaps.diaconn.packet
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.diaconn.DiaconnG8Pump
+import info.nightscout.androidaps.logging.LTag
+import javax.inject.Inject
+
+/**
+ * InjectionBasalSettingResponsePacket
+ */
+class InjectionBasalSettingResponsePacket(
+    injector: HasAndroidInjector
+) : DiaconnG8Packet(injector ) {
+
+    @Inject lateinit var diaconnG8Pump: DiaconnG8Pump
+    var result = 0
+    init {
+        msgType = 0x8C.toByte()
+        aapsLogger.debug(LTag.PUMPCOMM, "InjectionBasalSettingResponsePacket init ")
+    }
+
+    override fun handleMessage(data: ByteArray?) {
+        val defectCheck = defect(data)
+        if (defectCheck != 0) {
+            aapsLogger.debug(LTag.PUMPCOMM, "InjectionBasalSettingResponsePacket Got some Error")
+            failed = true
+            return
+        } else failed = false
+
+        val bufferData = prefixDecode(data)
+        result = getByteToInt(bufferData)
+
+        if(!isSuccSettingResponseResult(result)) {
+            diaconnG8Pump.resultErrorCode = result
+            failed = true
+            return
+        }
+        diaconnG8Pump.otpNumber =  getIntToInt(bufferData)
+
+        aapsLogger.debug(LTag.PUMPCOMM, "Result --> $result")
+        aapsLogger.debug(LTag.PUMPCOMM, "otpNumber --> ${diaconnG8Pump.otpNumber}")
+    }
+
+    override fun getFriendlyName(): String {
+        return "PUMP_INJECTION_BASAL_SETTING_RESPONSE"
+    }
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InjectionBlockReportPacket.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InjectionBlockReportPacket.kt
new file mode 100644
index 0000000000..0ff1cd6181
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InjectionBlockReportPacket.kt
@@ -0,0 +1,45 @@
+package info.nightscout.androidaps.diaconn.packet
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.diaconn.DiaconnG8Pump
+import info.nightscout.androidaps.logging.LTag
+import javax.inject.Inject
+
+/**
+ * InjectionBlockReportPacket
+ */
+class InjectionBlockReportPacket(
+    injector: HasAndroidInjector
+) : DiaconnG8Packet(injector ) {
+
+    @Inject lateinit var diaconnG8Pump: DiaconnG8Pump
+
+    init {
+        msgType = 0xD8.toByte()
+        aapsLogger.debug(LTag.PUMPCOMM, "InjectionBlockReportPacket init ")
+    }
+
+    override fun handleMessage(data: ByteArray?) {
+        val defectCheck = defect(data)
+        if (defectCheck != 0) {
+            aapsLogger.debug(LTag.PUMPCOMM, "InjectionBasalReportPacket Got some Error")
+            failed = true
+            return
+        } else failed = false
+
+        val bufferData = prefixDecode(data)
+        diaconnG8Pump.injectionBlockGrade = getByteToInt(bufferData)
+        diaconnG8Pump.injectionBlockProcess = getByteToInt(bufferData)
+        diaconnG8Pump.injectionBlockRemainAmount = getShortToInt(bufferData) / 100.0
+        diaconnG8Pump.injectionBlockType =  getByteToInt(bufferData)
+
+        aapsLogger.debug(LTag.PUMPCOMM, "injectionBlockGrade --> ${diaconnG8Pump.injectionBlockGrade} (1:info, 2: warning , 3: major , 4: critical)")
+        aapsLogger.debug(LTag.PUMPCOMM, "injectionBlockProcess --> ${diaconnG8Pump.injectionBlockProcess} (1:skip, 2: stop , 3: ignore ) ")
+        aapsLogger.debug(LTag.PUMPCOMM, "injectionBlockReaminAmount --> ${diaconnG8Pump.injectionBlockRemainAmount}  ")
+        aapsLogger.debug(LTag.PUMPCOMM, "injectionBlockType --> ${diaconnG8Pump.injectionBlockType} (1:basal, 2: meal , 3: normal , 4: square , 5:dual, 6:tube, 7:needle) ")
+    }
+
+    override fun getFriendlyName(): String {
+        return "PUMP_INJECTION_BLOCK_REPORT"
+    }
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InjectionCancelSettingPacket.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InjectionCancelSettingPacket.kt
new file mode 100644
index 0000000000..b883154ad9
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InjectionCancelSettingPacket.kt
@@ -0,0 +1,32 @@
+package info.nightscout.androidaps.diaconn.packet
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.diaconn.DiaconnG8Pump
+import info.nightscout.androidaps.logging.LTag
+import javax.inject.Inject
+
+/**
+ * InjectionCancelSettingPacket
+ */
+class InjectionCancelSettingPacket(
+    injector: HasAndroidInjector,
+    private var reqMsgType: Byte, // 명령코드
+) : DiaconnG8Packet(injector ) {
+
+    @Inject lateinit var diaconnG8Pump: DiaconnG8Pump
+
+    init {
+        msgType = 0x2B
+        aapsLogger.debug(LTag.PUMPCOMM, "InjectionCancelSettingPacket INIT")
+    }
+
+    override fun encode(msgSeq:Int): ByteArray {
+        val buffer = prefixEncode(msgType, msgSeq, MSG_CON_END)
+        buffer.put(reqMsgType)
+        return suffixEncode(buffer)
+    }
+
+    override fun getFriendlyName(): String {
+        return "PUMP_INJECTION_CANCEL_SETTING_REQUEST"
+    }
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InjectionCancelSettingResponsePacket.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InjectionCancelSettingResponsePacket.kt
new file mode 100644
index 0000000000..922198207d
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InjectionCancelSettingResponsePacket.kt
@@ -0,0 +1,46 @@
+package info.nightscout.androidaps.diaconn.packet
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.diaconn.DiaconnG8Pump
+import info.nightscout.androidaps.logging.LTag
+import javax.inject.Inject
+
+/**
+ * InjectionCancelSettingResponsePacket
+ */
+class InjectionCancelSettingResponsePacket(
+    injector: HasAndroidInjector
+) : DiaconnG8Packet(injector ) {
+
+    @Inject lateinit var diaconnG8Pump: DiaconnG8Pump
+    var result = 0
+    init {
+        msgType = 0xAB.toByte()
+        aapsLogger.debug(LTag.PUMPCOMM, "InjectionCancelSettingResponsePacket init ")
+    }
+
+    override fun handleMessage(data: ByteArray?) {
+        val defectCheck = defect(data)
+        if (defectCheck != 0) {
+            aapsLogger.debug(LTag.PUMPCOMM, "InjectionCancelSettingResponsePacket Got some Error")
+            failed = true
+            return
+        } else failed = false
+
+        val bufferData = prefixDecode(data)
+        result = getByteToInt(bufferData)
+
+        if(!isSuccSettingResponseResult(result)) {
+            diaconnG8Pump.resultErrorCode = result
+            failed = true
+            return
+        }
+        diaconnG8Pump.otpNumber =  getIntToInt(bufferData)
+        aapsLogger.debug(LTag.PUMPCOMM, "Result --> $result")
+        aapsLogger.debug(LTag.PUMPCOMM, "otpNumber --> ${diaconnG8Pump.otpNumber}")
+    }
+
+    override fun getFriendlyName(): String {
+        return "PUMP_INJECTION_CANCEL_SETTING_RESPONSE"
+    }
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InjectionExtendedBolusResultReportPacket.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InjectionExtendedBolusResultReportPacket.kt
new file mode 100644
index 0000000000..53f2f6e96e
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InjectionExtendedBolusResultReportPacket.kt
@@ -0,0 +1,56 @@
+package info.nightscout.androidaps.diaconn.packet
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.diaconn.DiaconnG8Pump
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import javax.inject.Inject
+
+/**
+ * InjectionExtendedBolusResultReportPacket
+ */
+class InjectionExtendedBolusResultReportPacket(injector: HasAndroidInjector) : DiaconnG8Packet(injector ) {
+
+    @Inject lateinit var diaconnG8Pump: DiaconnG8Pump
+    @Inject lateinit var rxBus: RxBusWrapper
+    @Inject lateinit var resourceHelper: ResourceHelper
+
+    init {
+        msgType = 0xe5.toByte()
+        aapsLogger.debug(LTag.PUMPCOMM, "InjectionExtendedBolusResultReportPacket init ")
+    }
+
+    override fun handleMessage(data: ByteArray?) {
+        val defectCheck = defect(data)
+        if (defectCheck != 0) {
+            aapsLogger.debug(LTag.PUMPCOMM, "InjectionExtendedBolusResultReportPacket Got some Error")
+            failed = true
+            return
+        } else failed = false
+
+        val bufferData = prefixDecode(data)
+
+        val result = getByteToInt(bufferData) // 0: success , 1: user stop, 2:fail
+        val settingMinutes = getShortToInt(bufferData)
+        val elapsedTime = getShortToInt(bufferData)
+        val bolusAmountToBeDelivered  = getShortToInt(bufferData) / 100.0
+        val deliveredBolusAmount = getShortToInt(bufferData) / 100.0
+
+        diaconnG8Pump.isExtendedInProgress = result == 0
+        diaconnG8Pump.squareTime = settingMinutes
+        diaconnG8Pump.squareInjTime = elapsedTime
+        diaconnG8Pump.squareAmount = bolusAmountToBeDelivered
+        diaconnG8Pump.squareInjAmount = deliveredBolusAmount
+
+        aapsLogger.debug(LTag.PUMPCOMM, "Result: $result")
+        aapsLogger.debug(LTag.PUMPCOMM, "Extended bolus running: " + diaconnG8Pump.squareAmount + " U/h")
+        aapsLogger.debug(LTag.PUMPCOMM, "Extended bolus duration: " + diaconnG8Pump.squareTime + " min")
+        aapsLogger.debug(LTag.PUMPCOMM, "Extended bolus so far: " + diaconnG8Pump.squareInjTime + " min")
+        aapsLogger.debug(LTag.PUMPCOMM, "Extended bolus delivered so far: " + diaconnG8Pump.squareInjAmount + " U")
+    }
+
+    override fun getFriendlyName(): String {
+        return "PUMP_INJECTION_EXTENDED_BOLUS_RESULT_REPORT"
+    }
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InjectionExtendedBolusSettingPacket.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InjectionExtendedBolusSettingPacket.kt
new file mode 100644
index 0000000000..e9f119862a
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InjectionExtendedBolusSettingPacket.kt
@@ -0,0 +1,35 @@
+package info.nightscout.androidaps.diaconn.packet
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.diaconn.DiaconnG8Pump
+import info.nightscout.androidaps.logging.LTag
+import javax.inject.Inject
+
+/**
+ * InjectionExtendedBolusSettingPacket
+ */
+class InjectionExtendedBolusSettingPacket(
+    injector: HasAndroidInjector,
+    private val amount: Int,
+    private val minutes: Int,
+    private val bcDttm:Long
+) : DiaconnG8Packet(injector ) {
+
+    @Inject lateinit var diaconnG8Pump: DiaconnG8Pump
+    init {
+        msgType = 0x08.toByte()
+        aapsLogger.debug(LTag.PUMPCOMM, "InjectionExtendedBolusSettingPacket init ")
+    }
+
+    override fun encode(msgSeq:Int): ByteArray {
+        val buffer = prefixEncode(msgType, msgSeq, MSG_CON_END)
+        buffer.putShort(minutes.toShort())
+        buffer.putShort(amount.toShort())
+        buffer.putInt(bcDttm.toInt())
+        return suffixEncode(buffer)
+    }
+
+    override fun getFriendlyName(): String {
+        return "PUMP_INJECTION_EXTENDED_BOLUS_SETTING"
+    }
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InjectionExtendedBolusSettingResponsePacket.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InjectionExtendedBolusSettingResponsePacket.kt
new file mode 100644
index 0000000000..051612ba2c
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InjectionExtendedBolusSettingResponsePacket.kt
@@ -0,0 +1,46 @@
+package info.nightscout.androidaps.diaconn.packet
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.diaconn.DiaconnG8Pump
+import info.nightscout.androidaps.logging.LTag
+import javax.inject.Inject
+
+/**
+ * InjectionExtendedBolusSettingResponsePacket
+ */
+class InjectionExtendedBolusSettingResponsePacket(
+    injector: HasAndroidInjector
+) : DiaconnG8Packet(injector ) {
+
+    @Inject lateinit var diaconnG8Pump: DiaconnG8Pump
+    var result = 0
+    init {
+        msgType = 0x88.toByte()
+        aapsLogger.debug(LTag.PUMPCOMM, "InjectionExtendedBolusSettingResponsePacket init ")
+    }
+
+    override fun handleMessage(data: ByteArray?) {
+        val defectCheck = defect(data)
+        if (defectCheck != 0) {
+            aapsLogger.debug(LTag.PUMPCOMM, "InjectionExtendedBolusSettingResponsePacket Got some Error")
+            failed = true
+            return
+        } else failed = false
+
+        val bufferData = prefixDecode(data)
+        result = getByteToInt(bufferData)
+
+        if(!isSuccSettingResponseResult(result)) {
+            diaconnG8Pump.resultErrorCode = result
+            failed = true
+            return
+        }
+        diaconnG8Pump.otpNumber =  getIntToInt(bufferData)
+        aapsLogger.debug(LTag.PUMPCOMM, "Result --> $result")
+        aapsLogger.debug(LTag.PUMPCOMM, "otpNumber --> ${diaconnG8Pump.otpNumber}")
+    }
+
+    override fun getFriendlyName(): String {
+        return "PUMP_INJECTION_EXTENDED_BOLUS_SETTING_RESPONSE"
+    }
+}
\ No newline at end of file
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
new file mode 100644
index 0000000000..5460a2de20
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InjectionMealSettingPacket.kt
@@ -0,0 +1,33 @@
+package info.nightscout.androidaps.diaconn.packet
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.diaconn.DiaconnG8Pump
+import info.nightscout.androidaps.logging.LTag
+import javax.inject.Inject
+
+/**
+ * InjectionMealSettingPacket
+ */
+class InjectionMealSettingPacket(
+    injector: HasAndroidInjector,
+    private val amount:Int,
+    private val bcDttm:Long
+) : DiaconnG8Packet(injector ) {
+
+    @Inject lateinit var diaconnG8Pump: DiaconnG8Pump
+    init {
+        msgType = 0x06.toByte()
+        aapsLogger.debug(LTag.PUMPCOMM, "InjectionMealSettingPacket init ")
+    }
+
+    override fun encode(msgSeq:Int): ByteArray {
+        val buffer = prefixEncode(msgType, msgSeq, MSG_CON_END)
+        buffer.putShort(amount.toShort())
+        buffer.putLong(bcDttm)
+        return suffixEncode(buffer)
+    }
+
+    override fun getFriendlyName(): String {
+        return "PUMP_INJECTION_MEAL_SETTING"
+    }
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InjectionMealSettingResponsePacket.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InjectionMealSettingResponsePacket.kt
new file mode 100644
index 0000000000..802e95985e
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InjectionMealSettingResponsePacket.kt
@@ -0,0 +1,46 @@
+package info.nightscout.androidaps.diaconn.packet
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.diaconn.DiaconnG8Pump
+import info.nightscout.androidaps.logging.LTag
+import javax.inject.Inject
+
+/**
+ * InjectionMealSettingResponsePacket
+ */
+class InjectionMealSettingResponsePacket(
+    injector: HasAndroidInjector
+) : DiaconnG8Packet(injector ) {
+
+    @Inject lateinit var diaconnG8Pump: DiaconnG8Pump
+    var result = 0
+    init {
+        msgType = 0x86.toByte()
+        aapsLogger.debug(LTag.PUMPCOMM, "InjectionMealSettingResponsePacket init ")
+    }
+
+    override fun handleMessage(data: ByteArray?) {
+        val defectCheck = defect(data)
+        if (defectCheck != 0) {
+            aapsLogger.debug(LTag.PUMPCOMM, "InjectionMealSettingResponsePacket Got some Error")
+            failed = true
+            return
+        } else failed = false
+
+        val bufferData = prefixDecode(data)
+        result = getByteToInt(bufferData)
+
+        if(!isSuccSettingResponseResult(result)) {
+            diaconnG8Pump.resultErrorCode = result
+            failed = true
+            return
+        }
+        diaconnG8Pump.otpNumber =  getIntToInt(bufferData)
+        aapsLogger.debug(LTag.PUMPCOMM, "Result --> $result")
+        aapsLogger.debug(LTag.PUMPCOMM, "otpNumber --> ${diaconnG8Pump.otpNumber}")
+    }
+
+    override fun getFriendlyName(): String {
+        return "PUMP_INJECTION_MEAL_SETTING_RESPONSE"
+    }
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InjectionSnackInquirePacket.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InjectionSnackInquirePacket.kt
new file mode 100644
index 0000000000..a9e82f1953
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InjectionSnackInquirePacket.kt
@@ -0,0 +1,26 @@
+package info.nightscout.androidaps.diaconn.packet
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.diaconn.DiaconnG8Pump
+import info.nightscout.androidaps.logging.LTag
+import javax.inject.Inject
+
+/**
+ * InjectionSneckInquirePacket
+ */
+class InjectionSnackInquirePacket(injector: HasAndroidInjector) : DiaconnG8Packet(injector ) {
+
+    @Inject lateinit var diaconnG8Pump: DiaconnG8Pump
+    init {
+        msgType = 0x47.toByte()
+        aapsLogger.debug(LTag.PUMPCOMM, "InjectionSnackInquirePacket init ")
+    }
+
+    override fun encode(msgSeq:Int): ByteArray {
+        return suffixEncode(prefixEncode(msgType, msgSeq, MSG_CON_END))
+    }
+
+    override fun getFriendlyName(): String {
+        return "PUMP_INJECTION_SNACK_INQUIRE"
+    }
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InjectionSnackInquireResponsePacket.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InjectionSnackInquireResponsePacket.kt
new file mode 100644
index 0000000000..4ff2b27c9e
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InjectionSnackInquireResponsePacket.kt
@@ -0,0 +1,51 @@
+package info.nightscout.androidaps.diaconn.packet
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.diaconn.DiaconnG8Pump
+import info.nightscout.androidaps.logging.LTag
+import javax.inject.Inject
+
+/**
+ * InjectionSnackInquireResponsePacket
+ */
+class InjectionSnackInquireResponsePacket(injector: HasAndroidInjector) : DiaconnG8Packet(injector ) {
+
+    @Inject lateinit var diaconnG8Pump: DiaconnG8Pump
+
+    init {
+        msgType = 0x87.toByte()
+        aapsLogger.debug(LTag.PUMPCOMM, "InjectionSnackInquireResponsePacket init")
+    }
+
+    override fun handleMessage(data: ByteArray?) {
+        val result = defect(data)
+        if (result != 0) {
+            aapsLogger.debug(LTag.PUMPCOMM, "InjectionSnackInquireResponsePacket Got some Error")
+            failed = true
+            return
+        } else failed = false
+
+        val bufferData = prefixDecode(data)
+        val result2 =  getByteToInt(bufferData)
+
+        if(!isSuccInquireResponseResult(result2)) {
+            failed = true
+            return
+        }
+
+        diaconnG8Pump.snackStatus = getByteToInt(bufferData) //주입상태
+        diaconnG8Pump.snackAmount = getShortToInt(bufferData) / 100.0 // 주입설정량
+        diaconnG8Pump.snackInjAmount = getShortToInt(bufferData) / 100.0 // 현재주입량
+        diaconnG8Pump.snackSpeed = getByteToInt(bufferData) //주입속도
+
+        aapsLogger.debug(LTag.PUMPCOMM, "Result --> $result2")
+        aapsLogger.debug(LTag.PUMPCOMM, "snackStatus > " + diaconnG8Pump.snackStatus)
+        aapsLogger.debug(LTag.PUMPCOMM, "snackAmount > " + diaconnG8Pump.snackAmount)
+        aapsLogger.debug(LTag.PUMPCOMM, "snackInjAmount > " + diaconnG8Pump.snackInjAmount)
+        aapsLogger.debug(LTag.PUMPCOMM, "snackSpeed > " + diaconnG8Pump.snackSpeed)
+    }
+
+    override fun getFriendlyName(): String {
+        return "PUMP_INJECTION_SNACK_INQUIRE_RESPONSE"
+    }
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InjectionSnackResultReportPacket.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InjectionSnackResultReportPacket.kt
new file mode 100644
index 0000000000..a85c35002b
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InjectionSnackResultReportPacket.kt
@@ -0,0 +1,60 @@
+package info.nightscout.androidaps.diaconn.packet
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.diaconn.DiaconnG8Pump
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.utils.DateUtil
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import javax.inject.Inject
+
+/**
+ * InjectionSnackResultReportPacket
+ */
+class InjectionSnackResultReportPacket(injector: HasAndroidInjector) : DiaconnG8Packet(injector ) {
+
+    @Inject lateinit var diaconnG8Pump: DiaconnG8Pump
+    @Inject lateinit var rxBus: RxBusWrapper
+    @Inject lateinit var resourceHelper: ResourceHelper
+
+    init {
+        msgType = 0xe4.toByte()
+        aapsLogger.debug(LTag.PUMPCOMM, "InjectionSnackResultReportPacket init ")
+    }
+
+    override fun handleMessage(data: ByteArray?) {
+        val defectCheck = defect(data)
+        if (defectCheck != 0) {
+            aapsLogger.debug(LTag.PUMPCOMM, "InjectionSnackResultReportPacket Got some Error")
+            failed = true
+            return
+        } else failed = false
+
+        val bufferData = prefixDecode(data)
+        val result = getByteToInt(bufferData)
+        val bolusAmountToBeDelivered = getShortToInt(bufferData)/100.0
+        val deliveredBolusAmount  = getShortToInt(bufferData)/100.0
+
+        diaconnG8Pump.bolusAmountToBeDelivered = bolusAmountToBeDelivered
+        diaconnG8Pump.lastBolusAmount = deliveredBolusAmount
+        diaconnG8Pump.lastBolusTime = dateUtil.now()
+        diaconnG8Pump.bolusingTreatment?.insulin = deliveredBolusAmount
+
+        if(result == 1) {
+            diaconnG8Pump.bolusStopped = true // 주입 중 취소 처리!
+        }
+        diaconnG8Pump.bolusDone = true // 주입완료 처리!
+
+        aapsLogger.debug(LTag.PUMPCOMM, "Result --> $result")
+        aapsLogger.debug(LTag.PUMPCOMM, "bolusAmountToBeDelivered --> ${diaconnG8Pump.bolusAmountToBeDelivered}")
+        aapsLogger.debug(LTag.PUMPCOMM, "lastBolusAmount --> ${diaconnG8Pump.lastBolusAmount}")
+        aapsLogger.debug(LTag.PUMPCOMM, "lastBolusTime --> ${diaconnG8Pump.lastBolusTime}")
+        aapsLogger.debug(LTag.PUMPCOMM, "diaconnG8Pump.bolusingTreatment?.insulin --> ${diaconnG8Pump.bolusingTreatment?.insulin}")
+        aapsLogger.debug(LTag.PUMPCOMM, "bolusDone --> ${diaconnG8Pump.bolusDone}")
+    }
+
+    override fun getFriendlyName(): String {
+        return "PUMP_INJECTION_SNACK_REPORT"
+
+    }
+}
\ No newline at end of file
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
new file mode 100644
index 0000000000..a3b80bba6a
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InjectionSnackSettingPacket.kt
@@ -0,0 +1,31 @@
+package info.nightscout.androidaps.diaconn.packet
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.diaconn.DiaconnG8Pump
+import info.nightscout.androidaps.logging.LTag
+import javax.inject.Inject
+
+/**
+ * InjectionSnackSettingPacket
+ */
+class InjectionSnackSettingPacket(
+    injector: HasAndroidInjector,
+    private val amount:Int
+) : DiaconnG8Packet(injector ) {
+
+    @Inject lateinit var diaconnG8Pump: DiaconnG8Pump
+    init {
+        msgType = 0x07.toByte()
+        aapsLogger.debug(LTag.PUMPCOMM, "InjectionSnackSettingPacket init ")
+    }
+
+    override fun encode(msgSeq:Int): ByteArray {
+        val buffer = prefixEncode(msgType, msgSeq, MSG_CON_END)
+        buffer.putShort(amount.toShort())
+        return suffixEncode(buffer)
+    }
+
+    override fun getFriendlyName(): String {
+        return "PUMP_INJECTION_SNACK_SETTING"
+    }
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InjectionSnackSettingResponsePacket.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InjectionSnackSettingResponsePacket.kt
new file mode 100644
index 0000000000..aa60b70c1a
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InjectionSnackSettingResponsePacket.kt
@@ -0,0 +1,46 @@
+package info.nightscout.androidaps.diaconn.packet
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.diaconn.DiaconnG8Pump
+import info.nightscout.androidaps.logging.LTag
+import javax.inject.Inject
+
+/**
+ * InjectionSnackSettingResponsePacket
+ */
+class InjectionSnackSettingResponsePacket(
+    injector: HasAndroidInjector
+) : DiaconnG8Packet(injector ) {
+
+    @Inject lateinit var diaconnG8Pump: DiaconnG8Pump
+    var result = 0
+    init {
+        msgType = 0x87.toByte()
+        aapsLogger.debug(LTag.PUMPCOMM, "InjectionSnackSettingResponsePacket init ")
+    }
+
+    override fun handleMessage(data: ByteArray?) {
+        val defectCheck = defect(data)
+        if (defectCheck != 0) {
+            aapsLogger.debug(LTag.PUMPCOMM, "InjectionSnackSettingResponsePacket Got some Error")
+            failed = true
+            return
+        } else failed = false
+
+        val bufferData = prefixDecode(data)
+        result = getByteToInt(bufferData)
+
+        if(!isSuccSettingResponseResult(result)) {
+            diaconnG8Pump.resultErrorCode = result
+            failed = true
+            return
+        }
+        diaconnG8Pump.otpNumber =  getIntToInt(bufferData)
+        aapsLogger.debug(LTag.PUMPCOMM, "Result --> $result")
+        aapsLogger.debug(LTag.PUMPCOMM, "otpNumber --> ${diaconnG8Pump.otpNumber}")
+    }
+
+    override fun getFriendlyName(): String {
+        return "PUMP_INJECTION_SNACK_SETTING_RESPONSE"
+    }
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InsulinLackReportPacket.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InsulinLackReportPacket.kt
new file mode 100644
index 0000000000..8fd6da5981
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InsulinLackReportPacket.kt
@@ -0,0 +1,44 @@
+package info.nightscout.androidaps.diaconn.packet
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.diaconn.DiaconnG8Pump
+import info.nightscout.androidaps.logging.LTag
+import javax.inject.Inject
+
+/**
+ * InsulinLackReportPacket
+ */
+class InsulinLackReportPacket(
+    injector: HasAndroidInjector
+) : DiaconnG8Packet(injector ) {
+
+    @Inject lateinit var diaconnG8Pump: DiaconnG8Pump
+
+    init {
+        msgType = 0xD8.toByte()
+        aapsLogger.debug(LTag.PUMPCOMM, "InsulinLackReportPacket init ")
+    }
+
+    override fun handleMessage(data: ByteArray?) {
+        val defectCheck = defect(data)
+        if (defectCheck != 0) {
+            aapsLogger.debug(LTag.PUMPCOMM, "InsulinLackReportPacket Got some Error")
+            failed = true
+            return
+        } else failed = false
+
+        val bufferData = prefixDecode(data)
+        diaconnG8Pump.insulinWarningGrade = getByteToInt(bufferData)
+        diaconnG8Pump.insulinWarningProcess = getByteToInt(bufferData)
+        diaconnG8Pump.insulinWarningRemain = getByteToInt(bufferData)
+
+        aapsLogger.debug(LTag.PUMPCOMM, "insulinWarningGrade --> ${diaconnG8Pump.insulinWarningGrade} (1:info, 2: warning , 3: major , 4: critical)")
+        aapsLogger.debug(LTag.PUMPCOMM, "insulinWarningProcess --> ${diaconnG8Pump.insulinWarningProcess} (1:skip, 2: stop , 3: ignore ) ")
+        aapsLogger.debug(LTag.PUMPCOMM, "insulinWarningRemain --> ${diaconnG8Pump.insulinWarningRemain} (0~100%) ")
+
+    }
+
+    override fun getFriendlyName(): String {
+        return "PUMP_INJECTION_LACK_REPORT"
+    }
+}
\ No newline at end of file
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
new file mode 100644
index 0000000000..d727abd40f
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/LanguageInquirePacket.kt
@@ -0,0 +1,30 @@
+package info.nightscout.androidaps.diaconn.packet
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.diaconn.DiaconnG8Pump
+import info.nightscout.androidaps.logging.LTag
+import javax.inject.Inject
+
+/**
+ * LanguageInquirePacket
+ */
+class LanguageInquirePacket(
+    injector: HasAndroidInjector
+) : DiaconnG8Packet(injector ) {
+
+    @Inject lateinit var diaconnG8Pump: DiaconnG8Pump
+
+    init {
+        msgType = 0x60.toByte()
+        aapsLogger.debug(LTag.PUMPCOMM, "LanguageInquirePacket init")
+    }
+
+    override fun encode(msgSeq:Int): ByteArray {
+        val buffer = prefixEncode(msgType, msgSeq, MSG_CON_END)
+        return suffixEncode(buffer)
+    }
+
+    override fun getFriendlyName(): String {
+        return "PUMP_LANGUAGE_INQUIRE"
+    }
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/LanguageInquireResponsePacket.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/LanguageInquireResponsePacket.kt
new file mode 100644
index 0000000000..6c493ca145
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/LanguageInquireResponsePacket.kt
@@ -0,0 +1,44 @@
+package info.nightscout.androidaps.diaconn.packet
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.diaconn.DiaconnG8Pump
+import info.nightscout.androidaps.logging.LTag
+import javax.inject.Inject
+
+/**
+ * LanguageInquireResponsePacket
+ */
+class LanguageInquireResponsePacket(injector: HasAndroidInjector) : DiaconnG8Packet(injector ) {
+
+    @Inject lateinit var diaconnG8Pump: DiaconnG8Pump
+
+    init {
+        msgType = 0xA0.toByte()
+        aapsLogger.debug(LTag.PUMPCOMM, "LanguageInquireResponsePacket init")
+    }
+
+    override fun handleMessage(data: ByteArray?) {
+        val result = defect(data)
+        if (result != 0) {
+            aapsLogger.debug(LTag.PUMPCOMM, "LanguageInquireResponsePacket Got some Error")
+            failed = true
+            return
+        } else failed = false
+
+        val bufferData = prefixDecode(data)
+        val result2 =  getByteToInt(bufferData)
+        if(!isSuccInquireResponseResult(result2)) {
+            failed = true
+            return
+        }
+        diaconnG8Pump.selectedLanguage =  getByteToInt(bufferData)
+
+
+        aapsLogger.debug(LTag.PUMPCOMM, "Result --> ${diaconnG8Pump.result}")
+        aapsLogger.debug(LTag.PUMPCOMM, "selectedLanguage --> ${diaconnG8Pump.selectedLanguage}")
+    }
+
+    override fun getFriendlyName(): String {
+        return "PUMP_LANGUAGE_INQUIRE_RESPONSE"
+    }
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/LanguageSettingPacket.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/LanguageSettingPacket.kt
new file mode 100644
index 0000000000..fd0f35f1cc
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/LanguageSettingPacket.kt
@@ -0,0 +1,32 @@
+package info.nightscout.androidaps.diaconn.packet
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.diaconn.DiaconnG8Pump
+import info.nightscout.androidaps.logging.LTag
+import javax.inject.Inject
+
+/**
+ * LanguageSettingPacket
+ */
+class LanguageSettingPacket(
+    injector: HasAndroidInjector,
+    private var type: Int
+) : DiaconnG8Packet(injector ) {
+
+    @Inject lateinit var diaconnG8Pump: DiaconnG8Pump
+
+    init {
+        msgType = 0x20
+        aapsLogger.debug(LTag.PUMPCOMM, "LanguageSettingPacket init")
+    }
+
+    override fun encode(msgSeq:Int): ByteArray {
+        val buffer = prefixEncode(msgType, msgSeq, MSG_CON_END)
+        buffer.put(type.toByte()) // 명령코드
+        return suffixEncode(buffer)
+    }
+
+    override fun getFriendlyName(): String {
+        return "PUMP_LANGUAGE_SETTING"
+    }
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/LanguageSettingResponsePacket.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/LanguageSettingResponsePacket.kt
new file mode 100644
index 0000000000..4a560dd979
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/LanguageSettingResponsePacket.kt
@@ -0,0 +1,47 @@
+package info.nightscout.androidaps.diaconn.packet
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.diaconn.DiaconnG8Pump
+import info.nightscout.androidaps.logging.LTag
+import javax.inject.Inject
+
+/**
+ * LanguageSettingResponsePacket
+ */
+class LanguageSettingResponsePacket(
+    injector: HasAndroidInjector
+) : DiaconnG8Packet(injector ) {
+
+    @Inject lateinit var diaconnG8Pump: DiaconnG8Pump
+    var result = 0
+    init {
+        msgType = 0xA0.toByte()
+        aapsLogger.debug(LTag.PUMPCOMM, "LanguageSettingResponsePacket init")
+    }
+
+    override fun handleMessage(data: ByteArray?) {
+        val defectCheck = defect(data)
+        if (defectCheck != 0) {
+            aapsLogger.debug(LTag.PUMPCOMM, "LanguageSettingResponsePacket Got some Error")
+            failed = true
+            return
+        } else failed = false
+
+        val bufferData = prefixDecode(data)
+        result =  getByteToInt(bufferData)
+
+        if(!isSuccSettingResponseResult(result)) {
+            diaconnG8Pump.resultErrorCode = result
+            failed = true
+            return
+        }
+
+        diaconnG8Pump.otpNumber =  getIntToInt(bufferData)
+        aapsLogger.debug(LTag.PUMPCOMM, "Result --> $result")
+        aapsLogger.debug(LTag.PUMPCOMM, "otpNumber --> ${diaconnG8Pump.otpNumber}")
+    }
+
+    override fun getFriendlyName(): String {
+        return "PUMP_LANGUAGE_SETTING_RESPONSE"
+    }
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/LogStatusInquirePacket.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/LogStatusInquirePacket.kt
new file mode 100644
index 0000000000..29f5823037
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/LogStatusInquirePacket.kt
@@ -0,0 +1,28 @@
+package info.nightscout.androidaps.diaconn.packet
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.diaconn.DiaconnG8Pump
+import info.nightscout.androidaps.logging.LTag
+import javax.inject.Inject
+
+/**
+ * LogStatusInquirePacket
+ */
+class LogStatusInquirePacket(
+    injector: HasAndroidInjector
+) : DiaconnG8Packet(injector ) {
+    @Inject lateinit var diaconnG8Pump: DiaconnG8Pump
+    init {
+        msgType = 0x56
+        aapsLogger.debug(LTag.PUMPCOMM, "LogStatusInquirePacket INIT")
+    }
+
+    override fun encode(msgSeq:Int): ByteArray {
+        val buffer = prefixEncode(msgType, msgSeq, MSG_CON_END)
+        return suffixEncode(buffer)
+    }
+
+    override fun getFriendlyName(): String {
+        return "PUMP_LOG_STATUS_INQUIRE"
+    }
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/LogStatusInquireResponsePacket.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/LogStatusInquireResponsePacket.kt
new file mode 100644
index 0000000000..441afe753e
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/LogStatusInquireResponsePacket.kt
@@ -0,0 +1,49 @@
+package info.nightscout.androidaps.diaconn.packet
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.diaconn.DiaconnG8Pump
+import info.nightscout.androidaps.logging.LTag
+import javax.inject.Inject
+
+/**
+ * LogStatusInquireResponsePacket
+ */
+open class LogStatusInquireResponsePacket(
+    injector: HasAndroidInjector
+) : DiaconnG8Packet(injector ) {
+
+    @Inject lateinit var diaconnG8Pump: DiaconnG8Pump
+
+    var result = 0
+    init {
+        msgType = 0x96.toByte()
+        aapsLogger.debug(LTag.PUMPCOMM, "LogStatusInquireResponsePacket init")
+    }
+
+    override fun handleMessage(data: ByteArray?) {
+        val defectCheck = defect(data)
+        if (defectCheck != 0) {
+            aapsLogger.debug(LTag.PUMPCOMM, "LogStatusInquireResponsePacket Got some Error")
+            failed = true
+            return
+        } else failed = false
+
+        val bufferData = prefixDecode(data)
+        result =  getByteToInt(bufferData)
+        if(!isSuccInquireResponseResult(result)) {
+            failed = true
+            return
+        }
+        // 5. 로그상태 조회
+        diaconnG8Pump.pumpLastLogNum = getShortToInt(bufferData) // 마지막 저장로그번호
+        diaconnG8Pump.pumpWrappingCount = getByteToInt(bufferData) // wrapping 카운트
+
+        aapsLogger.debug(LTag.PUMPCOMM, "Result --> $result")
+        aapsLogger.debug(LTag.PUMPCOMM, "pumpLastLogNum > " + diaconnG8Pump.pumpLastLogNum)
+        aapsLogger.debug(LTag.PUMPCOMM, "pumpWrappingCount> " + diaconnG8Pump.pumpWrappingCount)
+    }
+
+    override fun getFriendlyName(): String {
+        return "PUMP_LOG_STATUS_INQUIRE_RESPONSE"
+    }
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/RejectReportPacket.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/RejectReportPacket.kt
new file mode 100644
index 0000000000..7c8871b0f6
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/RejectReportPacket.kt
@@ -0,0 +1,41 @@
+package info.nightscout.androidaps.diaconn.packet
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.diaconn.DiaconnG8Pump
+import info.nightscout.androidaps.logging.LTag
+import javax.inject.Inject
+
+/**
+ * RejectReportPacket
+ */
+class RejectReportPacket(
+    injector: HasAndroidInjector
+) : DiaconnG8Packet(injector ) {
+
+    @Inject lateinit var diaconnG8Pump: DiaconnG8Pump
+    var reqMsgType:Int? = null
+    var reason:Int? = null
+    init {
+        msgType = 0xE2.toByte()
+        aapsLogger.debug(LTag.PUMPCOMM, "RejectReportPacket init ")
+    }
+
+    override fun handleMessage(data: ByteArray?) {
+        val defectCheck = defect(data)
+        if (defectCheck != 0) {
+            aapsLogger.debug(LTag.PUMPCOMM, "RejectReportPacket Got some Error")
+            failed = true
+            return
+        } else failed = false
+
+        val bufferData = prefixDecode(data)
+        reqMsgType =  getByteToInt(bufferData)
+        reason =  getByteToInt(bufferData)
+        aapsLogger.debug(LTag.PUMPCOMM, "reqMsgType --> $reqMsgType")
+        aapsLogger.debug(LTag.PUMPCOMM, "Reject Reason --> $reason (6:cancel, 10:timeout) ")
+    }
+
+    override fun getFriendlyName(): String {
+        return "PUMP_REJECT_REPORT"
+    }
+}
\ No newline at end of file
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
new file mode 100644
index 0000000000..d4357b1554
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/SneckLimitInquirePacket.kt
@@ -0,0 +1,30 @@
+package info.nightscout.androidaps.diaconn.packet
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.diaconn.DiaconnG8Pump
+import info.nightscout.androidaps.logging.LTag
+import javax.inject.Inject
+
+/**
+ * SneckLimitInquirePacket
+ */
+class SneckLimitInquirePacket(
+    injector: HasAndroidInjector
+) : DiaconnG8Packet(injector ) {
+
+    @Inject lateinit var diaconnG8Pump: DiaconnG8Pump
+
+    init {
+        msgType = 0x50.toByte()
+        aapsLogger.debug(LTag.PUMPCOMM, "SneckLimitInquirePacket limit request")
+    }
+
+    override fun encode(msgSeq:Int): ByteArray {
+        val buffer = prefixEncode(msgType, msgSeq, MSG_CON_END)
+        return suffixEncode(buffer)
+    }
+
+    override fun getFriendlyName(): String {
+        return "PUMP_SNECK_LIMIT_REQUEST"
+    }
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/SneckLimitInquireResponsePacket.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/SneckLimitInquireResponsePacket.kt
new file mode 100644
index 0000000000..4dccca9ab1
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/SneckLimitInquireResponsePacket.kt
@@ -0,0 +1,47 @@
+package info.nightscout.androidaps.diaconn.packet
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.diaconn.DiaconnG8Pump
+import info.nightscout.androidaps.logging.LTag
+import javax.inject.Inject
+
+/**
+ * SneckLimitInquireResponsePacket
+ */
+class SneckLimitInquireResponsePacket(injector: HasAndroidInjector) : DiaconnG8Packet(injector ) {
+
+    @Inject lateinit var diaconnG8Pump: DiaconnG8Pump
+
+    init {
+        msgType = 0x90.toByte()
+        aapsLogger.debug(LTag.PUMPCOMM, "SneckLimitInquireResponsePacket init")
+    }
+
+    override fun handleMessage(data: ByteArray?) {
+        val result = defect(data)
+        if (result != 0) {
+            aapsLogger.debug(LTag.PUMPCOMM, "SneckLimitInquireResponsePacket Got some Error")
+            failed = true
+            return
+        } else failed = false
+
+        val bufferData = prefixDecode(data)
+        val result2 =  getByteToInt(bufferData)
+        if(!isSuccInquireResponseResult(result2)) {
+            failed = true
+            return
+        }
+
+        diaconnG8Pump.maxBolus =  getShortToInt(bufferData).toDouble() / 100
+        diaconnG8Pump.maxBolusePerDay =  getShortToInt(bufferData).toDouble() / 100
+
+
+        aapsLogger.debug(LTag.PUMPCOMM, "Result --> ${diaconnG8Pump.result}")
+        aapsLogger.debug(LTag.PUMPCOMM, "maxBolusePerDay --> ${diaconnG8Pump.maxBolusePerDay}")
+        aapsLogger.debug(LTag.PUMPCOMM, "maxBolus --> ${diaconnG8Pump.maxBolus}")
+    }
+
+    override fun getFriendlyName(): String {
+        return "PUMP_SNACK_LIMIT_INQUIRE_RESPONSE"
+    }
+}
\ No newline at end of file
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
new file mode 100644
index 0000000000..883fc8b283
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/SoundInquirePacket.kt
@@ -0,0 +1,30 @@
+package info.nightscout.androidaps.diaconn.packet
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.diaconn.DiaconnG8Pump
+import info.nightscout.androidaps.logging.LTag
+import javax.inject.Inject
+
+/**
+ * SoundInquirePacket
+ */
+class SoundInquirePacket(
+    injector: HasAndroidInjector
+) : DiaconnG8Packet(injector ) {
+
+    @Inject lateinit var diaconnG8Pump: DiaconnG8Pump
+
+    init {
+        msgType = 0x4D.toByte()
+        aapsLogger.debug(LTag.PUMPCOMM, "SoundInquirePacket request")
+    }
+
+    override fun encode(msgSeq:Int): ByteArray {
+        val buffer = prefixEncode(msgType, msgSeq, MSG_CON_END)
+        return suffixEncode(buffer)
+    }
+
+    override fun getFriendlyName(): String {
+        return "PUMP_SOUND_INQUIRE"
+    }
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/SoundInquireResponsePacket.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/SoundInquireResponsePacket.kt
new file mode 100644
index 0000000000..c42a20e835
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/SoundInquireResponsePacket.kt
@@ -0,0 +1,47 @@
+package info.nightscout.androidaps.diaconn.packet
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.diaconn.DiaconnG8Pump
+import info.nightscout.androidaps.logging.LTag
+import javax.inject.Inject
+
+/**
+ * SoundInquireResponsePacket
+ */
+class SoundInquireResponsePacket(injector: HasAndroidInjector) : DiaconnG8Packet(injector ) {
+
+    @Inject lateinit var diaconnG8Pump: DiaconnG8Pump
+
+    init {
+        msgType = 0x8D.toByte()
+        aapsLogger.debug(LTag.PUMPCOMM, "SoundInquireResponsePacket init")
+    }
+
+    override fun handleMessage(data: ByteArray?) {
+        val result = defect(data)
+        if (result != 0) {
+            aapsLogger.debug(LTag.PUMPCOMM, "SoundInquireResponsePacket Got some Error")
+            failed = true
+            return
+        } else failed = false
+
+        val bufferData = prefixDecode(data)
+        val result2 =  getByteToInt(bufferData)
+        if(!isSuccInquireResponseResult(result2)) {
+            failed = true
+            return
+        }
+
+        diaconnG8Pump.beepAndAlarm =  getByteToInt(bufferData) -1
+        diaconnG8Pump.alarmIntesity =  getByteToInt(bufferData) -1
+
+
+        aapsLogger.debug(LTag.PUMPCOMM, "Result --> ${diaconnG8Pump.result}")
+        aapsLogger.debug(LTag.PUMPCOMM, "beepAndAlarm --> ${diaconnG8Pump.beepAndAlarm}")
+        aapsLogger.debug(LTag.PUMPCOMM, "alarmIntesity --> ${diaconnG8Pump.alarmIntesity}")
+    }
+
+    override fun getFriendlyName(): String {
+        return "PUMP_SOUND_INQUIRE_RESPONSE"
+    }
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/SoundSettingPacket.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/SoundSettingPacket.kt
new file mode 100644
index 0000000000..cadb110435
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/SoundSettingPacket.kt
@@ -0,0 +1,34 @@
+package info.nightscout.androidaps.diaconn.packet
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.diaconn.DiaconnG8Pump
+import info.nightscout.androidaps.logging.LTag
+import javax.inject.Inject
+
+/**
+ * SoundSettingPacket
+ */
+class SoundSettingPacket(
+    injector: HasAndroidInjector,
+    private var type: Int, //
+    private var intensity: Int //
+) : DiaconnG8Packet(injector ) {
+
+    @Inject lateinit var diaconnG8Pump: DiaconnG8Pump
+
+    init {
+        msgType = 0x0D
+        aapsLogger.debug(LTag.PUMPCOMM, "SoundSettingPacket init")
+    }
+
+    override fun encode(msgSeq:Int): ByteArray {
+        val buffer = prefixEncode(msgType, msgSeq, MSG_CON_END)
+        buffer.put(type.toByte()) // 명령코드
+        buffer.put(intensity.toByte()) // 명령코드
+        return suffixEncode(buffer)
+    }
+
+    override fun getFriendlyName(): String {
+        return "PUMP_SOUND_SETTING"
+    }
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/SoundSettingResponsePacket.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/SoundSettingResponsePacket.kt
new file mode 100644
index 0000000000..fba733ee8c
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/SoundSettingResponsePacket.kt
@@ -0,0 +1,47 @@
+package info.nightscout.androidaps.diaconn.packet
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.diaconn.DiaconnG8Pump
+import info.nightscout.androidaps.logging.LTag
+import javax.inject.Inject
+
+/**
+ * SoundSettingResponsePacket
+ */
+class SoundSettingResponsePacket(
+    injector: HasAndroidInjector
+) : DiaconnG8Packet(injector ) {
+
+    @Inject lateinit var diaconnG8Pump: DiaconnG8Pump
+    var result = 0
+    init {
+        msgType = 0x8D.toByte()
+        aapsLogger.debug(LTag.PUMPCOMM, "SoundSettingResponsePacket init")
+    }
+
+    override fun handleMessage(data: ByteArray?) {
+        val defectCheck = defect(data)
+        if (defectCheck != 0) {
+            aapsLogger.debug(LTag.PUMPCOMM, "SoundSettingResponsePacket Got some Error")
+            failed = true
+            return
+        } else failed = false
+
+        val bufferData = prefixDecode(data)
+        result =  getByteToInt(bufferData)
+
+        if(!isSuccSettingResponseResult(result)) {
+            diaconnG8Pump.resultErrorCode = result
+            failed = true
+            return
+        }
+
+        diaconnG8Pump.otpNumber =  getIntToInt(bufferData)
+        aapsLogger.debug(LTag.PUMPCOMM, "Result --> $result")
+        aapsLogger.debug(LTag.PUMPCOMM, "otpNumber --> ${diaconnG8Pump.otpNumber}")
+    }
+
+    override fun getFriendlyName(): String {
+        return "PUMP_SOUND_SETTING_RESPONSE"
+    }
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/TempBasalInquirePacket.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/TempBasalInquirePacket.kt
new file mode 100644
index 0000000000..db1da7fc5a
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/TempBasalInquirePacket.kt
@@ -0,0 +1,29 @@
+package info.nightscout.androidaps.diaconn.packet
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.diaconn.DiaconnG8Pump
+import info.nightscout.androidaps.logging.LTag
+import javax.inject.Inject
+
+/**
+ * TempBasalInquirePacket
+ */
+class TempBasalInquirePacket(
+    injector: HasAndroidInjector
+) : DiaconnG8Packet(injector ) {
+
+    @Inject lateinit var diaconnG8Pump: DiaconnG8Pump
+
+    init {
+        msgType = 0x4A
+        aapsLogger.debug(LTag.PUMPCOMM, "TempBasalInquirePacket Init")
+    }
+
+    override fun encode(msgSeq:Int): ByteArray {
+        return suffixEncode(prefixEncode(msgType, msgSeq, MSG_CON_END))
+    }
+
+    override fun getFriendlyName(): String {
+        return "PUMP_TEMP_BASAL_INQUIRE_REQUEST"
+    }
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/TempBasalInquireResponsePacket.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/TempBasalInquireResponsePacket.kt
new file mode 100644
index 0000000000..2b6d5db384
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/TempBasalInquireResponsePacket.kt
@@ -0,0 +1,55 @@
+package info.nightscout.androidaps.diaconn.packet
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.diaconn.DiaconnG8Pump
+import info.nightscout.androidaps.interfaces.ActivePlugin
+import info.nightscout.androidaps.logging.LTag
+import javax.inject.Inject
+
+/**
+ * TempBasalInquireResponsePacket
+ */
+open class TempBasalInquireResponsePacket(
+    injector: HasAndroidInjector
+) : DiaconnG8Packet(injector ) {
+
+    @Inject lateinit var activePlugin: ActivePlugin
+    @Inject lateinit var diaconnG8Pump: DiaconnG8Pump
+
+    var result = 0
+    init {
+        msgType = 0x8A.toByte()
+        aapsLogger.debug(LTag.PUMPCOMM, "TempBasalInquireResponsePacket init")
+    }
+
+    override fun handleMessage(data: ByteArray?) {
+        val defectCheck = defect(data)
+        if (defectCheck != 0) {
+            aapsLogger.debug(LTag.PUMPCOMM, "TempBasalInquireResponsePacket Got some Error")
+            failed = true
+            return
+        } else failed = false
+
+        val bufferData = prefixDecode(data)
+        result =  getByteToInt(bufferData)
+        if(!isSuccInquireResponseResult(result)) {
+            failed = true
+            return
+        }
+
+        diaconnG8Pump.tbStatus = getByteToInt(bufferData) // 임시기저 상태
+        diaconnG8Pump.tbTime = getByteToInt(bufferData)    // 임시기저시간
+        diaconnG8Pump.tbInjectRateRatio = getShortToInt(bufferData) //임시기저 주입량/률
+        diaconnG8Pump.tbElapsedTime = getShortToInt(bufferData) // 임시기저 경과시간
+
+        aapsLogger.debug(LTag.PUMPCOMM, "Result --> $result")
+        aapsLogger.debug(LTag.PUMPCOMM, "tbStatus > " + diaconnG8Pump.tbStatus)
+        aapsLogger.debug(LTag.PUMPCOMM, "tbTime> " + diaconnG8Pump.tbTime)
+        aapsLogger.debug(LTag.PUMPCOMM, "tbInjectRateRatio > " + diaconnG8Pump.tbInjectRateRatio)
+        aapsLogger.debug(LTag.PUMPCOMM, "tbElapsedTime > " + diaconnG8Pump.tbElapsedTime)
+    }
+
+    override fun getFriendlyName(): String {
+        return "PUMP_TEMP_BASAL_INQUIRE_RESPONSE"
+    }
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/TempBasalReportPacket.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/TempBasalReportPacket.kt
new file mode 100644
index 0000000000..d2eec42bcd
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/TempBasalReportPacket.kt
@@ -0,0 +1,58 @@
+package info.nightscout.androidaps.diaconn.packet
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.diaconn.DiaconnG8Pump
+import info.nightscout.androidaps.interfaces.ActivePlugin
+import info.nightscout.androidaps.logging.LTag
+import javax.inject.Inject
+
+/**
+ * TempBasalReportPacket
+ */
+class TempBasalReportPacket(
+    injector: HasAndroidInjector
+) : DiaconnG8Packet(injector ) {
+
+    @Inject lateinit var activePlugin: ActivePlugin
+    @Inject lateinit var diaconnG8Pump: DiaconnG8Pump
+
+    init {
+        msgType = 0xCA.toByte()
+        aapsLogger.debug(LTag.PUMPCOMM, "TempBasalReportPacket init ")
+    }
+
+    override fun handleMessage(data: ByteArray?) {
+        val defectCheck = defect(data)
+        if (defectCheck != 0) {
+            aapsLogger.debug(LTag.PUMPCOMM, "TempBasalReportPacket Got some Error")
+            failed = true
+            return
+        } else failed = false
+
+        val bufferData = prefixDecode(data)
+        diaconnG8Pump.tbStatus = getByteToInt(bufferData)
+        //diaconnG8Pump.isTempBasalInProgress = diaconnG8Pump.tbStatus == 1
+
+        // 응답받은 임시기저 상태가 주입중이면, pump객체에 정보를 갱신.
+        // if(diaconnG8Pump.isTempBasalInProgress) {
+        //     diaconnG8Pump.tbTime =  getByteToInt(bufferData)
+        //     diaconnG8Pump.tbInjectRateRatio =  getShortToInt(bufferData)
+        //     if (diaconnG8Pump.tbInjectRateRatio >= 50000) {
+        //         diaconnG8Pump.tempBasalPercent = diaconnG8Pump.tbInjectRateRatio - 50000
+        //     }
+        //
+        //     if(diaconnG8Pump.tbInjectRateRatio in 1000..1600) {
+        //         diaconnG8Pump.tbInjectAbsoluteValue = (diaconnG8Pump.tbInjectRateRatio -1000) / 100.0
+        //         diaconnG8Pump.tempBasalAbsoluteRate = diaconnG8Pump.tbInjectAbsoluteValue
+        //     }
+        // }
+        aapsLogger.debug(LTag.PUMPCOMM, "tbStatus > " + diaconnG8Pump.tbStatus)
+        aapsLogger.debug(LTag.PUMPCOMM, "tbTime> " + diaconnG8Pump.tbTime)
+        aapsLogger.debug(LTag.PUMPCOMM, "tbInjectRateRatio > " + diaconnG8Pump.tbInjectRateRatio)
+
+    }
+
+    override fun getFriendlyName(): String {
+        return "PUMP_TEMP_BASAL_REPORT"
+    }
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/TempBasalSettingPacket.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/TempBasalSettingPacket.kt
new file mode 100644
index 0000000000..b935ce2a94
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/TempBasalSettingPacket.kt
@@ -0,0 +1,44 @@
+package info.nightscout.androidaps.diaconn.packet
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.diaconn.DiaconnG8Pump
+import info.nightscout.androidaps.logging.LTag
+import javax.inject.Inject
+
+/**
+ * TempBasalSettingPacket
+ */
+class TempBasalSettingPacket(
+    injector: HasAndroidInjector,
+    private var status: Int, // (1:tempbasal running, 2:tempbasal dismissed)
+    private var time: Int,  //hour group (1=00~05, 2=06~11, 3=12~17, 4=18~23)
+    private var injectRateRatio: Int
+) : DiaconnG8Packet(injector ) {
+
+    @Inject lateinit var diaconnG8Pump: DiaconnG8Pump
+
+    init {
+        msgType = 0x0A
+        aapsLogger.debug(LTag.PUMPCOMM, "TempBasalSettingPacket Init")
+    }
+
+    override fun encode(msgSeq:Int): ByteArray {
+        val buffer =  prefixEncode(msgType, msgSeq, MSG_CON_END)
+        val apsSecond = 946652400L //fixed value 2000-01-01 00:00:00 (second)
+        buffer.put(status.toByte()) // status
+        buffer.put(time.toByte())
+        buffer.putShort(injectRateRatio.toShort()) // 임시기저 주입량/률  1000(0.00U)~1600(6.00U), 50000(0%)~50200(200%), 50000이상이면 주입률로 판정
+        buffer.putLong(apsSecond) // TB_DTTM
+
+        aapsLogger.debug(LTag.PUMPCOMM, "         status --> ${status.toByte()} (1:tempbasal running, 2:tempbasal dismissed)")
+        aapsLogger.debug(LTag.PUMPCOMM, "           time --> ${time.toByte()} ( value : 2~96 ( 2:30min, 3:45min....96:1440min )  30min ~ 24 hour, step 15min ) ")
+        aapsLogger.debug(LTag.PUMPCOMM, "injectRateRatio --> $injectRateRatio , toShort = ${injectRateRatio.toShort()}")
+        aapsLogger.debug(LTag.PUMPCOMM, "         tbDttm --> $apsSecond ")
+
+        return suffixEncode(buffer)
+    }
+
+    override fun getFriendlyName(): String {
+        return "PUMP_TEMP_BASAL_SETTING"
+    }
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/TempBasalSettingResponsePacket.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/TempBasalSettingResponsePacket.kt
new file mode 100644
index 0000000000..3ef1cf5668
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/TempBasalSettingResponsePacket.kt
@@ -0,0 +1,47 @@
+package info.nightscout.androidaps.diaconn.packet
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.diaconn.DiaconnG8Pump
+import info.nightscout.androidaps.logging.LTag
+import javax.inject.Inject
+
+/**
+ * TempBasalSettingResponsePacket
+ */
+class TempBasalSettingResponsePacket(
+    injector: HasAndroidInjector
+) : DiaconnG8Packet(injector ) {
+
+    @Inject lateinit var diaconnG8Pump: DiaconnG8Pump
+    var result = 0
+    init {
+        msgType = 0x8A.toByte()
+        aapsLogger.debug(LTag.PUMPCOMM, "TempBasalSettingResponsePacket init")
+    }
+
+    override fun handleMessage(data: ByteArray?) {
+        val defectCheck = defect(data)
+        if (defectCheck != 0) {
+            aapsLogger.debug(LTag.PUMPCOMM, "TempBasalSettingResponsePacket Got some Error")
+            failed = true
+            return
+        } else failed = false
+
+        val bufferData = prefixDecode(data)
+        result =  getByteToInt(bufferData)
+
+        if(!isSuccSettingResponseResult(result)) {
+            diaconnG8Pump.resultErrorCode = result
+            failed = true
+            return
+        }
+
+        diaconnG8Pump.otpNumber =  getIntToInt(bufferData)
+        aapsLogger.debug(LTag.PUMPCOMM, "Result --> $result")
+        aapsLogger.debug(LTag.PUMPCOMM, "otpNumber --> ${diaconnG8Pump.otpNumber}")
+    }
+
+    override fun getFriendlyName(): String {
+        return "PUMP_TEMP_BASAL_SETTING_RESPONSE"
+    }
+}
\ No newline at end of file
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
new file mode 100644
index 0000000000..2491bea781
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/TimeInquirePacket.kt
@@ -0,0 +1,30 @@
+package info.nightscout.androidaps.diaconn.packet
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.diaconn.DiaconnG8Pump
+import info.nightscout.androidaps.logging.LTag
+import javax.inject.Inject
+
+/**
+ * TimeInquirePacket
+ */
+class TimeInquirePacket(
+    injector: HasAndroidInjector
+) : DiaconnG8Packet(injector ) {
+
+    @Inject lateinit var diaconnG8Pump: DiaconnG8Pump
+
+    init {
+        msgType = 0x4F.toByte()
+        aapsLogger.debug(LTag.PUMPCOMM, "TimeInquirePacket init")
+    }
+
+    override fun encode(msgSeq:Int): ByteArray {
+        val buffer = prefixEncode(msgType, msgSeq, MSG_CON_END)
+        return suffixEncode(buffer)
+    }
+
+    override fun getFriendlyName(): String {
+        return "PUMP_TIME_REQUEST"
+    }
+}
\ No newline at end of file
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
new file mode 100644
index 0000000000..0e9436718d
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/TimeInquireResponsePacket.kt
@@ -0,0 +1,41 @@
+package info.nightscout.androidaps.diaconn.packet
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.diaconn.DiaconnG8Pump
+import info.nightscout.androidaps.logging.LTag
+import javax.inject.Inject
+
+/**
+ * TimeInquireResponsePacket
+ */
+class TimeInquireResponsePacket(
+    injector: HasAndroidInjector
+) : DiaconnG8Packet(injector ) {
+
+    @Inject lateinit var diaconnG8Pump: DiaconnG8Pump
+
+    init {
+        msgType = 0x50.toByte()
+        aapsLogger.debug(LTag.PUMPCOMM, "TimeInquireResponsePacket init")
+    }
+
+    override fun handleMessage(data: ByteArray?) {
+        val result = defect(data)
+        if (result != 0) {
+            aapsLogger.debug(LTag.PUMPCOMM, "TimeInquireResponsePacket Got some Error")
+            failed = true
+            return
+        } else failed = false
+
+        val bufferData = prefixDecode(data)
+        val result2 =  getByteToInt(bufferData)
+        if(!isSuccInquireResponseResult(result2)) {
+            failed = true
+            return
+        }
+    }
+
+    override fun getFriendlyName(): String {
+        return "PUMP_TIME_INQUIRE_RESPONSE"
+    }
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/TimeReportPacket.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/TimeReportPacket.kt
new file mode 100644
index 0000000000..2a284defe8
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/TimeReportPacket.kt
@@ -0,0 +1,49 @@
+package info.nightscout.androidaps.diaconn.packet
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.diaconn.DiaconnG8Pump
+import info.nightscout.androidaps.logging.LTag
+import javax.inject.Inject
+
+/**
+ * TimeReportPacket
+ */
+class TimeReportPacket(
+    injector: HasAndroidInjector
+) : DiaconnG8Packet(injector ) {
+
+    @Inject lateinit var diaconnG8Pump: DiaconnG8Pump
+    var result =0
+    init {
+        msgType = 0xCF.toByte()
+        aapsLogger.debug(LTag.PUMPCOMM, "TimeReportPacket init ")
+    }
+
+    override fun handleMessage(data: ByteArray?) {
+        val defectCheck = defect(data)
+        if (defectCheck != 0) {
+            aapsLogger.debug(LTag.PUMPCOMM, "TimeReportPacket Report Packet Got some Error")
+            failed = true
+            return
+        } else failed = false
+
+        val bufferData = prefixDecode(data)
+        diaconnG8Pump.year   = getByteToInt(bufferData) // yyyy
+        diaconnG8Pump.month  = getByteToInt(bufferData) // month
+        diaconnG8Pump.day    = getByteToInt(bufferData) // day
+        diaconnG8Pump.hour   = getByteToInt(bufferData) // hour
+        diaconnG8Pump.minute = getByteToInt(bufferData) // min
+        diaconnG8Pump.second = getByteToInt(bufferData) // second
+
+        aapsLogger.debug(LTag.PUMPCOMM, "year   --> ${diaconnG8Pump.year  }")
+        aapsLogger.debug(LTag.PUMPCOMM, "month  --> ${diaconnG8Pump.month }")
+        aapsLogger.debug(LTag.PUMPCOMM, "day    --> ${diaconnG8Pump.day   }")
+        aapsLogger.debug(LTag.PUMPCOMM, "hour   --> ${diaconnG8Pump.hour  }")
+        aapsLogger.debug(LTag.PUMPCOMM, "minute --> ${diaconnG8Pump.minute}")
+        aapsLogger.debug(LTag.PUMPCOMM, "second --> ${diaconnG8Pump.second}")
+    }
+
+    override fun getFriendlyName(): String {
+        return "PUMP_TIME_REPORT"
+    }
+}
\ No newline at end of file
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
new file mode 100644
index 0000000000..b67b96c623
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/TimeSettingPacket.kt
@@ -0,0 +1,43 @@
+package info.nightscout.androidaps.diaconn.packet
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.diaconn.DiaconnG8Pump
+import info.nightscout.androidaps.logging.LTag
+import org.joda.time.DateTime
+import org.joda.time.DateTimeZone
+import javax.inject.Inject
+
+/**
+ * TimeSettingPacket Request Packet
+ */
+class TimeSettingPacket(
+    injector: HasAndroidInjector,
+    private var time: Long = 0,
+    private var offset:Int = 0
+) : DiaconnG8Packet(injector ) {
+
+    @Inject lateinit var diaconnG8Pump: DiaconnG8Pump
+
+    init {
+        msgType = 0x0F
+        aapsLogger.debug(LTag.PUMPCOMM, "Time Sync between Phone and Pump")
+
+    }
+
+    override fun encode(msgSeq:Int): ByteArray {
+        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())
+        buffer.put((date.dayOfMonth and 0xff).toByte())
+        buffer.put((date.hourOfDay + offset and 0xff).toByte())
+        buffer.put((date.minuteOfHour and 0xff).toByte())
+        buffer.put((date.secondOfMinute and 0xff).toByte())
+
+        return suffixEncode(buffer)
+    }
+
+    override fun getFriendlyName(): String {
+        return "PUMP_TIME_SETTING_REQUEST"
+    }
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/TimeSettingResponsePacket.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/TimeSettingResponsePacket.kt
new file mode 100644
index 0000000000..75523537f8
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/TimeSettingResponsePacket.kt
@@ -0,0 +1,47 @@
+package info.nightscout.androidaps.diaconn.packet
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.diaconn.DiaconnG8Pump
+import info.nightscout.androidaps.logging.LTag
+import javax.inject.Inject
+
+/**
+ * TimeSettingResponsePacket
+ */
+class TimeSettingResponsePacket(
+    injector: HasAndroidInjector
+) : DiaconnG8Packet(injector ) {
+
+    @Inject lateinit var diaconnG8Pump: DiaconnG8Pump
+    var result = 0
+    init {
+        msgType = 0x8F.toByte()
+        aapsLogger.debug(LTag.PUMPCOMM, "TimeSettingResponsePacket init ")
+    }
+
+    override fun handleMessage(data: ByteArray?) {
+        val defectCheck = defect(data)
+        if (defectCheck != 0) {
+            aapsLogger.debug(LTag.PUMPCOMM, "TimeSettingResponsePacket Got some Error")
+            failed = true
+            return
+        } else failed = false
+
+        val bufferData = prefixDecode(data)
+        result = getByteToInt(bufferData)
+
+        if(!isSuccSettingResponseResult(result)) {
+            diaconnG8Pump.resultErrorCode = result
+            failed = true
+            return
+        }
+        diaconnG8Pump.otpNumber =  getIntToInt(bufferData)
+
+        aapsLogger.debug(LTag.PUMPCOMM, "Result --> $result")
+        aapsLogger.debug(LTag.PUMPCOMM, "otpNumber --> ${diaconnG8Pump.otpNumber}")
+    }
+
+    override fun getFriendlyName(): String {
+        return "PUMP_TIME_SETTING_RESPONSE"
+    }
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_ALARM_BATTERY.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_ALARM_BATTERY.kt
new file mode 100644
index 0000000000..db44c69fb3
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_ALARM_BATTERY.kt
@@ -0,0 +1,53 @@
+package info.nightscout.androidaps.diaconn.pumplog
+
+import java.nio.ByteBuffer
+import java.nio.ByteOrder
+
+/*
+* Battery Shortage Alarm Log
+*/
+class LOG_ALARM_BATTERY private constructor(
+    val data: String,
+    val dttm: String,
+    typeAndKind: Byte,    // 1=INFO, 2=WARNING, 3=MAJOR, 4=CRITICAL
+    private val alarmLevel: Byte,    // 1=OCCUR, 2=STOP
+    private val ack: Byte,
+    val batteryRemain: Byte
+) {
+
+    val type: Byte = PumplogUtil.getType(typeAndKind)
+    val kind: Byte = PumplogUtil.getKind(typeAndKind)
+
+    override fun toString(): String {
+        val sb = StringBuilder("LOG_ALARM_BATTERY{")
+        sb.append("LOG_KIND=").append(LOG_KIND.toInt())
+        sb.append(", data='").append(data).append('\'')
+        sb.append(", dttm='").append(dttm).append('\'')
+        sb.append(", type=").append(type.toInt())
+        sb.append(", kind=").append(kind.toInt())
+        sb.append(", alarmLevel=").append(alarmLevel.toInt())
+        sb.append(", ack=").append(ack.toInt())
+        sb.append(", batteryRemain=").append(batteryRemain.toInt())
+        sb.append('}')
+        return sb.toString()
+    }
+
+    companion object {
+
+        const val LOG_KIND: Byte = 0x28
+        fun parse(data: String): LOG_ALARM_BATTERY {
+            val bytes = PumplogUtil.hexStringToByteArray(data)
+            val buffer = ByteBuffer.wrap(bytes)
+            buffer.order(ByteOrder.LITTLE_ENDIAN)
+            return LOG_ALARM_BATTERY(
+                data,
+                PumplogUtil.getDttm(buffer),
+                PumplogUtil.getByte(buffer),
+                PumplogUtil.getByte(buffer),
+                PumplogUtil.getByte(buffer),
+                PumplogUtil.getByte(buffer)
+            )
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_ALARM_BLOCK.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_ALARM_BLOCK.kt
new file mode 100644
index 0000000000..29b827e01e
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_ALARM_BLOCK.kt
@@ -0,0 +1,59 @@
+package info.nightscout.androidaps.diaconn.pumplog
+
+import java.nio.ByteBuffer
+import java.nio.ByteOrder
+
+/*
+* Injection Blocked Alarm Log
+*/
+class LOG_ALARM_BLOCK private constructor(
+    val data: String,
+    val dttm: String,
+    typeAndKind: Byte, // 1=INFO, 2=WARNING, 3=MAJOR, 4=CRITICAL
+    val alarmLevel: Byte,     // 1=OCCUR
+    val ack: Byte,
+    val amount: Short, // 1=BASE, 2=Meal, 3=snack , 4=square, 5=dual, 6=tube change, 7=needle change, 8=insulin change
+    val reason: Byte,
+    val batteryRemain: Byte
+) {
+
+    val type: Byte = PumplogUtil.getType(typeAndKind)
+    val kind: Byte = PumplogUtil.getKind(typeAndKind)
+
+    override fun toString(): String {
+        val sb = StringBuilder("LOG_ALARM_BLOCK{")
+        sb.append("LOG_KIND=").append(LOG_KIND.toInt())
+        sb.append(", data='").append(data).append('\'')
+        sb.append(", dttm='").append(dttm).append('\'')
+        sb.append(", type=").append(type.toInt())
+        sb.append(", kind=").append(kind.toInt())
+        sb.append(", alarmLevel=").append(alarmLevel.toInt())
+        sb.append(", ack=").append(ack.toInt())
+        sb.append(", amount=").append(amount.toInt())
+        sb.append(", reason=").append(reason.toInt())
+        sb.append(", batteryRemain=").append(batteryRemain.toInt())
+        sb.append('}')
+        return sb.toString()
+    }
+
+    companion object {
+
+        const val LOG_KIND: Byte = 0x29
+        fun parse(data: String): LOG_ALARM_BLOCK {
+            val bytes = PumplogUtil.hexStringToByteArray(data)
+            val buffer = ByteBuffer.wrap(bytes)
+            buffer.order(ByteOrder.LITTLE_ENDIAN)
+            return LOG_ALARM_BLOCK(
+                data,
+                PumplogUtil.getDttm(buffer),
+                PumplogUtil.getByte(buffer),
+                PumplogUtil.getByte(buffer),
+                PumplogUtil.getByte(buffer),
+                PumplogUtil.getShort(buffer),
+                PumplogUtil.getByte(buffer),
+                PumplogUtil.getByte(buffer)
+            )
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_ALARM_SHORTAGE.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_ALARM_SHORTAGE.kt
new file mode 100644
index 0000000000..4d3acfbab4
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_ALARM_SHORTAGE.kt
@@ -0,0 +1,56 @@
+package info.nightscout.androidaps.diaconn.pumplog
+
+import java.nio.ByteBuffer
+import java.nio.ByteOrder
+
+/*
+* Insulin shortage alarm
+*/
+class LOG_ALARM_SHORTAGE private constructor(
+    val data: String,
+    val dttm: String,
+    typeAndKind: Byte, // 1=INFO, 2=WARNING, 3=MAJOR, 4=CRITICAL
+    val alarmLevel: Byte, // 1=OCCUR, 2=STOP
+    val ack: Byte,     // (1~100U)
+    val remain: Byte,
+    val batteryRemain: Byte
+) {
+
+    val type: Byte = PumplogUtil.getType(typeAndKind)
+    val kind: Byte = PumplogUtil.getKind(typeAndKind)
+
+    override fun toString(): String {
+        val sb = StringBuilder("LOG_ALARM_SHORTAGE{")
+        sb.append("LOG_KIND=").append(LOG_KIND.toInt())
+        sb.append(", data='").append(data).append('\'')
+        sb.append(", dttm='").append(dttm).append('\'')
+        sb.append(", type=").append(type.toInt())
+        sb.append(", kind=").append(kind.toInt())
+        sb.append(", alarmLevel=").append(alarmLevel.toInt())
+        sb.append(", ack=").append(ack.toInt())
+        sb.append(", remain=").append(remain.toInt())
+        sb.append(", batteryRemain=").append(batteryRemain.toInt())
+        sb.append('}')
+        return sb.toString()
+    }
+
+    companion object {
+
+        const val LOG_KIND: Byte = 0x2A
+        fun parse(data: String): LOG_ALARM_SHORTAGE {
+            val bytes = PumplogUtil.hexStringToByteArray(data)
+            val buffer = ByteBuffer.wrap(bytes)
+            buffer.order(ByteOrder.LITTLE_ENDIAN)
+            return LOG_ALARM_SHORTAGE(
+                data,
+                PumplogUtil.getDttm(buffer),
+                PumplogUtil.getByte(buffer),
+                PumplogUtil.getByte(buffer),
+                PumplogUtil.getByte(buffer),
+                PumplogUtil.getByte(buffer),
+                PumplogUtil.getByte(buffer)
+            )
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_CHANGE_INJECTOR_SUCCESS.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_CHANGE_INJECTOR_SUCCESS.kt
new file mode 100644
index 0000000000..d5702c0e5b
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_CHANGE_INJECTOR_SUCCESS.kt
@@ -0,0 +1,53 @@
+package info.nightscout.androidaps.diaconn.pumplog
+
+import java.nio.ByteBuffer
+import java.nio.ByteOrder
+
+/*
+* 주사기 교체 성공
+*/
+class LOG_CHANGE_INJECTOR_SUCCESS private constructor(
+    val data: String,
+    val dttm: String,
+    typeAndKind: Byte,    // 47.5=4750
+    val primeAmount: Short,    // 47.5=4750
+    val remainAmount: Short,
+    val batteryRemain: Byte
+) {
+
+    val type: Byte = PumplogUtil.getType(typeAndKind)
+    val kind: Byte = PumplogUtil.getKind(typeAndKind)
+
+    override fun toString(): String {
+        val sb = StringBuilder("LOG_CHANGE_INJECTOR_SUCCESS{")
+        sb.append("LOG_KIND=").append(LOG_KIND.toInt())
+        sb.append(", data='").append(data).append('\'')
+        sb.append(", dttm='").append(dttm).append('\'')
+        sb.append(", type=").append(type.toInt())
+        sb.append(", kind=").append(kind.toInt())
+        sb.append(", primeAmount=").append(primeAmount.toInt())
+        sb.append(", remainAmount=").append(remainAmount.toInt())
+        sb.append(", batteryRemain=").append(batteryRemain.toInt())
+        sb.append('}')
+        return sb.toString()
+    }
+
+    companion object {
+
+        const val LOG_KIND: Byte = 0x1A
+        fun parse(data: String): LOG_CHANGE_INJECTOR_SUCCESS {
+            val bytes = PumplogUtil.hexStringToByteArray(data)
+            val buffer = ByteBuffer.wrap(bytes)
+            buffer.order(ByteOrder.LITTLE_ENDIAN)
+            return LOG_CHANGE_INJECTOR_SUCCESS(
+                data,
+                PumplogUtil.getDttm(buffer),
+                PumplogUtil.getByte(buffer),
+                PumplogUtil.getShort(buffer),
+                PumplogUtil.getShort(buffer),
+                PumplogUtil.getByte(buffer)
+            )
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_CHANGE_NEEDLE_SUCCESS.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_CHANGE_NEEDLE_SUCCESS.kt
new file mode 100644
index 0000000000..556b5d33d9
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_CHANGE_NEEDLE_SUCCESS.kt
@@ -0,0 +1,53 @@
+package info.nightscout.androidaps.diaconn.pumplog
+
+import java.nio.ByteBuffer
+import java.nio.ByteOrder
+
+/*
+* 바늘 공기빼기 성공
+*/
+class LOG_CHANGE_NEEDLE_SUCCESS private constructor(
+    val data: String,
+    val dttm: String,
+    typeAndKind: Byte,    //  47.5=4750
+    val primeAmount: Short,    //  47.5=4750
+    val remainAmount: Short,
+    val batteryRemain: Byte
+) {
+
+    val type: Byte = PumplogUtil.getType(typeAndKind)
+    val kind: Byte = PumplogUtil.getKind(typeAndKind)
+
+    override fun toString(): String {
+        val sb = StringBuilder("LOG_CHANGE_NEEDLE_SUCCESS{")
+        sb.append("LOG_KIND=").append(LOG_KIND.toInt())
+        sb.append(", data='").append(data).append('\'')
+        sb.append(", dttm='").append(dttm).append('\'')
+        sb.append(", type=").append(type.toInt())
+        sb.append(", kind=").append(kind.toInt())
+        sb.append(", primeAmount=").append(primeAmount.toInt())
+        sb.append(", remainAmount=").append(remainAmount.toInt())
+        sb.append(", batteryRemain=").append(batteryRemain.toInt())
+        sb.append('}')
+        return sb.toString()
+    }
+
+    companion object {
+
+        const val LOG_KIND: Byte = 0x1C
+        fun parse(data: String): LOG_CHANGE_NEEDLE_SUCCESS {
+            val bytes = PumplogUtil.hexStringToByteArray(data)
+            val buffer = ByteBuffer.wrap(bytes)
+            buffer.order(ByteOrder.LITTLE_ENDIAN)
+            return LOG_CHANGE_NEEDLE_SUCCESS(
+                data,
+                PumplogUtil.getDttm(buffer),
+                PumplogUtil.getByte(buffer),
+                PumplogUtil.getShort(buffer),
+                PumplogUtil.getShort(buffer),
+                PumplogUtil.getByte(buffer)
+            )
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_CHANGE_TUBE_SUCCESS.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_CHANGE_TUBE_SUCCESS.kt
new file mode 100644
index 0000000000..ae97bddcce
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_CHANGE_TUBE_SUCCESS.kt
@@ -0,0 +1,53 @@
+package info.nightscout.androidaps.diaconn.pumplog
+
+import java.nio.ByteBuffer
+import java.nio.ByteOrder
+
+/*
+* 튜브 공기빼기 성공
+*/
+class LOG_CHANGE_TUBE_SUCCESS private constructor(
+    val data: String,
+    val dttm: String,
+    typeAndKind: Byte,    //  47.5=4750
+    val primeAmount: Short,    //  47.5=4750
+    val remainAmount: Short,
+    val batteryRemain: Byte
+) {
+
+    val type: Byte = PumplogUtil.getType(typeAndKind)
+    val kind: Byte = PumplogUtil.getKind(typeAndKind)
+
+    override fun toString(): String {
+        val sb = StringBuilder("LOG_CHANGE_TUBE_SUCCESS{")
+        sb.append("LOG_KIND=").append(LOG_KIND.toInt())
+        sb.append(", data='").append(data).append('\'')
+        sb.append(", dttm='").append(dttm).append('\'')
+        sb.append(", type=").append(type.toInt())
+        sb.append(", kind=").append(kind.toInt())
+        sb.append(", primeAmount=").append(primeAmount.toInt())
+        sb.append(", remainAmount=").append(remainAmount.toInt())
+        sb.append(", batteryRemain=").append(batteryRemain.toInt())
+        sb.append('}')
+        return sb.toString()
+    }
+
+    companion object {
+
+        const val LOG_KIND: Byte = 0x18
+        fun parse(data: String): LOG_CHANGE_TUBE_SUCCESS {
+            val bytes = PumplogUtil.hexStringToByteArray(data)
+            val buffer = ByteBuffer.wrap(bytes)
+            buffer.order(ByteOrder.LITTLE_ENDIAN)
+            return LOG_CHANGE_TUBE_SUCCESS(
+                data,
+                PumplogUtil.getDttm(buffer),
+                PumplogUtil.getByte(buffer),
+                PumplogUtil.getShort(buffer),
+                PumplogUtil.getShort(buffer),
+                PumplogUtil.getByte(buffer)
+            )
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_INJECTION_1DAY.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_INJECTION_1DAY.kt
new file mode 100644
index 0000000000..e7768b2e00
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_INJECTION_1DAY.kt
@@ -0,0 +1,53 @@
+package info.nightscout.androidaps.diaconn.pumplog
+
+import java.nio.ByteBuffer
+import java.nio.ByteOrder
+
+/*
+* 당일 주입 총량 (식사, 추가)
+*/
+class LOG_INJECTION_1DAY private constructor(
+    val data: String,
+    val dttm: String,
+    typeAndKind: Byte,    // 당일 식사주입 총량 47.5=4750
+    val mealAmount: Short,    // 당일 추가주입 총량 47.5=4750
+    val extAmount: Short,
+    val batteryRemain: Byte
+) {
+
+    val type: Byte = PumplogUtil.getType(typeAndKind)
+    val kind: Byte = PumplogUtil.getKind(typeAndKind)
+
+    override fun toString(): String {
+        val sb = StringBuilder("LOG_INJECTION_1DAY{")
+        sb.append("LOG_KIND=").append(LOG_KIND.toInt())
+        sb.append(", data='").append(data).append('\'')
+        sb.append(", dttm='").append(dttm).append('\'')
+        sb.append(", type=").append(type.toInt())
+        sb.append(", kind=").append(kind.toInt())
+        sb.append(", mealAmount=").append(mealAmount.toInt())
+        sb.append(", extAmount=").append(extAmount.toInt())
+        sb.append(", batteryRemain=").append(batteryRemain.toInt())
+        sb.append('}')
+        return sb.toString()
+    }
+
+    companion object {
+
+        const val LOG_KIND: Byte = 0x2F
+        fun parse(data: String): LOG_INJECTION_1DAY {
+            val bytes = PumplogUtil.hexStringToByteArray(data)
+            val buffer = ByteBuffer.wrap(bytes)
+            buffer.order(ByteOrder.LITTLE_ENDIAN)
+            return LOG_INJECTION_1DAY(
+                data,
+                PumplogUtil.getDttm(buffer),
+                PumplogUtil.getByte(buffer),
+                PumplogUtil.getShort(buffer),
+                PumplogUtil.getShort(buffer),
+                PumplogUtil.getByte(buffer)
+            )
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_INJECTION_1DAY_BASAL.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_INJECTION_1DAY_BASAL.kt
new file mode 100644
index 0000000000..1740d54276
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_INJECTION_1DAY_BASAL.kt
@@ -0,0 +1,49 @@
+package info.nightscout.androidaps.diaconn.pumplog
+
+import java.nio.ByteBuffer
+import java.nio.ByteOrder
+
+/*
+* 당일 주입 총량 (기저)
+*/
+class LOG_INJECTION_1DAY_BASAL private constructor(
+    val data: String,
+    val dttm: String,
+    typeAndKind: Byte,
+    // 당일 기저주입 총량 47.5=4750
+    val amount: Short,
+    val batteryRemain: Byte
+) {
+
+    val type: Byte = PumplogUtil.getType(typeAndKind)
+    val kind: Byte = PumplogUtil.getKind(typeAndKind)
+
+    override fun toString(): String {
+        val sb = StringBuilder("LOG_INJECTION_1DAY_BASAL{")
+        sb.append("LOG_KIND=").append(LOG_KIND.toInt())
+        sb.append(", data='").append(data).append('\'')
+        sb.append(", dttm='").append(dttm).append('\'')
+        sb.append(", type=").append(type.toInt())
+        sb.append(", kind=").append(kind.toInt())
+        sb.append(", amount=").append(amount.toInt())
+        sb.append(", batteryRemain=").append(batteryRemain.toInt())
+        sb.append('}')
+        return sb.toString()
+    }
+
+    companion object {
+        const val LOG_KIND: Byte = 0x2E
+        fun parse(data: String): LOG_INJECTION_1DAY_BASAL {
+            val bytes = PumplogUtil.hexStringToByteArray(data)
+            val buffer = ByteBuffer.wrap(bytes)
+            buffer.order(ByteOrder.LITTLE_ENDIAN)
+            return LOG_INJECTION_1DAY_BASAL(
+                data,
+                PumplogUtil.getDttm(buffer),
+                PumplogUtil.getByte(buffer),
+                PumplogUtil.getShort(buffer),
+                PumplogUtil.getByte(buffer)
+            )
+        }
+    }
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_INJECTION_1HOUR_BASAL.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_INJECTION_1HOUR_BASAL.kt
new file mode 100644
index 0000000000..f8acab887f
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_INJECTION_1HOUR_BASAL.kt
@@ -0,0 +1,61 @@
+package info.nightscout.androidaps.diaconn.pumplog
+
+import java.nio.ByteBuffer
+import java.nio.ByteOrder
+
+/*
+* 1시간 단위 기저 주입량
+*/
+class LOG_INJECTION_1HOUR_BASAL private constructor(
+    val data: String,
+    val dttm: String,
+    typeAndKind: Byte,
+    tbBeforeAmount: Short,
+    tbAfterAmount: Short,
+    val batteryRemain: Byte,
+    // 남은 전체 인슐린 량(47.5=4750)
+    private val remainTotalAmount: Short
+) {
+
+    val type: Byte = PumplogUtil.getType(typeAndKind)
+    val kind: Byte = PumplogUtil.getKind(typeAndKind)
+    val beforeAmount // 해당시간의 임시기저 계산 전 기저주입량: 기저주입막힘 발생 시 기저주입 막힘량 제외, 기저정지로 인해 주입되지 않은 량 제외, 리셋으로 인해 주입되지 않은 량 제외(47.5=4750)
+        : Short = tbBeforeAmount
+    val afterAmount // 해당시간의 임시기저 계산 후 기저주입량: 기저주입막힘 발생 시 기저주입 막힘량 제외, 기저정지로 인해 주입되지 않은 량 제외, 리셋으로 인해 주입되지 않은 량 제외(47.5=4750)
+        : Short = tbAfterAmount
+
+    override fun toString(): String {
+        val sb = StringBuilder("LOG_INJECTION_1HOUR_BASAL{")
+        sb.append("LOG_KIND=").append(LOG_KIND.toInt())
+        sb.append(", data='").append(data).append('\'')
+        sb.append(", dttm='").append(dttm).append('\'')
+        sb.append(", type=").append(type.toInt())
+        sb.append(", kind=").append(kind.toInt())
+        sb.append(", tbBeforeAmount=").append(beforeAmount.toInt())
+        sb.append(", tbAfterAmount=").append(afterAmount.toInt())
+        sb.append(", batteryRemain=").append(batteryRemain.toInt())
+        sb.append(", remainTotalAmount=").append(remainTotalAmount.toInt())
+        sb.append('}')
+        return sb.toString()
+    }
+
+    companion object {
+
+        const val LOG_KIND: Byte = 0x2C
+        fun parse(data: String): LOG_INJECTION_1HOUR_BASAL {
+            val bytes = PumplogUtil.hexStringToByteArray(data)
+            val buffer = ByteBuffer.wrap(bytes)
+            buffer.order(ByteOrder.LITTLE_ENDIAN)
+            return LOG_INJECTION_1HOUR_BASAL(
+                data,
+                PumplogUtil.getDttm(buffer),
+                PumplogUtil.getByte(buffer),
+                PumplogUtil.getShort(buffer),
+                PumplogUtil.getShort(buffer),
+                PumplogUtil.getByte(buffer),
+                PumplogUtil.getShort(buffer)
+            )
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_INJECTION_DUAL_NORMAL.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_INJECTION_DUAL_NORMAL.kt
new file mode 100644
index 0000000000..d46ee4790a
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_INJECTION_DUAL_NORMAL.kt
@@ -0,0 +1,60 @@
+package info.nightscout.androidaps.diaconn.pumplog
+
+import okhttp3.internal.and
+import java.nio.ByteBuffer
+import java.nio.ByteOrder
+
+/*
+* 듀얼(일반) 주입량: 듀얼(일반) 주입 완료 시 기록하는 방식
+*/
+class LOG_INJECTION_DUAL_NORMAL private constructor(
+    val data: String,
+    val dttm: String,
+    typeAndKind: Byte,    // 설정량 47.5=4750
+    val setAmount: Short,    // 주입량 47.5=4750
+    val injectAmount: Short,    // 1분 단위 주입 시간 Ex) 124 = 124분 = 2시간 4분
+    private val injectTime: Byte,
+    val batteryRemain: Byte
+) {
+
+    val type: Byte = PumplogUtil.getType(typeAndKind)
+    val kind: Byte = PumplogUtil.getKind(typeAndKind)
+    fun getInjectTime(): Int {
+        return injectTime and 0xff
+    }
+
+    override fun toString(): String {
+        val sb = StringBuilder("LOG_INJECTION_DUAL_NORMAL{")
+        sb.append("LOG_KIND=").append(LOG_KIND.toInt())
+        sb.append(", data='").append(data).append('\'')
+        sb.append(", dttm='").append(dttm).append('\'')
+        sb.append(", type=").append(type.toInt())
+        sb.append(", kind=").append(kind.toInt())
+        sb.append(", setAmount=").append(setAmount.toInt())
+        sb.append(", injectAmount=").append(injectAmount.toInt())
+        sb.append(", injectTime=").append(injectTime and 0xff)
+        sb.append(", batteryRemain=").append(batteryRemain.toInt())
+        sb.append('}')
+        return sb.toString()
+    }
+
+    companion object {
+
+        const val LOG_KIND: Byte = 0x35
+        fun parse(data: String): LOG_INJECTION_DUAL_NORMAL {
+            val bytes = PumplogUtil.hexStringToByteArray(data)
+            val buffer = ByteBuffer.wrap(bytes)
+            buffer.order(ByteOrder.LITTLE_ENDIAN)
+            return LOG_INJECTION_DUAL_NORMAL(
+                data,
+                PumplogUtil.getDttm(buffer),
+                PumplogUtil.getByte(buffer),
+                PumplogUtil.getShort(buffer),
+                PumplogUtil.getShort(buffer),
+                PumplogUtil.getByte(buffer),
+                PumplogUtil.getByte(buffer)
+            )
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_INJECT_DUAL_FAIL.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_INJECT_DUAL_FAIL.kt
new file mode 100644
index 0000000000..bafaea8de9
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_INJECT_DUAL_FAIL.kt
@@ -0,0 +1,64 @@
+package info.nightscout.androidaps.diaconn.pumplog
+
+import okhttp3.internal.and
+import java.nio.ByteBuffer
+import java.nio.ByteOrder
+
+/*
+* Dual Injection Fail Log
+*/
+class LOG_INJECT_DUAL_FAIL private constructor(
+    val data: String,
+    val dttm: String,
+    typeAndKind: Byte,    // 47.5=4750
+    val injectNormAmount: Short,    // 47.5=4750
+    val injectSquareAmount: Short,    // 1분단위 주입시간(124=124분=2시간4분)
+    private val injectTime: Byte,    // 1=주입막힘, 2=배터리잔량부족, 3=약물부족, 4=사용자중지, 5=시스템리셋, 6=기타, 7=긴급정지
+    val reason: Byte,
+    val batteryRemain: Byte
+) {
+
+    val type: Byte = PumplogUtil.getType(typeAndKind)
+    val kind: Byte = PumplogUtil.getKind(typeAndKind)
+
+    fun getInjectTime(): Int {
+        return injectTime and 0xff
+    }
+
+    override fun toString(): String {
+        val sb = StringBuilder("LOG_INJECT_DUAL_FAIL{")
+        sb.append("LOG_KIND=").append(LOG_KIND.toInt())
+        sb.append(", data='").append(data).append('\'')
+        sb.append(", dttm='").append(dttm).append('\'')
+        sb.append(", type=").append(type.toInt())
+        sb.append(", kind=").append(kind.toInt())
+        sb.append(", injectNormAmount=").append(injectNormAmount.toInt())
+        sb.append(", injectSquareAmount=").append(injectSquareAmount.toInt())
+        sb.append(", injectTime=").append(injectTime and 0xff)
+        sb.append(", reason=").append(reason.toInt())
+        sb.append(", batteryRemain=").append(batteryRemain.toInt())
+        sb.append('}')
+        return sb.toString()
+    }
+
+    companion object {
+
+        const val LOG_KIND: Byte = 0x11
+        fun parse(data: String): LOG_INJECT_DUAL_FAIL {
+            val bytes = PumplogUtil.hexStringToByteArray(data)
+            val buffer = ByteBuffer.wrap(bytes)
+            buffer.order(ByteOrder.LITTLE_ENDIAN)
+            return LOG_INJECT_DUAL_FAIL(
+                data,
+                PumplogUtil.getDttm(buffer),
+                PumplogUtil.getByte(buffer),
+                PumplogUtil.getShort(buffer),
+                PumplogUtil.getShort(buffer),
+                PumplogUtil.getByte(buffer),
+                PumplogUtil.getByte(buffer),
+                PumplogUtil.getByte(buffer)
+            )
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_INJECT_DUAL_SUCCESS.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_INJECT_DUAL_SUCCESS.kt
new file mode 100644
index 0000000000..c6738c38b2
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_INJECT_DUAL_SUCCESS.kt
@@ -0,0 +1,60 @@
+package info.nightscout.androidaps.diaconn.pumplog
+
+import okhttp3.internal.and
+import java.nio.ByteBuffer
+import java.nio.ByteOrder
+
+/*
+* 듀얼주입 성공
+*/
+class LOG_INJECT_DUAL_SUCCESS private constructor(
+    val data: String,
+    val dttm: String,
+    typeAndKind: Byte, // 47.5=4750
+    val injectNormAmount: Short, // 47.5=4750
+    val injectSquareAmount: Short, // 1분단위 주입시간(124=124분=2시간4분)
+    private val injectTime: Byte,
+    val batteryRemain: Byte
+) {
+
+    val type: Byte = PumplogUtil.getType(typeAndKind)
+    val kind: Byte = PumplogUtil.getKind(typeAndKind)
+    fun getInjectTime(): Int {
+        return injectTime and 0xff
+    }
+
+    override fun toString(): String {
+        val sb = StringBuilder("LOG_INJECT_DUAL_SUCCESS{")
+        sb.append("LOG_KIND=").append(LOG_KIND.toInt())
+        sb.append(", data='").append(data).append('\'')
+        sb.append(", dttm='").append(dttm).append('\'')
+        sb.append(", type=").append(type.toInt())
+        sb.append(", kind=").append(kind.toInt())
+        sb.append(", injectNormAmount=").append(injectNormAmount.toInt())
+        sb.append(", injectSquareAmount=").append(injectSquareAmount.toInt())
+        sb.append(", injectTime=").append(injectTime and 0xff)
+        sb.append(", batteryRemain=").append(batteryRemain.toInt())
+        sb.append('}')
+        return sb.toString()
+    }
+
+    companion object {
+
+        const val LOG_KIND: Byte = 0x10
+        fun parse(data: String): LOG_INJECT_DUAL_SUCCESS {
+            val bytes = PumplogUtil.hexStringToByteArray(data)
+            val buffer = ByteBuffer.wrap(bytes)
+            buffer.order(ByteOrder.LITTLE_ENDIAN)
+            return LOG_INJECT_DUAL_SUCCESS(
+                data,
+                PumplogUtil.getDttm(buffer),
+                PumplogUtil.getByte(buffer),
+                PumplogUtil.getShort(buffer),
+                PumplogUtil.getShort(buffer),
+                PumplogUtil.getByte(buffer),
+                PumplogUtil.getByte(buffer)
+            )
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_INJECT_MEAL_FAIL.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_INJECT_MEAL_FAIL.kt
new file mode 100644
index 0000000000..bc667b28e9
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_INJECT_MEAL_FAIL.kt
@@ -0,0 +1,64 @@
+package info.nightscout.androidaps.diaconn.pumplog
+
+import okhttp3.internal.and
+import java.nio.ByteBuffer
+import java.nio.ByteOrder
+
+/*
+* 식사주입 실패
+*/
+class LOG_INJECT_MEAL_FAIL private constructor(
+    val data: String,
+    val dttm: String,
+    typeAndKind: Byte,     // 47.5=4750
+    private val setAmount: Short,     // 47.5=4750
+    val injectAmount: Short,     // 1분단위 주입시간(124=124분=2시간4분)
+    private val injectTime: Byte,     // 아침=1, 점심=2, 저녁=3
+    val time: Byte,     // 1=주입막힘, 2=배터리잔량부족, 3=약물부족, 4=사용자중지, 5=시스템리셋, 6=기타, 7=긴급정지
+    val reason: Byte
+) {
+
+    val type: Byte = PumplogUtil.getType(typeAndKind)
+    val kind: Byte = PumplogUtil.getKind(typeAndKind)
+
+    fun getInjectTime(): Int {
+        return injectTime and 0xff
+    }
+
+    override fun toString(): String {
+        val sb = StringBuilder("LOG_INJECT_MEAL_FAIL{")
+        sb.append("LOG_KIND=").append(LOG_KIND.toInt())
+        sb.append(", data='").append(data).append('\'')
+        sb.append(", dttm='").append(dttm).append('\'')
+        sb.append(", type=").append(type.toInt())
+        sb.append(", kind=").append(kind.toInt())
+        sb.append(", setAmount=").append(setAmount.toInt())
+        sb.append(", injectAmount=").append(injectAmount.toInt())
+        sb.append(", injectTime=").append(injectTime and 0xff)
+        sb.append(", time=").append(time.toInt())
+        sb.append(", reason=").append(reason.toInt())
+        sb.append('}')
+        return sb.toString()
+    }
+
+    companion object {
+
+        const val LOG_KIND: Byte = 0x09
+        fun parse(data: String): LOG_INJECT_MEAL_FAIL {
+            val bytes = PumplogUtil.hexStringToByteArray(data)
+            val buffer = ByteBuffer.wrap(bytes)
+            buffer.order(ByteOrder.LITTLE_ENDIAN)
+            return LOG_INJECT_MEAL_FAIL(
+                data,
+                PumplogUtil.getDttm(buffer),
+                PumplogUtil.getByte(buffer),
+                PumplogUtil.getShort(buffer),
+                PumplogUtil.getShort(buffer),
+                PumplogUtil.getByte(buffer),
+                PumplogUtil.getByte(buffer),
+                PumplogUtil.getByte(buffer)
+            )
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_INJECT_MEAL_SUCCESS.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_INJECT_MEAL_SUCCESS.kt
new file mode 100644
index 0000000000..23e7f27b57
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_INJECT_MEAL_SUCCESS.kt
@@ -0,0 +1,64 @@
+package info.nightscout.androidaps.diaconn.pumplog
+
+import okhttp3.internal.and
+import java.nio.ByteBuffer
+import java.nio.ByteOrder
+
+/*
+* 식사주입 성공
+*/
+class LOG_INJECT_MEAL_SUCCESS private constructor(
+    val data: String,
+    val dttm: String,
+    typeAndKind: Byte,    // 47.5=4750
+    private val setAmount: Short,    // 47.5=4750
+    val injectAmount: Short,    // 1분단위 주입시간(124=124분=2시간4분)
+    private val injectTime: Byte,    // 아침=1, 점심=2, 저녁=3
+    val time: Byte,
+    batteryRemain: Byte
+) {
+
+    val type: Byte = PumplogUtil.getType(typeAndKind)
+    val kind: Byte = PumplogUtil.getKind(typeAndKind)
+    val batteryRemain: Byte = batteryRemain
+    fun getInjectTime(): Int {
+        return injectTime and 0xff
+    }
+
+    override fun toString(): String {
+        val sb = StringBuilder("LOG_INJECT_MEAL_SUCCESS{")
+        sb.append("LOG_KIND=").append(LOG_KIND.toInt())
+        sb.append(", data='").append(data).append('\'')
+        sb.append(", dttm='").append(dttm).append('\'')
+        sb.append(", type=").append(type.toInt())
+        sb.append(", kind=").append(kind.toInt())
+        sb.append(", setAmount=").append(setAmount.toInt())
+        sb.append(", injectAmount=").append(injectAmount.toInt())
+        sb.append(", injectTime=").append(injectTime and 0xff)
+        sb.append(", time=").append(time.toInt())
+        sb.append(", batteryRemain=").append(batteryRemain.toInt())
+        sb.append('}')
+        return sb.toString()
+    }
+
+    companion object {
+
+        const val LOG_KIND: Byte = 0x08
+        fun parse(data: String): LOG_INJECT_MEAL_SUCCESS {
+            val bytes = PumplogUtil.hexStringToByteArray(data)
+            val buffer = ByteBuffer.wrap(bytes)
+            buffer.order(ByteOrder.LITTLE_ENDIAN)
+            return LOG_INJECT_MEAL_SUCCESS(
+                data,
+                PumplogUtil.getDttm(buffer),
+                PumplogUtil.getByte(buffer),
+                PumplogUtil.getShort(buffer),
+                PumplogUtil.getShort(buffer),
+                PumplogUtil.getByte(buffer),
+                PumplogUtil.getByte(buffer),
+                PumplogUtil.getByte(buffer)
+            )
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_INJECT_NORMAL_FAIL.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_INJECT_NORMAL_FAIL.kt
new file mode 100644
index 0000000000..2e9eb5fe0d
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_INJECT_NORMAL_FAIL.kt
@@ -0,0 +1,64 @@
+package info.nightscout.androidaps.diaconn.pumplog
+
+import okhttp3.internal.and
+import java.nio.ByteBuffer
+import java.nio.ByteOrder
+
+/*
+* 일반주입 실패
+*/
+class LOG_INJECT_NORMAL_FAIL private constructor(
+    val data: String,
+    val dttm: String,
+    typeAndKind: Byte,    // 47.5=4750
+    val setAmount: Short,    // 47.5=4750
+    val injectAmount: Short,    // 1분단위 주입시간(124=124분=2시간4분)
+    val injectTime: Byte,    // 1=주입막힘, 2=배터리잔량부족, 3=약물부족, 4=사용자중지, 5=시스템리셋, 6=기타, 7=긴급정지
+    val reason: Byte,
+    val batteryRemain: Byte
+) {
+
+    val type: Byte = PumplogUtil.getType(typeAndKind)
+    val kind: Byte = PumplogUtil.getKind(typeAndKind)
+
+    fun getInjectTime(): Int {
+        return injectTime and 0xff
+    }
+
+    override fun toString(): String {
+        val sb = StringBuilder("LOG_INJECT_NORMAL_FAIL{")
+        sb.append("LOG_KIND=").append(LOG_KIND.toInt())
+        sb.append(", data='").append(data).append('\'')
+        sb.append(", dttm='").append(dttm).append('\'')
+        sb.append(", type=").append(type.toInt())
+        sb.append(", kind=").append(kind.toInt())
+        sb.append(", setAmount=").append(setAmount.toInt())
+        sb.append(", injectAmount=").append(injectAmount.toInt())
+        sb.append(", injectTime=").append(injectTime and 0xff)
+        sb.append(", reason=").append(reason.toInt())
+        sb.append(", batteryRemain=").append(batteryRemain.toInt())
+        sb.append('}')
+        return sb.toString()
+    }
+
+    companion object {
+
+        const val LOG_KIND: Byte = 0x0B
+        fun parse(data: String): LOG_INJECT_NORMAL_FAIL {
+            val bytes = PumplogUtil.hexStringToByteArray(data)
+            val buffer = ByteBuffer.wrap(bytes)
+            buffer.order(ByteOrder.LITTLE_ENDIAN)
+            return LOG_INJECT_NORMAL_FAIL(
+                data,
+                PumplogUtil.getDttm(buffer),
+                PumplogUtil.getByte(buffer),
+                PumplogUtil.getShort(buffer),
+                PumplogUtil.getShort(buffer),
+                PumplogUtil.getByte(buffer),
+                PumplogUtil.getByte(buffer),
+                PumplogUtil.getByte(buffer)
+            )
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_INJECT_NORMAL_SUCCESS.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_INJECT_NORMAL_SUCCESS.kt
new file mode 100644
index 0000000000..be3804eb00
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_INJECT_NORMAL_SUCCESS.kt
@@ -0,0 +1,60 @@
+package info.nightscout.androidaps.diaconn.pumplog
+
+import okhttp3.internal.and
+import java.nio.ByteBuffer
+import java.nio.ByteOrder
+
+/*
+* 일반주입 성공
+*/
+class LOG_INJECT_NORMAL_SUCCESS private constructor(
+    val data: String,
+    val dttm: String,
+    typeAndKind: Byte,    // 47.5=4750
+    val setAmount: Short,    // 47.5=4750
+    val injectAmount: Short,    // 1분단위 주입시간(124=124분=2시간4분)
+    val injectTime: Byte,
+    val batteryRemain: Byte
+) {
+
+    val type: Byte = PumplogUtil.getType(typeAndKind)
+    val kind: Byte = PumplogUtil.getKind(typeAndKind)
+    fun getInjectTime(): Int {
+        return injectTime and 0xff
+    }
+
+    override fun toString(): String {
+        val sb = StringBuilder("LOG_INJECT_NORMAL_SUCCESS{")
+        sb.append("LOG_KIND=").append(LOG_KIND.toInt())
+        sb.append(", data='").append(data).append('\'')
+        sb.append(", dttm='").append(dttm).append('\'')
+        sb.append(", type=").append(type.toInt())
+        sb.append(", kind=").append(kind.toInt())
+        sb.append(", setAmount=").append(setAmount.toInt())
+        sb.append(", injectAmount=").append(injectAmount.toInt())
+        sb.append(", injectTime=").append(injectTime and 0xff)
+        sb.append(", batteryRemain=").append(batteryRemain.toInt())
+        sb.append('}')
+        return sb.toString()
+    }
+
+    companion object {
+
+        const val LOG_KIND: Byte = 0x0A
+        fun parse(data: String): LOG_INJECT_NORMAL_SUCCESS {
+            val bytes = PumplogUtil.hexStringToByteArray(data)
+            val buffer = ByteBuffer.wrap(bytes)
+            buffer.order(ByteOrder.LITTLE_ENDIAN)
+            return LOG_INJECT_NORMAL_SUCCESS(
+                data,
+                PumplogUtil.getDttm(buffer),
+                PumplogUtil.getByte(buffer),
+                PumplogUtil.getShort(buffer),
+                PumplogUtil.getShort(buffer),
+                PumplogUtil.getByte(buffer),
+                PumplogUtil.getByte(buffer)
+            )
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_INJECT_SQUARE_FAIL.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_INJECT_SQUARE_FAIL.kt
new file mode 100644
index 0000000000..b6a4d990f1
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_INJECT_SQUARE_FAIL.kt
@@ -0,0 +1,61 @@
+package info.nightscout.androidaps.diaconn.pumplog
+
+import okhttp3.internal.and
+import java.nio.ByteBuffer
+import java.nio.ByteOrder
+
+/*
+* 스퀘어주입 실패
+*/
+class LOG_INJECT_SQUARE_FAIL private constructor(
+    val data: String,
+    val dttm: String,
+    typeAndKind: Byte,    // 47.5=4750
+    val injectAmount: Short,    // 1분단위 주입시간(124=124분=2시간4분)
+    private val injectTime: Byte,    // 1=주입막힘, 2=배터리잔량부족, 3=약물부족, 4=사용자중지, 5=시스템리셋, 6=기타, 7=긴급정지
+    val reason: Byte,
+    val batteryRemain: Byte
+) {
+
+    val type: Byte = PumplogUtil.getType(typeAndKind)
+    val kind: Byte = PumplogUtil.getKind(typeAndKind)
+
+    fun getInjectTime(): Int {
+        return injectTime and 0xff
+    }
+
+    override fun toString(): String {
+        val sb = StringBuilder("LOG_INJECT_SQUARE_FAIL{")
+        sb.append("LOG_KIND=").append(LOG_KIND.toInt())
+        sb.append(", data='").append(data).append('\'')
+        sb.append(", dttm='").append(dttm).append('\'')
+        sb.append(", type=").append(type.toInt())
+        sb.append(", kind=").append(kind.toInt())
+        sb.append(", injectAmount=").append(injectAmount.toInt())
+        sb.append(", injectTime=").append(injectTime and 0xff)
+        sb.append(", reason=").append(reason.toInt())
+        sb.append(", batteryRemain=").append(batteryRemain.toInt())
+        sb.append('}')
+        return sb.toString()
+    }
+
+    companion object {
+
+        const val LOG_KIND: Byte = 0x0E
+        fun parse(data: String): LOG_INJECT_SQUARE_FAIL {
+            val bytes = PumplogUtil.hexStringToByteArray(data)
+            val buffer = ByteBuffer.wrap(bytes)
+            buffer.order(ByteOrder.LITTLE_ENDIAN)
+            return LOG_INJECT_SQUARE_FAIL(
+                data,
+                PumplogUtil.getDttm(buffer),
+                PumplogUtil.getByte(buffer),
+                PumplogUtil.getShort(buffer),
+                PumplogUtil.getByte(buffer),
+                PumplogUtil.getByte(buffer),
+                PumplogUtil.getByte(buffer)
+            )
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_INJECT_SQUARE_SUCCESS.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_INJECT_SQUARE_SUCCESS.kt
new file mode 100644
index 0000000000..168903de2b
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_INJECT_SQUARE_SUCCESS.kt
@@ -0,0 +1,57 @@
+package info.nightscout.androidaps.diaconn.pumplog
+
+import okhttp3.internal.and
+import java.nio.ByteBuffer
+import java.nio.ByteOrder
+
+/*
+* 스퀘어주입 성공
+*/
+class LOG_INJECT_SQUARE_SUCCESS private constructor(
+    val data: String,
+    val dttm: String,
+    typeAndKind: Byte,    // 47.5=4750
+    val injectAmount: Short,    // 1분단위 주입시간(124=124분=2시간4분)
+    private val injectTime: Byte,
+    val batteryRemain: Byte
+) {
+
+    val type: Byte = PumplogUtil.getType(typeAndKind)
+    val kind: Byte = PumplogUtil.getKind(typeAndKind)
+    fun getInjectTime(): Int {
+        return injectTime and 0xff
+    }
+
+    override fun toString(): String {
+        val sb = StringBuilder("LOG_INJECT_SQUARE_SUCCESS{")
+        sb.append("LOG_KIND=").append(LOG_KIND.toInt())
+        sb.append(", data='").append(data).append('\'')
+        sb.append(", dttm='").append(dttm).append('\'')
+        sb.append(", type=").append(type.toInt())
+        sb.append(", kind=").append(kind.toInt())
+        sb.append(", injectAmount=").append(injectAmount.toInt())
+        sb.append(", injectTime=").append(injectTime and 0xff)
+        sb.append(", batteryRemain=").append(batteryRemain.toInt())
+        sb.append('}')
+        return sb.toString()
+    }
+
+    companion object {
+
+        const val LOG_KIND: Byte = 0x0D
+        fun parse(data: String): LOG_INJECT_SQUARE_SUCCESS {
+            val bytes = PumplogUtil.hexStringToByteArray(data)
+            val buffer = ByteBuffer.wrap(bytes)
+            buffer.order(ByteOrder.LITTLE_ENDIAN)
+            return LOG_INJECT_SQUARE_SUCCESS(
+                data,
+                PumplogUtil.getDttm(buffer),
+                PumplogUtil.getByte(buffer),
+                PumplogUtil.getShort(buffer),
+                PumplogUtil.getByte(buffer),
+                PumplogUtil.getByte(buffer)
+            )
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_RESET_SYS_V3.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_RESET_SYS_V3.kt
new file mode 100644
index 0000000000..bc7a688382
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_RESET_SYS_V3.kt
@@ -0,0 +1,56 @@
+package info.nightscout.androidaps.diaconn.pumplog
+
+import java.nio.ByteBuffer
+import java.nio.ByteOrder
+
+/*
+ * System Reset Log
+ */
+class LOG_RESET_SYS_V3 private constructor(
+    val data: String,
+    val dttm: String,
+    typeAndKind: Byte,
+    val batteryRemain: Byte,
+    val reason: Byte,  // 사유(1:공장초기화 후 리셋, 2:긴급정지 해제 후 리셋, 3:사용자 배터리 교체 후 리셋, 4:캘리브레이션 후 리셋, 9:예상치 못한 시스템 리셋)
+    val rcon1: Short,  // PIC 데이터 시트 내 정의된 2바이트 값
+    val rcon2: Short   // PIC 데이터 시트 내 정의된 2바이트 값
+) {
+
+    val type: Byte = PumplogUtil.getType(typeAndKind)
+    val kind: Byte = PumplogUtil.getKind(typeAndKind)
+
+    override fun toString(): String {
+        val sb = StringBuilder("LOG_RESET_SYS_V3{")
+        sb.append("LOG_KIND=").append(LOG_KIND.toInt())
+        sb.append(", data='").append(data).append('\'')
+        sb.append(", dttm='").append(dttm).append('\'')
+        sb.append(", type=").append(type.toInt())
+        sb.append(", kind=").append(kind.toInt())
+        sb.append(", batteryRemain=").append(batteryRemain.toInt())
+        sb.append(", reason=").append(reason.toInt())
+        sb.append(", rcon1=").append(rcon1.toInt())
+        sb.append(", rcon2=").append(rcon2.toInt())
+        sb.append('}')
+        return sb.toString()
+    }
+
+    companion object {
+
+        const val LOG_KIND: Byte = 0x01
+        fun parse(data: String): LOG_RESET_SYS_V3 {
+            val bytes = PumplogUtil.hexStringToByteArray(data)
+            val buffer = ByteBuffer.wrap(bytes)
+            buffer.order(ByteOrder.LITTLE_ENDIAN)
+            return LOG_RESET_SYS_V3(
+                data,
+                PumplogUtil.getDttm(buffer),
+                PumplogUtil.getByte(buffer),
+                PumplogUtil.getByte(buffer),
+                PumplogUtil.getByte(buffer),
+                PumplogUtil.getShort(buffer),
+                PumplogUtil.getShort(buffer)
+            )
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_SET_DUAL_INJECTION.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_SET_DUAL_INJECTION.kt
new file mode 100644
index 0000000000..2ff5212bfc
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_SET_DUAL_INJECTION.kt
@@ -0,0 +1,60 @@
+package info.nightscout.androidaps.diaconn.pumplog
+
+import okhttp3.internal.and
+import java.nio.ByteBuffer
+import java.nio.ByteOrder
+
+/*
+* 듀얼주입 설정(시작)
+*/
+class LOG_SET_DUAL_INJECTION private constructor(
+    val data: String,
+    val dttm: String,
+    typeAndKind: Byte,
+    val setNormAmount: Short, // 47.5=4750
+    val setSquareAmount: Short, // 47.5=4750
+    private val injectTime: Byte, // 1~30( 1: 10min )
+    val batteryRemain: Byte
+) {
+
+    val type: Byte = PumplogUtil.getType(typeAndKind)
+    val kind: Byte = PumplogUtil.getKind(typeAndKind)
+    fun getInjectTime(): Int {
+        return injectTime and 0xff
+    }
+
+    override fun toString(): String {
+        val sb = StringBuilder("LOG_SET_DUAL_INJECTION{")
+        sb.append("LOG_KIND=").append(LOG_KIND.toInt())
+        sb.append(", data='").append(data).append('\'')
+        sb.append(", dttm='").append(dttm).append('\'')
+        sb.append(", type=").append(type.toInt())
+        sb.append(", kind=").append(kind.toInt())
+        sb.append(", setNormAmount=").append(setNormAmount.toInt())
+        sb.append(", setSquareAmount=").append(setSquareAmount.toInt())
+        sb.append(", injectTime=").append(injectTime and 0xff)
+        sb.append(", batteryRemain=").append(batteryRemain.toInt())
+        sb.append('}')
+        return sb.toString()
+    }
+
+    companion object {
+
+        const val LOG_KIND: Byte = 0x0F
+        fun parse(data: String): LOG_SET_DUAL_INJECTION {
+            val bytes = PumplogUtil.hexStringToByteArray(data)
+            val buffer = ByteBuffer.wrap(bytes)
+            buffer.order(ByteOrder.LITTLE_ENDIAN)
+            return LOG_SET_DUAL_INJECTION(
+                data,
+                PumplogUtil.getDttm(buffer),
+                PumplogUtil.getByte(buffer),
+                PumplogUtil.getShort(buffer),
+                PumplogUtil.getShort(buffer),
+                PumplogUtil.getByte(buffer),
+                PumplogUtil.getByte(buffer)
+            )
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_SET_SQUARE_INJECTION.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_SET_SQUARE_INJECTION.kt
new file mode 100644
index 0000000000..562172146e
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_SET_SQUARE_INJECTION.kt
@@ -0,0 +1,57 @@
+package info.nightscout.androidaps.diaconn.pumplog
+
+import okhttp3.internal.and
+import java.nio.ByteBuffer
+import java.nio.ByteOrder
+
+/*
+* 스퀘어주입 설정(시작)
+*/
+class LOG_SET_SQUARE_INJECTION private constructor(
+    val data: String,
+    val dttm: String,
+    typeAndKind: Byte,    // 47.5=4750
+    val setAmount: Short,    // 1~30(10분 단위 값 의미)
+    private val injectTime: Byte,
+    val batteryRemain: Byte
+) {
+
+    val type: Byte = PumplogUtil.getType(typeAndKind)
+    val kind: Byte = PumplogUtil.getKind(typeAndKind)
+    fun getInjectTime(): Int {
+        return injectTime and 0xff
+    }
+
+    override fun toString(): String {
+        val sb = StringBuilder("LOG_SET_SQUARE_INJECTION{")
+        sb.append("LOG_KIND=").append(LOG_KIND.toInt())
+        sb.append(", data='").append(data).append('\'')
+        sb.append(", dttm='").append(dttm).append('\'')
+        sb.append(", type=").append(type.toInt())
+        sb.append(", kind=").append(kind.toInt())
+        sb.append(", setAmount=").append(setAmount.toInt())
+        sb.append(", injectTime=").append(injectTime and 0xff)
+        sb.append(", batteryRemain=").append(batteryRemain.toInt())
+        sb.append('}')
+        return sb.toString()
+    }
+
+    companion object {
+
+        const val LOG_KIND: Byte = 0x0C
+        fun parse(data: String): LOG_SET_SQUARE_INJECTION {
+            val bytes = PumplogUtil.hexStringToByteArray(data)
+            val buffer = ByteBuffer.wrap(bytes)
+            buffer.order(ByteOrder.LITTLE_ENDIAN)
+            return LOG_SET_SQUARE_INJECTION(
+                data,
+                PumplogUtil.getDttm(buffer),
+                PumplogUtil.getByte(buffer),
+                PumplogUtil.getShort(buffer),
+                PumplogUtil.getByte(buffer),
+                PumplogUtil.getByte(buffer)
+            )
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_SUSPEND_RELEASE_V2.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_SUSPEND_RELEASE_V2.kt
new file mode 100644
index 0000000000..d27625fe8d
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_SUSPEND_RELEASE_V2.kt
@@ -0,0 +1,71 @@
+package info.nightscout.androidaps.diaconn.pumplog
+
+import java.nio.ByteBuffer
+import java.nio.ByteOrder
+
+/*
+* 일시정지 중지 (기저정지 해제)
+*/
+class LOG_SUSPEND_RELEASE_V2 private constructor(
+    val data: String,
+    val dttm: String,
+    typeAndKind: Byte,
+    batteryRemain: Byte,
+    patternType: Byte
+) {
+
+    val type: Byte
+    val kind: Byte
+    val batteryRemain: Byte
+    val patternType // 1=기본, 2=생활1, 3=생활2, 4=생활3, 5=닥터1, 6=닥터2
+        : Byte
+
+    override fun toString(): String {
+        val sb = StringBuilder("LOG_SUSPEND_RELEASE_V2{")
+        sb.append("LOG_KIND=").append(LOG_KIND.toInt())
+        sb.append(", data='").append(data).append('\'')
+        sb.append(", dttm='").append(dttm).append('\'')
+        sb.append(", type=").append(type.toInt())
+        sb.append(", kind=").append(kind.toInt())
+        sb.append(", batteryRemain=").append(batteryRemain.toInt())
+        sb.append(", patternType=").append(patternType.toInt())
+        sb.append('}')
+        return sb.toString()
+    }
+
+    fun getBasalPattern():String {
+        //1=Injection blockage, 2=Battery shortage, 3=Drug shortage, 4=User shutdown, 5=System reset, 6=Other, 7=Emergency shutdown
+        return when(patternType) {
+            1.toByte() -> "Base"
+            2.toByte() -> "Life1"
+            3.toByte() -> "Life2"
+            4.toByte() -> "Life3"
+            5.toByte() -> "Dr1"
+            6.toByte() -> "Dr2"
+            else -> "No Pattern"
+        }
+    }
+    companion object {
+
+        const val LOG_KIND: Byte = 0x04
+        fun parse(data: String): LOG_SUSPEND_RELEASE_V2 {
+            val bytes = PumplogUtil.hexStringToByteArray(data)
+            val buffer = ByteBuffer.wrap(bytes)
+            buffer.order(ByteOrder.LITTLE_ENDIAN)
+            return LOG_SUSPEND_RELEASE_V2(
+                data,
+                PumplogUtil.getDttm(buffer),
+                PumplogUtil.getByte(buffer),
+                PumplogUtil.getByte(buffer),
+                PumplogUtil.getByte(buffer)
+            )
+        }
+    }
+
+    init {
+        type = PumplogUtil.getType(typeAndKind)
+        kind = PumplogUtil.getKind(typeAndKind)
+        this.batteryRemain = batteryRemain
+        this.patternType = patternType
+    }
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_SUSPEND_V2.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_SUSPEND_V2.kt
new file mode 100644
index 0000000000..4f69dc4c89
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_SUSPEND_V2.kt
@@ -0,0 +1,63 @@
+package info.nightscout.androidaps.diaconn.pumplog
+
+import java.nio.ByteBuffer
+import java.nio.ByteOrder
+
+/*
+* 일시정지 시작 (기저정지)
+*/
+class LOG_SUSPEND_V2 private constructor(
+    val data: String,
+    val dttm: String,
+    typeAndKind: Byte,
+    val batteryRemain: Byte,    // 1=기본, 2=생활1, 3=생활2, 4=생활3, 5=닥터1, 6=닥터2
+    val patternType: Byte
+) {
+
+    val type: Byte = PumplogUtil.getType(typeAndKind)
+    val kind: Byte = PumplogUtil.getKind(typeAndKind)
+
+    override fun toString(): String {
+        val sb = StringBuilder("LOG_SUSPEND_V2{")
+        sb.append("LOG_KIND=").append(LOG_KIND.toInt())
+        sb.append(", data='").append(data).append('\'')
+        sb.append(", dttm='").append(dttm).append('\'')
+        sb.append(", type=").append(type.toInt())
+        sb.append(", kind=").append(kind.toInt())
+        sb.append(", batteryRemain=").append(batteryRemain.toInt())
+        sb.append(", patternType=").append(patternType.toInt())
+        sb.append('}')
+        return sb.toString()
+    }
+
+    fun getBasalPattern(): String {
+        //1=Injection blockage, 2=Battery shortage, 3=Drug shortage, 4=User shutdown, 5=System reset, 6=Other, 7=Emergency shutdown
+        return when(patternType) {
+            1.toByte() -> "Base"
+            2.toByte() -> "Life1"
+            3.toByte() -> "Life2"
+            4.toByte() -> "Life3"
+            5.toByte() -> "Dr1"
+            6.toByte() -> "Dr2"
+            else -> "No Pattern"
+        }
+    }
+
+    companion object {
+
+        const val LOG_KIND: Byte = 0x03
+        fun parse(data: String): LOG_SUSPEND_V2 {
+            val bytes = PumplogUtil.hexStringToByteArray(data)
+            val buffer = ByteBuffer.wrap(bytes)
+            buffer.order(ByteOrder.LITTLE_ENDIAN)
+            return LOG_SUSPEND_V2(
+                data,
+                PumplogUtil.getDttm(buffer),
+                PumplogUtil.getByte(buffer),
+                PumplogUtil.getByte(buffer),
+                PumplogUtil.getByte(buffer)
+            )
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_TB_START_V3.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_TB_START_V3.kt
new file mode 100644
index 0000000000..029fe115e0
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_TB_START_V3.kt
@@ -0,0 +1,61 @@
+package info.nightscout.androidaps.diaconn.pumplog
+
+import okhttp3.internal.and
+import org.apache.commons.lang3.StringUtils
+import java.nio.ByteBuffer
+import java.nio.ByteOrder
+
+/*
+* 임시기저 설정(시작)
+*/
+class LOG_TB_START_V3 private constructor(
+    val data: String,
+    val dttm: String,
+    typeAndKind: Byte, // 임시기저 시간(30분 ~ 24시간, 2 ~ 96, 1당 15분 단위 증감)
+    val tbTime: Byte,  // 임시기저 주입량/률, Rate: 1000(0.00U) ~ 1600(6.00U), Ratio: 50000(0%) ~ 50200(200%), 50000이상이면 주입률로 판정, 별도 계산/역산식 참조
+    private val tbInjectRateRatio: Short,
+    private val tbDttm: String // 앱에서 생성 전달한 임시기저 시작(요청) 시간
+) {
+
+    val type: Byte = PumplogUtil.getType(typeAndKind)
+    val kind: Byte = PumplogUtil.getKind(typeAndKind)
+
+    fun getTbInjectRateRatio(): Int {
+        return tbInjectRateRatio and 0xffff
+    }
+
+    override fun toString(): String {
+        val sb = StringBuilder("LOG_TB_START_V3{")
+        sb.append("LOG_KIND=").append(LOG_KIND.toInt())
+        sb.append(", data='").append(data).append('\'')
+        sb.append(", dttm='").append(dttm).append('\'')
+        sb.append(", type=").append(type.toInt())
+        sb.append(", kind=").append(kind.toInt())
+        sb.append(", tbTime=").append(tbTime.toInt())
+        sb.append(", tbInjectRateRatio=").append(tbInjectRateRatio and 0xffff)
+        if (!StringUtils.equals(tbDttm, PumplogUtil.getDttm("ffffffff"))) {
+            sb.append(", tbDttm=").append(tbDttm)
+        }
+        sb.append('}')
+        return sb.toString()
+    }
+
+    companion object {
+
+        const val LOG_KIND: Byte = 0x12
+        fun parse(data: String): LOG_TB_START_V3 {
+            val bytes = PumplogUtil.hexStringToByteArray(data)
+            val buffer = ByteBuffer.wrap(bytes)
+            buffer.order(ByteOrder.LITTLE_ENDIAN)
+            return LOG_TB_START_V3(
+                data,
+                PumplogUtil.getDttm(buffer),
+                PumplogUtil.getByte(buffer),
+                PumplogUtil.getByte(buffer),
+                PumplogUtil.getShort(buffer),
+                PumplogUtil.getDttm(buffer)
+            )
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_TB_STOP_V3.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_TB_STOP_V3.kt
new file mode 100644
index 0000000000..f1dc88fb61
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_TB_STOP_V3.kt
@@ -0,0 +1,64 @@
+package info.nightscout.androidaps.diaconn.pumplog
+
+import okhttp3.internal.and
+import org.apache.commons.lang3.StringUtils
+import java.nio.ByteBuffer
+import java.nio.ByteOrder
+
+/*
+* 임시기저 중지(완료)
+*/
+class LOG_TB_STOP_V3 private constructor(
+    val data: String,
+    val dttm: String,
+    typeAndKind: Byte,
+    // 임시기저 주입량/률, Rate: 1000(0.00U) ~ 1600(6.00U), Ratio: 50000(0%) ~ 50200(200%), 50000이상이면 주입률로 판정, 별도 계산/역산식 참조
+    private val tbInjectRateRatio: Short,
+    // 0=완료, 4=사용자중단, 6=기타, 7=긴급정지
+    val reason: Byte,
+    // 앱에서 생성 전달한 임시기저 시작(요청) 시간
+    private val tbDttm: String
+) {
+
+    val type: Byte = PumplogUtil.getType(typeAndKind)
+    val kind: Byte = PumplogUtil.getKind(typeAndKind)
+
+    fun getTbInjectRateRatio(): Int {
+        return tbInjectRateRatio and 0xffff
+    }
+
+    override fun toString(): String {
+        val sb = StringBuilder("LOG_TB_STOP_V3{")
+        sb.append("LOG_KIND=").append(LOG_KIND.toInt())
+        sb.append(", data='").append(data).append('\'')
+        sb.append(", dttm='").append(dttm).append('\'')
+        sb.append(", type=").append(type.toInt())
+        sb.append(", kind=").append(kind.toInt())
+        sb.append(", tbInjectRateRatio=").append(tbInjectRateRatio and 0xffff)
+        sb.append(", reason=").append(reason.toInt())
+        if (!StringUtils.equals(tbDttm, PumplogUtil.getDttm("ffffffff"))) {
+            sb.append(", tbDttm=").append(tbDttm)
+        }
+        sb.append('}')
+        return sb.toString()
+    }
+
+    companion object {
+
+        const val LOG_KIND: Byte = 0x13
+        fun parse(data: String): LOG_TB_STOP_V3 {
+            val bytes = PumplogUtil.hexStringToByteArray(data)
+            val buffer = ByteBuffer.wrap(bytes)
+            buffer.order(ByteOrder.LITTLE_ENDIAN)
+            return LOG_TB_STOP_V3(
+                data,
+                PumplogUtil.getDttm(buffer),
+                PumplogUtil.getByte(buffer),
+                PumplogUtil.getShort(buffer),
+                PumplogUtil.getByte(buffer),
+                PumplogUtil.getDttm(buffer)
+            )
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/PumplogUtil.java b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/PumplogUtil.java
new file mode 100644
index 0000000000..0f2568f832
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/PumplogUtil.java
@@ -0,0 +1,161 @@
+package info.nightscout.androidaps.diaconn.pumplog;
+
+import android.annotation.SuppressLint;
+
+import org.apache.commons.lang3.RegExUtils;
+import org.apache.commons.lang3.StringUtils;
+
+import java.nio.ByteBuffer;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.TimeZone;
+
+/*
+ * 디아콘 G8 펌프 로그 유틸리티 클래스
+ */
+public class PumplogUtil {
+	/*
+	 * 바이트버퍼에서 4바이트 날짜를 구한다.
+	 * @param buffer 바이트버퍼
+	 * @return GMT 날짜 문자열
+	 */
+    @SuppressLint("SimpleDateFormat")
+	public static String getDttm(ByteBuffer buffer) {
+		byte b0 = buffer.get();
+		byte b1 = buffer.get();
+		byte b2 = buffer.get();
+		byte b3 = buffer.get();
+		long pumpTime = Long.parseLong(String.format("%02x%02x%02x%02x", b3, b2, b1, b0), 16);
+		long epochTime = new Date(0).getTime(); // 1970-01-01
+		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+		sdf.setTimeZone(TimeZone.getTimeZone("UCT"));
+		return sdf.format(new Date(epochTime + pumpTime * 1000));
+	}
+
+	/*
+	 * 바이트버퍼에서 4바이트 날짜를 구한다.
+	 * @param data 로그데이터
+	 * @return GMT 날짜 문자열
+	 */
+    @SuppressLint("SimpleDateFormat")
+	public static String getDttm(String data) {
+		byte[] bytes = PumplogUtil.hexStringToByteArray(data);
+		byte b0 = bytes[0];
+		byte b1 = bytes[1];
+		byte b2 = bytes[2];
+		byte b3 = bytes[3];
+		long pumpTime = Long.parseLong(String.format("%02x%02x%02x%02x", b3, b2, b1, b0), 16);
+		long epochTime = new Date(0).getTime(); // 1970-01-01
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+		sdf.setTimeZone(TimeZone.getTimeZone("UTC"));
+		return sdf.format(new Date(epochTime + pumpTime * 1000));
+	}
+
+	/*
+	 * 바이트버퍼에서 1바이트를 구한다.
+	 * @param buffer 바이트버퍼
+	 * @return byte
+	 */
+	public static byte getByte(ByteBuffer buffer) {
+		return buffer.get();
+	}
+
+	/*
+	 * 바이트버퍼에서 2바이트를 구한다.
+	 * @param buffer 바이트버퍼
+	 * @return short
+	 */
+	public static short getShort(ByteBuffer buffer) {
+		return buffer.getShort();
+	}
+
+	/*
+	 * 바이트버퍼에서 4바이트를 구한다.
+	 * @param buffer 바이트버퍼
+	 * @return int
+	 */
+	public static int getInt(ByteBuffer buffer) {
+		return buffer.getInt();
+	}
+
+	/*
+	 * 로그데이터에서 로그 타입 바이트를 구한다.
+	 * @param data 로그데이터
+	 * @return byte
+	 */
+	public static byte getType(String data) {
+		byte[] bytes = hexStringToByteArray(data);
+		return getType(bytes[4]);
+	}
+
+	/*
+	 * 로그데이터에서 로그 종류 바이트를 구한다.
+	 * @param data 로그데이터
+	 * @return byte
+	 */
+	public static byte getKind(String data) {
+		byte[] bytes = hexStringToByteArray(data);
+		//System.out.println("byte=" + Arrays.toString(bytes));
+		return getKind(bytes[4]);
+	}
+
+	/*
+	 * 바이트 데이터에서 로그 타입 부분을 추출 한다.
+	 * @param b 바이트
+	 * @return byte
+	 */
+	public static byte getType(byte b) {
+		return (byte) ((b >> 6) & 0b00000011); // 상위 2비트 추출
+	}
+
+	/*
+	 * 바이트 데이터에서 로그 종류 부분을 추출 한다.
+	 * @param b 바이트
+	 * @return byte
+	 */
+	public static byte getKind(byte b) {
+		return (byte) (b & 0b00111111); // 하위 6비트 추출
+	}
+
+	/*
+	 * 16진수 표기 문자열을 바이트 배열로 변환한다.
+	 * @param s 16진수 표기 문자열
+	 * @return byte[]
+	 */
+	public static byte[] hexStringToByteArray(String s) {
+		int len = s.length();
+		byte[] data = new byte[len / 2];
+		for (int i = 0; i < len; i += 2) {
+			data[i / 2] = (byte) ((Character.digit(s.charAt(i), 16) << 4) + Character.digit(s.charAt(i + 1), 16));
+		}
+		return data;
+	}
+
+	/*
+	 * 펌프 시간을 날짜 타입으로 변환한다.(펌프에서 GMT기준으로 초를 구하므로, Date 변환시 GMT 기준으로 구해야 한다.
+	 * @param data 1970.1.1이후 경과한 초
+	 * @return 날짜(GMT기준)
+	 */
+	public static Date pumpTimeToGMTDate(Integer data) {
+		long epochTime = new Date(0).getTime(); // 1970-01-01
+		long pumpTime = data.longValue() * 1000; // 초를 밀리초 단위로 변환
+		int timeZoneOffset = TimeZone.getDefault().getRawOffset(); // GMT와 로컬 타임존 사이의 차이
+		return new Date(epochTime + pumpTime - timeZoneOffset);
+	}
+
+    /*
+     * 펌프 버전이 해당 버전보다 크거나 같은지 여부 확인(새로운 기능이 추가된 버전을 체크하기 위함)
+     */
+    public static boolean isPumpVersionGe(String pump_version, int major, int minor) {
+        String version = RegExUtils.replaceAll(pump_version, "[^\\d\\.]", "");
+        int pump_major = Integer.parseInt(StringUtils.split(version, ".")[0]);
+        int pump_minor = Integer.parseInt(StringUtils.split(version, ".")[1]);
+        if (pump_major > major) { // 메이저 버전이 클 때
+            return true;
+        } else if (pump_major < major) { // 메이저 버전이 작을 때
+            return false;
+        } else { // 메이저 버전이 같다면 마이너 버전이 같거나 클 때
+            return pump_minor >= minor;
+        }
+    }
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/service/BLECommonService.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/service/BLECommonService.kt
new file mode 100644
index 0000000000..83b8475b9e
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/service/BLECommonService.kt
@@ -0,0 +1,367 @@
+package info.nightscout.androidaps.diaconn.service
+
+import android.bluetooth.*
+import android.content.Context
+import android.content.Intent
+import android.os.SystemClock
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.activities.ErrorHelperActivity
+import info.nightscout.androidaps.diaconn.DiaconnG8Pump
+import info.nightscout.androidaps.diaconn.R
+import info.nightscout.androidaps.diaconn.packet.*
+import info.nightscout.androidaps.events.EventPumpStatusChanged
+import info.nightscout.androidaps.extensions.notify
+import info.nightscout.androidaps.extensions.waitMillis
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import java.util.*
+import java.util.concurrent.ScheduledFuture
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class BLECommonService @Inject internal constructor(
+    private val injector: HasAndroidInjector,
+    private val aapsLogger: AAPSLogger,
+    private val resourceHelper: ResourceHelper,
+    private val context: Context,
+    private val rxBus: RxBusWrapper,
+    private val diaconnG8ResponseMessageHashTable: DiaconnG8ResponseMessageHashTable,
+    private val diaconnG8SettingResponseMessageHashTable: DiaconnG8SettingResponseMessageHashTable,
+    private val diaconnG8Pump: DiaconnG8Pump,
+){
+
+    companion object {
+        private const val WRITE_DELAY_MILLIS: Long = 50
+        private const val INDICATION_UUID = "6e400003-b5a3-f393-e0a9-e50e24dcca9e"
+        private const val WRITE_UUID = "6e400002-b5a3-f393-e0a9-e50e24dcca9e"
+        private const val CHARACTERISTIC_CONFIG_UUID = "00002902-0000-1000-8000-00805f9b34fb"
+    }
+
+    private var scheduledDisconnection: ScheduledFuture<*>? = null
+    private var processedMessage: DiaconnG8Packet? = null
+    private var processedMessageByte: ByteArray? = null
+    private val mSendQueue = ArrayList<ByteArray>()
+    private var bluetoothManager: BluetoothManager? = null
+    private var bluetoothAdapter: BluetoothAdapter? = null
+    private var connectDeviceName: String? = null
+    private var bluetoothGatt: BluetoothGatt? = null
+
+
+    var isConnected = false
+    var isConnecting = false
+    private var uartIndicate: BluetoothGattCharacteristic? = null
+    private var uartWrite: BluetoothGattCharacteristic? = null
+
+    private var mSequence : Int = 0
+
+    private fun getMsgSequence(): Int {
+        val seq = mSequence % 255
+        mSequence++
+        if (mSequence == 255) {
+            mSequence = 0
+        }
+        return seq
+    }
+
+    @Synchronized
+    fun connect(from: String, address: String?): Boolean {
+        aapsLogger.debug(LTag.PUMPBTCOMM, "Initializing Bluetooth ")
+        if (bluetoothManager == null) {
+            bluetoothManager = context.getSystemService(Context.BLUETOOTH_SERVICE) as BluetoothManager
+            if (bluetoothManager == null) {
+                aapsLogger.error("Unable to initialize BluetoothManager.")
+                return false
+            }
+        }
+        bluetoothAdapter = bluetoothManager?.adapter
+        if (bluetoothAdapter == null) {
+            aapsLogger.error("Unable to obtain a BluetoothAdapter.")
+            return false
+        }
+
+        if (address == null) {
+            aapsLogger.error("unspecified address.")
+            return false
+        }
+
+        val device = bluetoothAdapter?.getRemoteDevice(address)
+        if (device == null) {
+            aapsLogger.error("Device not found.  Unable to connect from: $from")
+            return false
+        }
+        aapsLogger.debug(LTag.PUMPBTCOMM, "Trying to create a new connection from: $from")
+        connectDeviceName = device.name
+        bluetoothGatt = device.connectGatt(context, false, mGattCallback)
+
+        isConnected = false
+        isConnecting = true
+        return true
+    }
+
+    @Synchronized
+    fun stopConnecting() {
+        isConnecting = false
+    }
+
+    @Synchronized
+    fun disconnect(from: String) {
+        aapsLogger.debug(LTag.PUMPBTCOMM, "disconnect from: $from")
+
+        // cancel previous scheduled disconnection to prevent closing upcoming connection
+        scheduledDisconnection?.cancel(false)
+        scheduledDisconnection = null
+
+        if (bluetoothAdapter == null || bluetoothGatt == null) {
+            aapsLogger.error("disconnect is not possible: (mBluetoothAdapter == null) " + (bluetoothAdapter == null))
+            aapsLogger.error("disconnect is not possible: (mBluetoothGatt == null) " + (bluetoothGatt == null))
+            return
+        }
+        bluetoothGatt?.setCharacteristicNotification(uartIndicate, false)
+        bluetoothGatt?.disconnect()
+        isConnected = false
+        SystemClock.sleep(2000)
+    }
+
+    @Synchronized
+    fun close() {
+        aapsLogger.debug(LTag.PUMPBTCOMM, "BluetoothAdapter close")
+        bluetoothGatt?.close()
+        bluetoothGatt = null
+    }
+
+    private val mGattCallback: BluetoothGattCallback = object : BluetoothGattCallback() {
+        override fun onConnectionStateChange(gatt: BluetoothGatt, status: Int, newState: Int) {
+            onConnectionStateChangeSynchronized(gatt, newState) // call it synchronized
+        }
+
+        override fun onServicesDiscovered(gatt: BluetoothGatt, status: Int) {
+            aapsLogger.debug(LTag.PUMPBTCOMM, "onServicesDiscovered")
+            if (status == BluetoothGatt.GATT_SUCCESS) {
+                findCharacteristic()
+            }
+        }
+
+        override fun onCharacteristicChanged(gatt: BluetoothGatt, characteristic: BluetoothGattCharacteristic) {
+            aapsLogger.debug(LTag.PUMPBTCOMM, "(응답) onCharacteristicChanged: " + DiaconnG8Packet.toHex(characteristic.value))
+            // 대량로그응답 처리.
+            if(characteristic.value[1] == 0xb2.toByte()) {
+                aapsLogger.debug(LTag.PUMPBTCOMM, "(대량 로그 처리 응답) onCharacteristicChanged: " + DiaconnG8Packet.toHex(characteristic.value))
+                val message = BigLogInquireResponsePacket(injector)
+                message.handleMessage(characteristic.value)
+
+                // 초기화
+                mSendQueue.clear()
+            } else {
+                processResponseMessage(characteristic.value)
+            }
+        }
+
+        override fun onCharacteristicWrite(gatt: BluetoothGatt, characteristic: BluetoothGattCharacteristic, status: Int) {
+            aapsLogger.debug(LTag.PUMPBTCOMM, "(요청) onCharacteristicWrite: " + DiaconnG8Packet.toHex(characteristic.value))
+        }
+    }
+
+    @Synchronized
+    private fun writeCharacteristicNoResponse(characteristic: BluetoothGattCharacteristic, data: ByteArray) {
+        Thread(Runnable {
+            SystemClock.sleep(WRITE_DELAY_MILLIS)
+            if (bluetoothAdapter == null || bluetoothGatt == null) {
+                aapsLogger.error("BluetoothAdapter not initialized_ERROR")
+                isConnecting = false
+                isConnected = false
+                return@Runnable
+            }
+            characteristic.value = data
+            characteristic.writeType = BluetoothGattCharacteristic.WRITE_TYPE_NO_RESPONSE
+            bluetoothGatt?.writeCharacteristic(characteristic)
+        }).start()
+        SystemClock.sleep(50)
+    }
+
+    // private val uartIndicateBTGattChar: BluetoothGattCharacteristic
+    //     get() = uartIndicate
+    //         ?: BluetoothGattCharacteristic(UUID.fromString(INDICATION_UUID), BluetoothGattCharacteristic.PROPERTY_NOTIFY, 0).also { uartIndicate = it }
+
+    private val uartWriteBTGattChar: BluetoothGattCharacteristic
+        get() = uartWrite
+            ?: BluetoothGattCharacteristic(UUID.fromString(WRITE_UUID), BluetoothGattCharacteristic.PROPERTY_WRITE or BluetoothGattCharacteristic.PROPERTY_WRITE_NO_RESPONSE, 0).also { uartWrite = it }
+
+    private fun getSupportedGattServices(): List<BluetoothGattService>? {
+        aapsLogger.debug(LTag.PUMPBTCOMM, "getSupportedGattServices")
+        if (bluetoothAdapter == null || bluetoothGatt == null) {
+            aapsLogger.error("BluetoothAdapter not initialized_ERROR")
+            isConnecting = false
+            isConnected = false
+            return null
+        }
+        return bluetoothGatt?.services
+    }
+
+    private fun findCharacteristic() {
+        val gattServices = getSupportedGattServices() ?: return
+        var uuid: String
+        for (gattService in gattServices) {
+            val gattCharacteristics = gattService.characteristics
+            for (gattCharacteristic in gattCharacteristics) {
+                uuid = gattCharacteristic.uuid.toString()
+                if (INDICATION_UUID == uuid) {
+                    uartIndicate = gattCharacteristic
+                    //setCharacteristicNotification(uartIndicate, true)
+                    bluetoothGatt?.setCharacteristicNotification(uartIndicate, true)
+                    // nRF Connect 참고하여 추가함
+                    val descriptor: BluetoothGattDescriptor = uartIndicate!!.getDescriptor(UUID.fromString(CHARACTERISTIC_CONFIG_UUID))
+                    descriptor.value = BluetoothGattDescriptor.ENABLE_NOTIFICATION_VALUE
+                    bluetoothGatt!!.writeDescriptor(descriptor)
+                }
+                if (WRITE_UUID == uuid) {
+                    uartWrite = gattCharacteristic
+                }
+            }
+        }
+    }
+
+    @Synchronized
+    private fun onConnectionStateChangeSynchronized(gatt: BluetoothGatt, newState: Int) {
+        aapsLogger.debug(LTag.PUMPBTCOMM, "onConnectionStateChange newState : $newState")
+        if (newState == BluetoothProfile.STATE_CONNECTED) {
+            gatt.discoverServices()
+            isConnected = true
+            isConnecting = false
+            rxBus.send(EventPumpStatusChanged(EventPumpStatusChanged.Status.CONNECTED))
+        } else if (newState == BluetoothProfile.STATE_DISCONNECTED) {
+            close()
+            isConnected = false
+            isConnecting = false
+            rxBus.send(EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTED))
+            aapsLogger.debug(LTag.PUMPBTCOMM, "Device was disconnected " + gatt.device.name) //Device was disconnected
+        }
+    }
+
+    // the rest of packets
+    fun sendMessage(message: DiaconnG8Packet, waitMillis: Long) {
+        // 펌프로 요청하기전 변수에 담기. 마지막 요청정보 확인용.
+        processedMessage = message
+        val sequence = getMsgSequence()
+        aapsLogger.debug(LTag.PUMPBTCOMM, ">>>>> " + message.friendlyName + "  Sequence >>" + sequence)
+        // 요청
+        val bytes = message.encode(sequence)
+        processedMessageByte = bytes
+
+        aapsLogger.debug(LTag.PUMPBTCOMM, "sendMessage() before mSendQueue.size :: ${mSendQueue.size}")
+        // 펌프에 요청 보내기.
+        writeCharacteristicNoResponse(uartWriteBTGattChar, bytes)
+        // 요청 큐에 요청할 바이트 정보 담기.
+        synchronized(mSendQueue) {
+            if(mSendQueue.size > 10) mSendQueue.clear()
+            mSendQueue.add(bytes)
+        }
+        aapsLogger.debug(LTag.PUMPBTCOMM, "sendMessage() after mSendQueue.size :: ${mSendQueue.size}")
+
+        // 메시지동기화
+        synchronized(message) {
+            try {
+                message.waitMillis(waitMillis) //0.5초 대기.
+            } catch (e: InterruptedException) {
+                aapsLogger.error("sendMessage InterruptedException", e)
+            }
+        }
+    }
+
+    // process common packet response
+    private fun processResponseMessage(data: ByteArray) {
+        isConnected = true
+
+        //요청정보
+        val originalMessageSeq = processedMessage?.getSeq(processedMessageByte)
+
+        // 응답정보
+        val receivedCommand = DiaconnG8Packet(injector).getCmd(data)
+        val receivedSeq = DiaconnG8Packet(injector).getSeq(data)
+        val receivedType = DiaconnG8Packet(injector).getType(data)
+
+        aapsLogger.debug(LTag.PUMPBTCOMM, "originalMessageSeq :: $originalMessageSeq, receivedSeq :: $receivedSeq")
+        aapsLogger.debug(LTag.PUMPBTCOMM, "receivedCommand :: $receivedCommand")
+
+        // 응답메시지가 조회응답인지. 설정응답인지 구분해야됨.
+        var message:DiaconnG8Packet? = null
+        // 요청시퀀스와 응답의 시퀀스가 동일한 경우에만 처리.
+        // 펌프로부터 받은 보고응답의 경우 처리
+        if(receivedType == 3) {
+            message = diaconnG8ResponseMessageHashTable.findMessage(receivedCommand)
+            // injection Blocked Report
+            if(message is InjectionBlockReportPacket ) {
+                message.handleMessage(data)
+                diaconnG8Pump.bolusBlocked = true
+                val i = Intent(context, ErrorHelperActivity::class.java)
+                i.putExtra("soundid", R.raw.boluserror)
+                i.putExtra("status", resourceHelper.gs(R.string.injectionblocked))
+                i.putExtra("title", resourceHelper.gs(R.string.injectionblocked))
+                i.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                context.startActivity(i)
+                return
+            }
+            // battery warning report
+            if(message is BatteryWarningReportPacket ) {
+                message.handleMessage(data)
+                val i = Intent(context, ErrorHelperActivity::class.java)
+                i.putExtra("soundid", R.raw.boluserror)
+                i.putExtra("status", resourceHelper.gs(R.string.needbatteryreplace))
+                i.putExtra("title", resourceHelper.gs(R.string.batterywarning))
+                i.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                context.startActivity(i)
+                return
+            }
+
+            // insulin lack warning report
+            if(message is InsulinLackReportPacket ) {
+                message.handleMessage(data)
+                val i = Intent(context, ErrorHelperActivity::class.java)
+                i.putExtra("soundid", R.raw.boluserror)
+                i.putExtra("status", resourceHelper.gs(R.string.needinsullinreplace))
+                i.putExtra("title", resourceHelper.gs(R.string.insulinlackwarning))
+                i.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                context.startActivity(i)
+                return
+            }
+
+        } else {
+            // 큐에 담긴 명령 대기중에 있는 것 조회 처리.
+            synchronized(mSendQueue) {
+                val sendQueueSize = mSendQueue.size
+                if (sendQueueSize > 0) {
+                    for (i in sendQueueSize-1 downTo 0 ) {
+                        val sendQueueSeq = DiaconnG8Packet(injector).getSeq(mSendQueue[i])
+                        val sendQueueType = DiaconnG8Packet(injector).getType(mSendQueue[i])
+                        if (sendQueueSeq == receivedSeq) {
+                            // 설정명령에 대한 응답
+                            if (sendQueueType == 0) {
+                                message = diaconnG8SettingResponseMessageHashTable.findMessage(receivedCommand)
+
+                                // 조회명령에 대한 응답
+                            } else if (sendQueueType == 1) {
+                                message = diaconnG8ResponseMessageHashTable.findMessage(receivedCommand)
+                            }
+                            // 처리 후 큐에서 삭제.
+                            mSendQueue.removeAt(i)
+                            break
+                        }
+                    }
+                }
+            }
+        }
+
+        if (message != null) {
+            aapsLogger.debug(LTag.PUMPBTCOMM, "<<<<< " + message!!.friendlyName + " " + DiaconnG8Packet.toHex(data))
+            // process received data
+            message!!.handleMessage(data)
+            message!!.setReceived()
+            synchronized(message!!) {
+                // notify to sendMessage
+                message!!.notify()
+            }
+        } else aapsLogger.error("Unknown message received " + DiaconnG8Packet.toHex(data))
+    }
+}
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/service/DiaconnG8Service.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/service/DiaconnG8Service.kt
new file mode 100644
index 0000000000..cc9822872d
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/service/DiaconnG8Service.kt
@@ -0,0 +1,624 @@
+package info.nightscout.androidaps.diaconn.service
+
+import android.app.Service
+import android.content.Context
+import android.content.Intent
+import android.os.Binder
+import android.os.IBinder
+import android.os.SystemClock
+import dagger.android.DaggerService
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.Constants
+import info.nightscout.androidaps.activities.ErrorHelperActivity
+import info.nightscout.androidaps.data.PumpEnactResult
+import info.nightscout.androidaps.diaconn.DiaconnG8Plugin
+import info.nightscout.androidaps.diaconn.DiaconnG8Pump
+import info.nightscout.androidaps.diaconn.R
+import info.nightscout.androidaps.diaconn.events.EventDiaconnG8NewStatus
+import info.nightscout.androidaps.diaconn.packet.*
+import info.nightscout.androidaps.diaconn.pumplog.PumplogUtil
+import info.nightscout.androidaps.dialogs.BolusProgressDialog
+import info.nightscout.androidaps.events.EventAppExit
+import info.nightscout.androidaps.events.EventInitializationChanged
+import info.nightscout.androidaps.events.EventProfileSwitchChanged
+import info.nightscout.androidaps.events.EventPumpStatusChanged
+import info.nightscout.androidaps.interfaces.ActivePlugin
+import info.nightscout.androidaps.interfaces.CommandQueueProvider
+import info.nightscout.androidaps.interfaces.Profile
+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.configBuilder.ConstraintChecker
+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.bolusInfo.DetailedBolusInfoStorage
+import info.nightscout.androidaps.plugins.pump.common.defs.PumpType
+import info.nightscout.androidaps.queue.Callback
+import info.nightscout.androidaps.queue.commands.Command
+import info.nightscout.androidaps.utils.DateUtil
+import info.nightscout.androidaps.utils.FabricPrivacy
+import info.nightscout.androidaps.utils.StringUtils
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import info.nightscout.androidaps.utils.sharedPreferences.SP
+import io.reactivex.disposables.CompositeDisposable
+import io.reactivex.schedulers.Schedulers
+import org.joda.time.DateTime
+import org.joda.time.DateTimeZone
+import java.util.concurrent.TimeUnit
+import javax.inject.Inject
+import kotlin.math.abs
+import kotlin.math.ceil
+import kotlin.math.min
+
+class DiaconnG8Service : DaggerService() {
+    @Inject lateinit var injector: HasAndroidInjector
+    @Inject lateinit var aapsLogger: AAPSLogger
+    @Inject lateinit var rxBus: RxBusWrapper
+    @Inject lateinit var sp: SP
+    @Inject lateinit var resourceHelper: ResourceHelper
+    @Inject lateinit var profileFunction: ProfileFunction
+    @Inject lateinit var commandQueue: CommandQueueProvider
+    @Inject lateinit var context: Context
+    @Inject lateinit var diaconnG8Plugin : DiaconnG8Plugin
+    @Inject lateinit var diaconnG8Pump: DiaconnG8Pump
+    @Inject lateinit var diaconnG8ResponseMessageHashTable: DiaconnG8ResponseMessageHashTable
+    @Inject lateinit var activePlugin: ActivePlugin
+    @Inject lateinit var constraintChecker: ConstraintChecker
+    @Inject lateinit var detailedBolusInfoStorage: DetailedBolusInfoStorage
+    @Inject lateinit var bleCommonService: BLECommonService
+    @Inject lateinit var fabricPrivacy: FabricPrivacy
+    @Inject lateinit var pumpSync: PumpSync
+    @Inject lateinit var dateUtil: DateUtil
+
+    private val disposable = CompositeDisposable()
+    private val mBinder: IBinder = LocalBinder()
+    private var lastApproachingDailyLimit: Long = 0
+
+    override fun onCreate() {
+        super.onCreate()
+        disposable.add(rxBus
+            .toObservable(EventAppExit::class.java)
+            .observeOn(Schedulers.io())
+            .subscribe({ stopSelf() }) { fabricPrivacy.logException(it) }
+        )
+    }
+
+    inner class LocalBinder : Binder() {
+        val serviceInstance: DiaconnG8Service
+            get() = this@DiaconnG8Service
+    }
+
+    override fun onBind(intent: Intent): IBinder {
+        return mBinder
+    }
+
+    override fun onStartCommand(intent: Intent, flags: Int, startId: Int): Int {
+        return Service.START_STICKY
+    }
+
+    override fun onDestroy() {
+        disposable.clear()
+        super.onDestroy()
+    }
+
+    val isConnected: Boolean
+        get() = bleCommonService.isConnected
+
+    val isConnecting: Boolean
+        get() = bleCommonService.isConnecting
+
+    fun connect(from: String, address: String): Boolean {
+        return bleCommonService.connect(from, address)
+    }
+
+    fun stopConnecting() {
+        bleCommonService.stopConnecting()
+    }
+
+    fun disconnect(from: String) {
+        bleCommonService.disconnect(from)
+    }
+
+    fun sendMessage(message: DiaconnG8Packet, waitMillis: Long) {
+        bleCommonService.sendMessage(message, waitMillis)
+    }
+
+    private fun sendMessage(message: DiaconnG8Packet) {
+        bleCommonService.sendMessage(message, 500)
+    }
+
+    fun readPumpStatus() {
+        try {
+            val pump = activePlugin.activePump
+            rxBus.send(EventPumpStatusChanged(resourceHelper.gs(R.string.gettingpumpsettings)))
+
+            val pumpFirmwareVersion = sp.getString(resourceHelper.gs(R.string.pumpversion),"")
+
+            if(!StringUtils.emptyString(pumpFirmwareVersion) && PumplogUtil.isPumpVersionGe(pumpFirmwareVersion, 3, 0)) {
+                sendMessage(BigAPSMainInfoInquirePacket(injector)) // APS Pump Main Info
+            } else {
+                sendMessage(BasalLimitInquirePacket(injector)) // basal Limit
+                sendMessage(SneckLimitInquirePacket(injector)) // bolus Limit
+                sendMessage(BigMainInfoInquirePacket(injector)) // Pump Main Info
+                sendMessage(SoundInquirePacket(injector)) // sounds
+                sendMessage(DisplayTimeInquirePacket(injector)) // display
+                sendMessage(LanguageInquirePacket(injector)) // language
+            }
+
+            diaconnG8Pump.lastConnection = System.currentTimeMillis()
+
+            val profile = profileFunction.getProfile()
+            if (profile != null && abs(diaconnG8Pump.baseAmount - profile.getBasal()) >= pump.pumpDescription.basalStep) {
+                rxBus.send(EventPumpStatusChanged(resourceHelper.gs(R.string.gettingpumpsettings)))
+
+                if (!pump.isThisProfileSet(profile) && !commandQueue.isRunning(Command.CommandType.BASAL_PROFILE)) {
+                    rxBus.send(EventProfileSwitchChanged())
+                }
+            }
+
+            // 시간 설정
+            rxBus.send(EventPumpStatusChanged(resourceHelper.gs(R.string.gettingpumptime)))
+            var timeDiff = (diaconnG8Pump.getPumpTime() - System.currentTimeMillis()) / 1000L
+            if (diaconnG8Pump.getPumpTime() == 0L) {
+                 // initial handshake was not successful
+                 // de-initialize pump
+                 diaconnG8Pump.reset()
+                 rxBus.send(EventDiaconnG8NewStatus())
+                 rxBus.send(EventInitializationChanged())
+                 return
+            }
+            aapsLogger.debug(LTag.PUMPCOMM, "Pump time difference: $timeDiff seconds")
+             // phone timezone
+            val tz = DateTimeZone.getDefault()
+            val instant = DateTime.now().millis
+            val offsetInMilliseconds = tz.getOffset(instant).toLong()
+            val offset = TimeUnit.MILLISECONDS.toHours(offsetInMilliseconds).toInt()
+            if (timeDiff > 0 || abs(timeDiff) > 60) {
+                if (abs(timeDiff) > 60 * 60 * 1.5) {
+                    aapsLogger.debug(LTag.PUMPCOMM, "Pump time difference: $timeDiff seconds - large difference")
+                    //If time-diff is very large, warn user until we can synchronize history readings properly
+                    ErrorHelperActivity.runAlarm(context, resourceHelper.gs(R.string.largetimediff), resourceHelper.gs(R.string.largetimedifftitle), R.raw.error)
+
+
+                    //de-initialize pump
+                    diaconnG8Pump.reset()
+                    rxBus.send(EventDiaconnG8NewStatus())
+                    rxBus.send(EventInitializationChanged())
+                    return
+                } else {
+
+                    if(!diaconnG8Pump.isTempBasalInProgress) {
+                        val msgPacket = TimeSettingPacket(injector, dateUtil.now(), offset)
+                        sendMessage(msgPacket)
+
+                        // otp process
+                        if(!processConfirm(msgPacket.msgType)) return
+
+                        timeDiff = (diaconnG8Pump.getPumpTime() - System.currentTimeMillis()) / 1000L
+                        aapsLogger.debug(LTag.PUMPCOMM, "Pump time difference: $timeDiff seconds")
+                    }
+                }
+            }
+            loadHistory()
+            val eb = pumpSync.expectedPumpState().extendedBolus
+            diaconnG8Pump.fromExtendedBolus(eb)
+            val tbr = pumpSync.expectedPumpState().temporaryBasal
+            diaconnG8Pump.fromTemporaryBasal(tbr)
+            rxBus.send(EventDiaconnG8NewStatus())
+            rxBus.send(EventInitializationChanged())
+            //NSUpload.uploadDeviceStatus();
+            if (diaconnG8Pump.dailyTotalUnits > diaconnG8Pump.maxDailyTotalUnits * Constants.dailyLimitWarning) {
+                aapsLogger.debug(LTag.PUMPCOMM, "Approaching daily limit: " + diaconnG8Pump.dailyTotalUnits + "/" + diaconnG8Pump.maxDailyTotalUnits)
+                if (System.currentTimeMillis() > lastApproachingDailyLimit + 30 * 60 * 1000) {
+                    val reportFail = Notification(Notification.APPROACHING_DAILY_LIMIT, resourceHelper.gs(R.string.approachingdailylimit), Notification.URGENT)
+                    rxBus.send(EventNewNotification(reportFail))
+                    pumpSync.insertAnnouncement(resourceHelper.gs(R.string.approachingdailylimit) + ": " + diaconnG8Pump.dailyTotalUnits + "/" + diaconnG8Pump.maxDailyTotalUnits + "U", null, PumpType.DIACONN_G8, diaconnG8Pump.serialNo.toString())
+                    lastApproachingDailyLimit = System.currentTimeMillis()
+                }
+            }
+        } catch (e: Exception) {
+            aapsLogger.error(LTag.PUMPCOMM, "Unhandled exception", e)
+        }
+        aapsLogger.debug(LTag.PUMPCOMM, "Pump status loaded")
+    }
+
+    fun loadHistory(): PumpEnactResult {
+        if (!diaconnG8Plugin.isInitialized()) {
+            val result = PumpEnactResult(injector).success(false)
+            result.comment = "pump not initialized"
+            return result
+        }
+        sendMessage(LogStatusInquirePacket(injector))
+
+        // pump version check
+        if(diaconnG8Pump.isPumpVersionGe2_63) {
+            sendMessage(IncarnationInquirePacket(injector))
+        }
+
+        val result = PumpEnactResult(injector)
+
+        // pump log status
+        val pumpLastNum = diaconnG8Pump.pumpLastLogNum
+        val pumpWrappingCount = diaconnG8Pump.pumpWrappingCount
+        val apsIncarnationNum = sp.getInt(resourceHelper.gs(R.string.apsIncarnationNo), 65536)
+        // aps last log num
+        val pumpSerialNo      = sp.getInt(resourceHelper.gs(R.string.pumpserialno), 0)
+        val apsWrappingCount  = sp.getInt(resourceHelper.gs(R.string.apsWrappingCount), 0)
+        val apsLastLogNum     = sp.getInt(resourceHelper.gs(R.string.apslastLogNum), 0)
+
+        // if first install app
+        if(apsWrappingCount == 0 && apsLastLogNum == 0 ) {
+            pumpLogDefaultSetting()
+        }
+
+        // if pump reset
+        if(apsIncarnationNum != diaconnG8Pump.pumpIncarnationNum) {
+            pumpLogDefaultSetting()
+            sp.putInt(resourceHelper.gs(R.string.apsIncarnationNo), diaconnG8Pump.pumpIncarnationNum)
+        }
+
+        // if another pump
+        if(pumpSerialNo != diaconnG8Pump.serialNo) {
+            pumpLogDefaultSetting()
+            sp.putInt(resourceHelper.gs(R.string.pumpserialno), diaconnG8Pump.serialNo)
+        }
+
+        val apsLastNum = apsWrappingCount * 10000 + apsLastLogNum
+        if((pumpWrappingCount * 10000 + pumpLastNum) < apsLastLogNum ) {
+            pumpLogDefaultSetting()
+        }
+
+        val start:Int? // log sync startNo
+        val end:Int? // log sync endNo
+        if (((pumpWrappingCount * 10000 + pumpLastNum) - apsLastNum) > 10000) {
+            start = pumpLastNum
+            end = 10000
+        } else if (pumpWrappingCount > apsWrappingCount && apsLastLogNum < 9999) {
+            start = apsLastLogNum + 1
+            end = 10000
+        } else if (pumpWrappingCount > apsWrappingCount && apsLastLogNum >= 9999) {
+            start = 0
+            end = pumpLastNum
+        } else {
+            start = apsLastLogNum + 1
+            end = pumpLastNum
+        }
+
+        // pump log loop size
+        val pumpLogPageSize = 11
+        val loopCount: Int = ceil (((end - start) / 11.0)).toInt()
+
+        // log sync start!
+        if (loopCount > 0) {
+            diaconnG8Pump.isProgressPumpLogSync = true
+
+            for (i in 0 until loopCount) {
+                val startLogNo: Int = start + i * pumpLogPageSize
+                val endLogNo: Int = startLogNo + min(end - startLogNo, pumpLogPageSize)
+                val msg = BigLogInquirePacket(injector, startLogNo, endLogNo, 100)
+                sendMessage(msg)
+            }
+            diaconnG8Pump.historyDoneReceived = true
+            while (!diaconnG8Pump.historyDoneReceived && bleCommonService.isConnected) {
+                SystemClock.sleep(100)
+            }
+            result.success(true)
+            diaconnG8Pump.lastConnection = System.currentTimeMillis()
+        }
+        return result
+    }
+
+    fun setUserSettings(): PumpEnactResult {
+        val result = PumpEnactResult(injector)
+
+        val msg: DiaconnG8Packet = when(diaconnG8Pump.setUserOptionType) {
+            DiaconnG8Pump.ALARM -> SoundSettingPacket(injector, diaconnG8Pump.beepAndAlarm, diaconnG8Pump.alarmIntesity)
+            DiaconnG8Pump.LCD -> DisplayTimeoutSettingPacket(injector, diaconnG8Pump.lcdOnTimeSec)
+            DiaconnG8Pump.LANG -> LanguageSettingPacket(injector, diaconnG8Pump.selectedLanguage)
+            DiaconnG8Pump.BOLUS_SPEED -> BolusSpeedSettingPacket(injector, diaconnG8Pump.bolusSpeed)
+            else -> null
+        } ?: return result.success(false)
+
+        sendMessage(msg )
+        // pump confirm
+        if(diaconnG8Pump.otpNumber == 0) {
+            aapsLogger.error(LTag.PUMPCOMM, "otp is not received yet")
+            result.success(false)
+            result.comment("펌프와 연결 상태를 확인해주세요.")
+            return result
+        }
+        sendMessage(AppConfirmSettingPacket(injector, msg.msgType, diaconnG8Pump.otpNumber))
+        diaconnG8Pump.otpNumber = 0
+        SystemClock.sleep(100)
+        return result.success(true)
+    }
+
+    fun bolus(insulin: Double, carbs: Int, carbTime: Long, t: EventOverviewBolusProgress.Treatment): Boolean {
+        if (!isConnected) return false
+        if (BolusProgressDialog.stopPressed) return false
+        rxBus.send(EventPumpStatusChanged(resourceHelper.gs(R.string.startingbolus)))
+
+        // bolus speed setting
+        val apsPrefBolusSpeed = sp.getInt("g8_bolusspeed", 5)
+        val isSpeedSyncToPump = sp.getBoolean("diaconn_g8_isbolusspeedsync", false)
+
+        // aps speed check
+        if(!isSpeedSyncToPump) {
+            val msg = BolusSpeedSettingPacket(injector, apsPrefBolusSpeed)
+            sendMessage(msg)
+            sendMessage(AppConfirmSettingPacket(injector, msg.msgType, diaconnG8Pump.otpNumber))
+            diaconnG8Pump.otpNumber = 0
+        }
+
+        // pump bolus speed inquire
+        sendMessage(BolusSpeedInquirePacket(injector))
+        diaconnG8Pump.bolusDone = false
+        diaconnG8Pump.bolusingTreatment = t
+        diaconnG8Pump.bolusAmountToBeDelivered = insulin
+        diaconnG8Pump.bolusStopped = false
+        diaconnG8Pump.bolusStopForced = false
+        diaconnG8Pump.bolusProgressLastTimeStamp = dateUtil.now()
+        val start = InjectionSnackSettingPacket(injector, (insulin * 100).toInt())
+        if (carbs > 0) {
+            pumpSync.syncCarbsWithTimestamp(carbTime, carbs.toDouble(), null, PumpType.DIACONN_G8, diaconnG8Pump.serialNo.toString())
+        }
+        val bolusStart = System.currentTimeMillis()
+        if (insulin > 0) {
+            if (!diaconnG8Pump.bolusStopped) {
+                sendMessage(start)
+                // otp process
+                if(!processConfirm(start.msgType)) return false
+            } else {
+                t.insulin = 0.0
+                return false
+            }
+        }
+        val bolusingEvent = EventOverviewBolusProgress
+        bolusingEvent.t = t
+        bolusingEvent.percent = 99
+        //diaconnG8Pump.bolusingTreatment = null
+        var speed = 12
+        when (diaconnG8Pump.speed) {
+            1 -> speed = 60
+            2 -> speed = 30
+            3 -> speed = 20
+            4 -> speed = 15
+            5 -> speed = 12
+            6 -> speed = 10
+            7 -> speed = 9
+            8 -> speed = 8
+        }
+
+        val bolusDurationInMSec = (insulin * speed * 1000).toLong()
+        val expectedEnd = bolusStart + bolusDurationInMSec + 7500L
+        val totalwaitTime = (expectedEnd - System.currentTimeMillis()) /1000
+        while (!diaconnG8Pump.bolusDone) {
+            val waitTime = (expectedEnd - System.currentTimeMillis()) / 1000
+            bolusingEvent.status = String.format(resourceHelper.gs(R.string.waitingforestimatedbolusend), if(waitTime < 0) 0 else waitTime)
+            var progressPecent = 0
+            if(totalwaitTime > waitTime) {
+                progressPecent = ((totalwaitTime - waitTime) * 100 / totalwaitTime).toInt()
+            }
+            bolusingEvent.percent = min(progressPecent, 100)
+            rxBus.send(bolusingEvent)
+            SystemClock.sleep(200)
+        }
+
+        // do not call loadHistory() directly, reconnection may be needed
+        commandQueue.loadEvents(object : Callback() {
+            override fun run() {
+                // reread bolus status
+                rxBus.send(EventPumpStatusChanged(resourceHelper.gs(R.string.gettingbolusstatus)))
+                sendMessage(InjectionSnackInquirePacket(injector), 1000) // last bolus
+                // 볼러스 결과 보고패킷에서 처리함.
+                bolusingEvent.percent = 100
+                rxBus.send(EventPumpStatusChanged(resourceHelper.gs(R.string.disconnecting)))
+            }
+        })
+       return !start.failed
+    }
+
+    fun bolusStop() {
+        val stop = InjectionCancelSettingPacket(injector, 0x07.toByte())
+        diaconnG8Pump.bolusStopForced = true
+        if (isConnected) {
+            sendMessage(stop)
+            // otp process
+            if(!processConfirm(stop.msgType)) return
+            while (!diaconnG8Pump.bolusStopped) {
+                SystemClock.sleep(200)
+            }
+        } else {
+            diaconnG8Pump.bolusStopped = true
+        }
+    }
+
+    fun tempBasal(absoluteRate: Double, durationInHours: Double): Boolean {
+        if (!isConnected) return false
+
+        // temp state check
+        sendMessage(TempBasalInquirePacket(injector))
+
+        if (diaconnG8Pump.tbStatus ==1 ) {
+            rxBus.send(EventPumpStatusChanged(resourceHelper.gs(R.string.stoppingtempbasal)))
+            val msgPacket = TempBasalSettingPacket(injector, 2, diaconnG8Pump.tbTime, diaconnG8Pump.tbInjectRateRatio)
+            // tempbasal stop
+            sendMessage(msgPacket)
+            // otp process
+            if(!processConfirm(msgPacket.msgType)) return false
+            diaconnG8Pump.tempBasalStart= dateUtil.now()
+        }
+        rxBus.send(EventPumpStatusChanged(resourceHelper.gs(R.string.settingtempbasal)))
+        val tbInjectRate = ((absoluteRate*100) + 1000).toInt()
+        val msgTBR = TempBasalSettingPacket(injector, 1, ((durationInHours * 60) / 15).toInt(), tbInjectRate)
+        sendMessage(msgTBR)
+        // otp process
+        if(!processConfirm(msgTBR.msgType)) return false
+        // pump tempbasal status inquire
+        sendMessage(TempBasalInquirePacket(injector))
+        loadHistory()
+        val tbr = pumpSync.expectedPumpState().temporaryBasal
+        diaconnG8Pump.fromTemporaryBasal(tbr)
+        rxBus.send(EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTING))
+        return msgTBR.success()
+    }
+
+    fun tempBasalShortDuration(absoluteRate: Double, durationInMinutes: Int): Boolean {
+        if (durationInMinutes != 15 && durationInMinutes != 30) {
+            aapsLogger.error(LTag.PUMPCOMM, "Wrong duration param")
+            return false
+        }
+
+        // temp state check
+        sendMessage(TempBasalInquirePacket(injector))
+        if (diaconnG8Pump.tbStatus ==1 ) {
+            rxBus.send(EventPumpStatusChanged(resourceHelper.gs(R.string.stoppingtempbasal)))
+            val msgPacket = TempBasalSettingPacket(injector, 2, diaconnG8Pump.tbTime, diaconnG8Pump.tbInjectRateRatio)
+            // tempbasal stop
+            sendMessage(msgPacket)
+            // otp process
+            if(!processConfirm(msgPacket.msgType)) return false
+            SystemClock.sleep(500)
+        }
+        rxBus.send(EventPumpStatusChanged(resourceHelper.gs(R.string.settingtempbasal)))
+        val tbInjectRate = absoluteRate * 100 + 1000
+        val msgTBR = TempBasalSettingPacket(injector, 1, 2, tbInjectRate.toInt())
+        sendMessage(msgTBR)
+        // otp process
+        if(!processConfirm(msgTBR.msgType)) return false
+        sendMessage(TempBasalInquirePacket(injector))
+        loadHistory()
+        val tbr = pumpSync.expectedPumpState().temporaryBasal
+        diaconnG8Pump.fromTemporaryBasal(tbr)
+        rxBus.send(EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTING))
+        return msgTBR.success()
+    }
+
+    fun tempBasalStop(): Boolean {
+        if (!isConnected) return false
+        rxBus.send(EventPumpStatusChanged(resourceHelper.gs(R.string.stoppingtempbasal)))
+        // temp state check
+        sendMessage(TempBasalInquirePacket(injector))
+        if(diaconnG8Pump.tbStatus == 1) {
+            val msgPacket = TempBasalSettingPacket(
+                injector,
+                2,
+                diaconnG8Pump.tbTime,
+                diaconnG8Pump.tbInjectRateRatio
+            )
+            // tempbasal stop
+            sendMessage(msgPacket)
+            // otp process
+            if (!processConfirm(msgPacket.msgType)) return false
+            SystemClock.sleep(500)
+        }
+
+        loadHistory()
+        val tbr = pumpSync.expectedPumpState().temporaryBasal
+        diaconnG8Pump.fromTemporaryBasal(tbr)
+        rxBus.send(EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTING))
+        return true
+    }
+
+    fun extendedBolus(insulin: Double, durationInMinutes: Int): Boolean {
+        if (!isConnected) return false
+        rxBus.send(EventPumpStatusChanged(resourceHelper.gs(R.string.settingextendedbolus)))
+        aapsLogger.error(LTag.PUMPCOMM, "insulin: $insulin durationInMinutes: $durationInMinutes")
+
+        val msgExtended = InjectionExtendedBolusSettingPacket(injector, (insulin * 100).toInt(), durationInMinutes, dateUtil.now())
+        sendMessage(msgExtended)
+        // otp process
+        if(!processConfirm(msgExtended.msgType)) return false
+        //diaconnG8Pump.isExtendedInProgress = true
+        loadHistory()
+        val eb = pumpSync.expectedPumpState().extendedBolus
+        diaconnG8Pump.fromExtendedBolus(eb)
+        rxBus.send(EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTING))
+        return msgExtended.success()
+    }
+
+    fun extendedBolusStop(): Boolean {
+        if (!isConnected) return false
+        rxBus.send(EventPumpStatusChanged(resourceHelper.gs(R.string.stoppingextendedbolus)))
+        val msgType  = if(diaconnG8Pump.dualStatus == 1) 0x09.toByte() else 0x08.toByte()
+        val msgStop = InjectionCancelSettingPacket(injector, msgType)
+        sendMessage(msgStop)
+        // otp process
+        if(!processConfirm(msgStop.msgType)) return false
+        loadHistory() // pump log sync( db update)
+        val eb = pumpSync.expectedPumpState().extendedBolus
+        diaconnG8Pump.fromExtendedBolus(eb)
+        rxBus.send(EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTING))
+        return  msgStop.success()
+    }
+
+    fun updateBasalsInPump(profile: Profile): Boolean {
+        if (!isConnected) return false
+        rxBus.send(EventPumpStatusChanged(resourceHelper.gs(R.string.updatingbasalrates)))
+        val basalList = diaconnG8Pump.buildDiaconnG8ProfileRecord(profile)
+
+        val requestReqPacket1 = BasalSettingPacket(
+            injector, 1, 1, (basalList[0] * 100).toInt(), (basalList[1] * 100).toInt(), (basalList[2] * 100).toInt(), (basalList[3] * 100).toInt(), (basalList[4] * 100).toInt(), (basalList[5] * 100).toInt()
+        )
+        val requestReqPacket2= BasalSettingPacket(
+            injector, 1, 2, (basalList[6] * 100).toInt(), (basalList[7] * 100).toInt(), (basalList[8] * 100).toInt(), (basalList[9] * 100).toInt(), (basalList[10] * 100).toInt(), (basalList[11] * 100).toInt()
+        )
+        val requestReqPacket3= BasalSettingPacket(
+            injector, 1, 3, (basalList[12] * 100).toInt(), (basalList[13] * 100).toInt(), (basalList[14] * 100).toInt(), (basalList[15] * 100).toInt(), (basalList[16] * 100).toInt(), (basalList[17] * 100).toInt()
+        )
+        val requestReqPacket4= BasalSettingPacket(
+            injector, 1, 4, (basalList[18] * 100).toInt(), (basalList[19] * 100).toInt(), (basalList[20] * 100).toInt(), (basalList[21] * 100).toInt(), (basalList[22] * 100).toInt(), (basalList[23] * 100).toInt()
+        )
+        // setting basal pattern 1,2,3,4
+        sendMessage(requestReqPacket1)
+        sendMessage(requestReqPacket2)
+        sendMessage(requestReqPacket3)
+        sendMessage(requestReqPacket4)
+
+        // otp process
+        if(!processConfirm(requestReqPacket4.msgType)) return false
+        // pump saving time about 30 second
+        aapsLogger.debug(LTag.PUMPCOMM, "30 seconds Waiting!!")
+        SystemClock.sleep(30000)
+
+        val msgPacket = InjectionBasalSettingPacket(injector, 1)
+        sendMessage(msgPacket)
+        // otp process
+        if(!processConfirm(msgPacket.msgType)) return false
+        readPumpStatus()
+        rxBus.send(EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTING))
+        return requestReqPacket4.success()
+    }
+
+    private fun pumpLogDefaultSetting() {
+        val apsWrappingCount = diaconnG8Pump.pumpWrappingCount
+        val apsLastLogNum = if(diaconnG8Pump.pumpLastLogNum - 1 < 0 ) 0 else  diaconnG8Pump.pumpLastLogNum - 1
+        sp.putInt(resourceHelper.gs(R.string.apslastLogNum), apsLastLogNum)
+        sp.putInt(resourceHelper.gs(R.string.apsWrappingCount), apsWrappingCount)
+    }
+
+    private fun processConfirm(msgType:Byte) : Boolean {
+        // pump confirm
+        if(diaconnG8Pump.otpNumber == 0) {
+            aapsLogger.error(LTag.PUMPCOMM, "otp is not received yet")
+
+            // Comments are made as dialogs are exposed twice each in the event of an error.
+            // Thread {
+            //     val i = Intent(context, ErrorHelperActivity::class.java)
+            //     i.putExtra("soundid", R.raw.boluserror)
+            //     i.putExtra("status", resourceHelper.gs(R.string.diaconn_g8_errotpreceivedyet))
+            //     i.putExtra("title", resourceHelper.gs(R.string.pumperror))
+            //     i.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+            //     context.startActivity(i)
+            // }.start()
+
+            return false
+        }
+        sendMessage(AppConfirmSettingPacket(injector, msgType, diaconnG8Pump.otpNumber), 2000)
+        diaconnG8Pump.otpNumber = 0
+        return true
+    }
+}
\ No newline at end of file
diff --git a/diaconn/src/main/res/layout/diaconn_g8_blescanner_activity.xml b/diaconn/src/main/res/layout/diaconn_g8_blescanner_activity.xml
new file mode 100644
index 0000000000..86b6406ee1
--- /dev/null
+++ b/diaconn/src/main/res/layout/diaconn_g8_blescanner_activity.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout 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:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    tools:context=".activities.DiaconnG8BLEScanActivity">
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:background="@color/activity_title_background"
+        android:orientation="horizontal"
+        android:padding="5dp">
+
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:contentDescription="@string/diaconn_pairing"
+            app:srcCompat="@drawable/ic_bluetooth_white_48dp" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_centerInParent="true"
+            android:layout_gravity="center"
+            android:layout_marginLeft="10dp"
+            android:layout_marginRight="10dp"
+            android:text="@string/diaconn_pairing"
+            android:textAlignment="center"
+            android:textAppearance="?android:attr/textAppearanceLarge" />
+
+    </RelativeLayout>
+
+    <ListView
+        android:id="@+id/blescanner_listview"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+
+    <TextView
+        android:id="@+id/blescanner_nodevice"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:gravity="center"
+        android:text="@string/diaconn_nodeviceavailable"
+        android:textColor="#FF7F8288" />
+
+</LinearLayout>
diff --git a/diaconn/src/main/res/layout/diaconn_g8_blescanner_item.xml b/diaconn/src/main/res/layout/diaconn_g8_blescanner_item.xml
new file mode 100644
index 0000000000..9a39302163
--- /dev/null
+++ b/diaconn/src/main/res/layout/diaconn_g8_blescanner_item.xml
@@ -0,0 +1,27 @@
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="52dp"
+    android:layout_marginLeft="15.67dp"
+    android:layout_marginRight="15.67dp">
+
+    <TextView
+        android:id="@+id/ble_name"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentStart="true"
+        android:layout_centerVertical="true"
+        android:layout_toStartOf="@+id/ble_address"
+        android:textColor="#ffffff"
+        android:textSize="20sp" />
+
+    <TextView
+        android:id="@+id/ble_address"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentEnd="true"
+        android:layout_centerVertical="true"
+        android:layout_marginStart="6.5dp"
+        android:textColor="#FF00A0E9"
+        android:textSize="20sp" />
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/diaconn/src/main/res/layout/diaconn_g8_fragment.xml b/diaconn/src/main/res/layout/diaconn_g8_fragment.xml
new file mode 100644
index 0000000000..5f4b5abeb4
--- /dev/null
+++ b/diaconn/src/main/res/layout/diaconn_g8_fragment.xml
@@ -0,0 +1,715 @@
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:paddingTop="5dp"
+    tools:context="info.nightscout.androidaps.diaconn.DiaconnG8Fragment">
+
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <ScrollView
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_above="@+id/buttons"
+            android:fillViewport="true">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical">
+
+                <LinearLayout
+                    android:id="@+id/diaconn_g8_pumpstatuslayout"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal"
+                    android:paddingBottom="5dp"
+                    android:paddingTop="2dp"
+                    android:visibility="gone">
+
+                    <TextView
+                        android:id="@+id/diaconn_g8_pumpstatus"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="5dp"
+                        android:layout_marginRight="5dp"
+                        android:background="@color/pumpStatusBackground"
+                        android:gravity="center_vertical|center_horizontal"
+                        android:text="@string/initializing"
+                        android:textAppearance="?android:attr/textAppearanceSmall" />
+                </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"
+                        android:gravity="end"
+                        android:paddingRight="5dp"
+                        android:text="@string/serialnumber"
+                        android:textSize="14sp" />
+
+                    <TextView
+                        android:layout_width="5dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="0"
+                        android:gravity="center_horizontal"
+                        android:paddingEnd="2dp"
+                        android:paddingStart="2dp"
+                        android:text=":"
+                        android:textSize="14sp" />
+
+                    <TextView
+                        android:id="@+id/serial_number"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:gravity="start"
+                        android:paddingLeft="5dp"
+                        android:textColor="@android:color/white"
+                        android:textSize="14sp" />
+
+
+                </LinearLayout>
+
+                <View
+                    android:layout_width="fill_parent"
+                    android:layout_height="2dip"
+                    android:layout_marginBottom="5dp"
+                    android:layout_marginLeft="20dp"
+                    android:layout_marginRight="20dp"
+                    android:layout_marginTop="5dp"
+                    android:background="@color/list_delimiter" />
+
+                <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"
+                        android:gravity="end"
+                        android:paddingRight="5dp"
+                        android:text="@string/diaconn_g8_bluetooth_status"
+                        android:textSize="14sp" />
+
+                    <TextView
+                        android:layout_width="5dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="0"
+                        android:gravity="center_horizontal"
+                        android:paddingEnd="2dp"
+                        android:paddingStart="2dp"
+                        android:text=":"
+                        android:textSize="14sp" />
+
+                    <com.joanzapata.iconify.widget.IconTextView
+                        android:id="@+id/btconnection"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:gravity="start"
+                        android:paddingLeft="5dp"
+                        android:text="{fa-bluetooth-b}"
+                        android:textColor="@android:color/white"
+                        android:textSize="20dp" />
+
+
+                </LinearLayout>
+
+                <TextView
+                    android:id="@+id/queue"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="content"
+                    android:textAlignment="center" />
+
+                <View
+                    android:layout_width="fill_parent"
+                    android:layout_height="2dip"
+                    android:layout_marginBottom="5dp"
+                    android:layout_marginLeft="20dp"
+                    android:layout_marginRight="20dp"
+                    android:layout_marginTop="5dp"
+                    android:background="@color/list_delimiter" />
+
+                <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"
+                        android:gravity="end"
+                        android:paddingRight="5dp"
+                        android:text="@string/battery_label"
+                        android:textSize="14sp" />
+
+                    <TextView
+                        android:layout_width="5dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="0"
+                        android:gravity="center_horizontal"
+                        android:paddingEnd="2dp"
+                        android:paddingStart="2dp"
+                        android:text=":"
+                        android:textSize="14sp" />
+
+                    <com.joanzapata.iconify.widget.IconTextView
+                        android:id="@+id/battery"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:gravity="start"
+                        android:paddingLeft="5dp"
+                        android:textColor="@android:color/white"
+                        android:textSize="20dp" />
+
+
+                </LinearLayout>
+
+                <View
+                    android:layout_width="fill_parent"
+                    android:layout_height="2dip"
+                    android:layout_marginBottom="5dp"
+                    android:layout_marginLeft="20dp"
+                    android:layout_marginRight="20dp"
+                    android:layout_marginTop="5dp"
+                    android:background="@color/list_delimiter" />
+
+                <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"
+                        android:gravity="end"
+                        android:paddingRight="5dp"
+                        android:text="@string/lastconnection_label"
+                        android:textSize="14sp" />
+
+                    <TextView
+                        android:layout_width="5dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="0"
+                        android:gravity="center_horizontal"
+                        android:paddingEnd="2dp"
+                        android:paddingStart="2dp"
+                        android:text=":"
+                        android:textSize="14sp" />
+
+                    <TextView
+                        android:id="@+id/lastconnection"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:gravity="start"
+                        android:paddingLeft="5dp"
+                        android:textColor="@android:color/white"
+                        android:textSize="14sp" />
+
+                </LinearLayout>
+
+                <View
+                    android:layout_width="fill_parent"
+                    android:layout_height="2dip"
+                    android:layout_marginBottom="5dp"
+                    android:layout_marginLeft="20dp"
+                    android:layout_marginRight="20dp"
+                    android:layout_marginTop="5dp"
+                    android:background="@color/list_delimiter" />
+
+                <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"
+                        android:gravity="end"
+                        android:paddingRight="5dp"
+                        android:text="@string/lastbolus_label"
+                        android:textSize="14sp" />
+
+                    <TextView
+                        android:layout_width="5dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="0"
+                        android:gravity="center_horizontal"
+                        android:paddingEnd="2dp"
+                        android:paddingStart="2dp"
+                        android:text=":"
+                        android:textSize="14sp" />
+
+                    <TextView
+                        android:id="@+id/lastbolus"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:gravity="start"
+                        android:paddingLeft="5dp"
+                        android:textColor="@android:color/white"
+                        android:textSize="14sp" />
+
+                </LinearLayout>
+
+                <View
+                    android:layout_width="fill_parent"
+                    android:layout_height="2dip"
+                    android:layout_marginBottom="5dp"
+                    android:layout_marginLeft="20dp"
+                    android:layout_marginRight="20dp"
+                    android:layout_marginTop="5dp"
+                    android:background="@color/list_delimiter" />
+
+                <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"
+                        android:gravity="end"
+                        android:paddingRight="5dp"
+                        android:text="@string/dailyunits"
+                        android:textSize="14sp" />
+
+                    <TextView
+                        android:layout_width="5dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="0"
+                        android:gravity="center_horizontal"
+                        android:paddingEnd="2dp"
+                        android:paddingStart="2dp"
+                        android:text=":"
+                        android:textSize="14sp" />
+
+                    <TextView
+                        android:id="@+id/dailyunits"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:gravity="start"
+                        android:paddingLeft="5dp"
+                        android:textColor="@android:color/white"
+                        android:textSize="14sp" />
+
+                </LinearLayout>
+
+                <View
+                    android:layout_width="fill_parent"
+                    android:layout_height="2dip"
+                    android:layout_marginBottom="5dp"
+                    android:layout_marginLeft="20dp"
+                    android:layout_marginRight="20dp"
+                    android:layout_marginTop="5dp"
+                    android:background="@color/list_delimiter" />
+
+                <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"
+                        android:gravity="end"
+                        android:paddingRight="5dp"
+                        android:text="@string/basebasalrate_label"
+                        android:textSize="14sp" />
+
+                    <TextView
+                        android:layout_width="5dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="0"
+                        android:gravity="center_horizontal"
+                        android:paddingEnd="2dp"
+                        android:paddingStart="2dp"
+                        android:text=":"
+                        android:textSize="14sp" />
+
+                    <TextView
+                        android:id="@+id/basabasalrate"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:gravity="start"
+                        android:paddingLeft="5dp"
+                        android:textColor="@android:color/white"
+                        android:textSize="14sp" />
+
+                </LinearLayout>
+
+                <View
+                    android:layout_width="fill_parent"
+                    android:layout_height="2dip"
+                    android:layout_marginBottom="5dp"
+                    android:layout_marginLeft="20dp"
+                    android:layout_marginRight="20dp"
+                    android:layout_marginTop="5dp"
+                    android:background="@color/list_delimiter" />
+
+                <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"
+                        android:gravity="end"
+                        android:paddingRight="5dp"
+                        android:text="@string/tempbasal_label"
+                        android:textSize="14sp" />
+
+                    <TextView
+                        android:layout_width="5dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="0"
+                        android:gravity="center_horizontal"
+                        android:paddingEnd="2dp"
+                        android:paddingStart="2dp"
+                        android:text=":"
+                        android:textSize="14sp" />
+
+                    <TextView
+                        android:id="@+id/tempbasal"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:gravity="start"
+                        android:paddingLeft="5dp"
+                        android:textColor="@android:color/white"
+                        android:textSize="14sp" />
+
+                </LinearLayout>
+
+                <View
+                    android:layout_width="fill_parent"
+                    android:layout_height="2dip"
+                    android:layout_marginBottom="5dp"
+                    android:layout_marginLeft="20dp"
+                    android:layout_marginRight="20dp"
+                    android:layout_marginTop="5dp"
+                    android:background="@color/list_delimiter" />
+
+                <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"
+                        android:gravity="end"
+                        android:paddingRight="5dp"
+                        android:text="@string/virtualpump_extendedbolus_label"
+                        android:textSize="14sp" />
+
+                    <TextView
+                        android:layout_width="5dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="0"
+                        android:gravity="center_horizontal"
+                        android:paddingEnd="2dp"
+                        android:paddingStart="2dp"
+                        android:text=":"
+                        android:textSize="14sp" />
+
+                    <TextView
+                        android:id="@+id/extendedbolus"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:gravity="start"
+                        android:paddingLeft="5dp"
+                        android:textColor="@android:color/white"
+                        android:textSize="14sp" />
+
+                </LinearLayout>
+
+                <View
+                    android:layout_width="fill_parent"
+                    android:layout_height="2dip"
+                    android:layout_marginBottom="5dp"
+                    android:layout_marginLeft="20dp"
+                    android:layout_marginRight="20dp"
+                    android:layout_marginTop="5dp"
+                    android:background="@color/list_delimiter" />
+
+                <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"
+                        android:gravity="end"
+                        android:paddingRight="5dp"
+                        android:text="@string/reservoir_label"
+                        android:textSize="14sp" />
+
+                    <TextView
+                        android:layout_width="5dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="0"
+                        android:gravity="center_horizontal"
+                        android:paddingEnd="2dp"
+                        android:paddingStart="2dp"
+                        android:text=":"
+                        android:textSize="14sp" />
+
+                    <TextView
+                        android:id="@+id/reservoir"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:gravity="start"
+                        android:paddingLeft="5dp"
+                        android:textColor="@android:color/white"
+                        android:textSize="14sp" />
+
+                </LinearLayout>
+
+                <View
+                    android:layout_width="fill_parent"
+                    android:layout_height="2dip"
+                    android:layout_marginBottom="5dp"
+                    android:layout_marginLeft="20dp"
+                    android:layout_marginRight="20dp"
+                    android:layout_marginTop="5dp"
+                    android:background="@color/list_delimiter" />
+
+                <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"
+                        android:gravity="end"
+                        android:paddingRight="5dp"
+                        android:text="@string/basal_step"
+                        android:textSize="14sp" />
+
+                    <TextView
+                        android:layout_width="5dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="0"
+                        android:gravity="center_horizontal"
+                        android:paddingEnd="2dp"
+                        android:paddingStart="2dp"
+                        android:text=":"
+                        android:textSize="14sp" />
+
+                    <TextView
+                        android:id="@+id/basalstep"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:gravity="start"
+                        android:paddingLeft="5dp"
+                        android:textColor="@android:color/white"
+                        android:textSize="14sp" />
+
+                </LinearLayout>
+
+                <View
+                    android:layout_width="fill_parent"
+                    android:layout_height="2dip"
+                    android:layout_marginBottom="5dp"
+                    android:layout_marginLeft="20dp"
+                    android:layout_marginRight="20dp"
+                    android:layout_marginTop="5dp"
+                    android:background="@color/list_delimiter" />
+
+                <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"
+                        android:gravity="end"
+                        android:paddingRight="5dp"
+                        android:text="@string/bolus_step"
+                        android:textSize="14sp" />
+
+                    <TextView
+                        android:layout_width="5dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="0"
+                        android:gravity="center_horizontal"
+                        android:paddingEnd="2dp"
+                        android:paddingStart="2dp"
+                        android:text=":"
+                        android:textSize="14sp" />
+
+                    <TextView
+                        android:id="@+id/bolusstep"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:gravity="start"
+                        android:paddingLeft="5dp"
+                        android:textColor="@android:color/white"
+                        android:textSize="14sp" />
+
+                </LinearLayout>
+
+                <View
+                    android:layout_width="fill_parent"
+                    android:layout_height="2dip"
+                    android:layout_marginBottom="5dp"
+                    android:layout_marginLeft="20dp"
+                    android:layout_marginRight="20dp"
+                    android:layout_marginTop="5dp"
+                    android:background="@color/list_delimiter" />
+
+                <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"
+                        android:gravity="end"
+                        android:paddingRight="5dp"
+                        android:text="@string/pump_firmware_label"
+                        android:textSize="14sp" />
+
+                    <TextView
+                        android:layout_width="5dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="0"
+                        android:gravity="center_horizontal"
+                        android:paddingEnd="2dp"
+                        android:paddingStart="2dp"
+                        android:text=":"
+                        android:textSize="14sp" />
+
+                    <TextView
+                        android:id="@+id/firmware"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:gravity="start"
+                        android:paddingLeft="5dp"
+                        android:textColor="@android:color/white"
+                        android:textSize="14sp" />
+
+                </LinearLayout>
+
+                <View
+                    android:layout_width="fill_parent"
+                    android:layout_height="2dip"
+                    android:layout_marginBottom="5dp"
+                    android:layout_marginLeft="20dp"
+                    android:layout_marginRight="20dp"
+                    android:layout_marginTop="5dp"
+                    android:background="@color/list_delimiter" />
+
+                <TextView
+                    android:layout_width="150dp"
+                    android:layout_height="100dp"
+                    android:layout_gravity="center"
+                    android:drawableTop="@drawable/ic_diaconn_g8"
+                    android:paddingTop="10dp" />
+
+            </LinearLayout>
+
+        </ScrollView>
+
+        <LinearLayout
+            android:id="@+id/buttons"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_alignParentBottom="true"
+            android:orientation="vertical">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal">
+
+<!--                <Button-->
+<!--                    android:id="@+id/viewprofile"-->
+<!--                    style="@style/ButtonSmallFontStyle"-->
+<!--                    android:layout_width="match_parent"-->
+<!--                    android:layout_height="match_parent"-->
+<!--                    android:layout_weight="1"-->
+<!--                    android:drawableTop="@drawable/ic_danarprofile"-->
+<!--                    android:paddingLeft="0dp"-->
+<!--                    android:paddingRight="0dp"-->
+<!--                    android:text="@string/viewprofile" />-->
+
+
+                <Button
+                    android:id="@+id/history"
+                    style="@style/ButtonSmallFontStyle"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1"
+                    android:drawableTop="@drawable/ic_pump_history"
+                    android:paddingLeft="0dp"
+                    android:paddingRight="0dp"
+                    android:text="@string/pumphistory" />
+
+                <Button
+                    android:id="@+id/stats"
+                    style="@style/ButtonSmallFontStyle"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1"
+                    android:drawableTop="@drawable/ic_danarstats"
+                    android:paddingLeft="0dp"
+                    android:paddingRight="0dp"
+                    android:text="@string/stats" />
+
+                <Button
+                    android:id="@+id/user_options"
+                    style="@style/ButtonSmallFontStyle"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1"
+                    android:drawableTop="@drawable/ic_danar_useropt"
+                    android:paddingLeft="0dp"
+                    android:paddingRight="0dp"
+                    android:text="@string/diagonn_g8_useroptions" />
+
+            </LinearLayout>
+
+        </LinearLayout>
+
+    </RelativeLayout>
+
+</FrameLayout>
diff --git a/diaconn/src/main/res/layout/diaconn_g8_history_activity.xml b/diaconn/src/main/res/layout/diaconn_g8_history_activity.xml
new file mode 100644
index 0000000000..ccb3a3522a
--- /dev/null
+++ b/diaconn/src/main/res/layout/diaconn_g8_history_activity.xml
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout 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:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    tools:context="info.nightscout.androidaps.diaconn.activities.DiaconnG8HistoryActivity">
+
+
+    <RelativeLayout
+        android:id="@+id/header"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_alignParentTop="true"
+        android:layout_gravity="center"
+        android:background="@color/activity_title_background"
+        android:orientation="horizontal"
+        android:padding="5dp">
+
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:contentDescription="@string/pumphistory"
+            app:srcCompat="@drawable/ic_pump_history" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_centerInParent="true"
+            android:layout_gravity="center"
+            android:layout_marginLeft="10dp"
+            android:layout_marginRight="10dp"
+            android:text="@string/pumphistory"
+            android:textAlignment="center"
+            android:textAppearance="?android:attr/textAppearanceLarge" />
+
+    </RelativeLayout>
+
+    <LinearLayout
+        android:id="@+id/spacer"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/header"
+        android:orientation="horizontal"
+        android:padding="5dp" />
+
+    <LinearLayout
+        android:id="@+id/spinner_layout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/spacer"
+        android:orientation="horizontal">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="15dp"
+            android:layout_marginEnd="20dp"
+            android:text="@string/eventtype"
+            android:textAppearance="?android:attr/textAppearanceSmall" />
+
+        <Spinner
+            android:id="@+id/spinner"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="20dp" />
+
+    </LinearLayout>
+
+    <TextView
+        android:id="@+id/status"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/spinner_layout"
+        android:layout_gravity="center_horizontal"
+        android:gravity="center_horizontal" />
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/recyclerview"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_above="@id/reload"
+        android:layout_below="@+id/status" />
+
+    <Button
+        android:id="@+id/reload"
+        style="@style/Widget.AppCompat.Button"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        android:drawableStart="@drawable/ic_actions_refill"
+        android:text="@string/reload" />
+
+</RelativeLayout>
diff --git a/diaconn/src/main/res/layout/diaconn_g8_history_item.xml b/diaconn/src/main/res/layout/diaconn_g8_history_item.xml
new file mode 100644
index 0000000000..66ee8536db
--- /dev/null
+++ b/diaconn/src/main/res/layout/diaconn_g8_history_item.xml
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:card_view="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/danar_history_cardview"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_gravity="center"
+    card_view:cardBackgroundColor="@color/cardColorBackground"
+    card_view:cardCornerRadius="6dp"
+    card_view:cardUseCompatPadding="true"
+    card_view:contentPadding="6dp">
+
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:baselineAligned="true"
+        android:orientation="horizontal">
+
+
+        <TextView
+            android:id="@+id/diaconn_g8_history_time"
+            android:layout_width="120dp"
+            android:layout_height="wrap_content"
+            android:paddingLeft="5dp"
+            android:text="27.06.2016 18:00" />
+
+        <TextView
+            android:id="@+id/diaconn_g8_history_value"
+            android:layout_width="50dp"
+            android:layout_height="wrap_content"
+            android:paddingLeft="5dp"
+            android:text="0.25"
+            android:gravity="right" />
+
+        <TextView
+            android:id="@+id/diaconn_g8_history_bolustype"
+            android:layout_width="20dp"
+            android:layout_height="wrap_content"
+            android:paddingLeft="5dp"
+            android:text="E"
+/>
+
+        <TextView
+            android:id="@+id/diaconn_g8_history_stringvalue"
+            android:layout_width="150dp"
+            android:layout_height="wrap_content"
+            android:paddingLeft="5dp"
+            android:text="XXXXXXX"
+/>
+
+        <TextView
+            android:id="@+id/diaconn_g8_history_duration"
+            android:layout_width="30dp"
+            android:layout_height="wrap_content"
+            android:paddingLeft="5dp"
+            android:text="30"
+            android:gravity="right" />
+
+        <TextView
+            android:id="@+id/diaconn_g8_history_dailybasal"
+            android:layout_width="50dp"
+            android:layout_height="wrap_content"
+            android:paddingLeft="5dp"
+            android:gravity="right" />
+
+        <TextView
+            android:id="@+id/diaconn_g8_history_dailybolus"
+            android:layout_width="50dp"
+            android:layout_height="wrap_content"
+            android:paddingLeft="5dp"
+            android:gravity="right" />
+
+        <TextView
+            android:id="@+id/diaconn_g8_history_dailytotal"
+            android:layout_width="56dp"
+            android:layout_height="wrap_content"
+            android:paddingLeft="10dp"
+            android:gravity="right"
+            android:visibility="gone"/>
+
+        <TextView
+            android:id="@+id/diaconn_g8_history_alarm"
+            android:layout_width="100dp"
+            android:layout_height="wrap_content"
+            android:paddingLeft="5dp" />
+
+    </LinearLayout>
+
+</androidx.cardview.widget.CardView>
diff --git a/diaconn/src/main/res/layout/diaconn_g8_user_options_activity.xml b/diaconn/src/main/res/layout/diaconn_g8_user_options_activity.xml
new file mode 100644
index 0000000000..c652b6516f
--- /dev/null
+++ b/diaconn/src/main/res/layout/diaconn_g8_user_options_activity.xml
@@ -0,0 +1,336 @@
+<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:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:fillViewport="true"
+    android:focusable="true"
+    android:focusableInTouchMode="true"
+    tools:context="info.nightscout.androidaps.diaconn.activities.DiaconnG8UserOptionsActivity">
+
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
+
+        <RelativeLayout
+            android:id="@+id/header"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:background="@color/activity_title_background"
+            android:orientation="horizontal"
+            android:padding="5dp">
+
+            <ImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:contentDescription="@string/diaconng8_pump_settings"
+                app:srcCompat="@drawable/ic_danar_useropt" />
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_centerInParent="true"
+                android:layout_gravity="center"
+                android:layout_marginLeft="10dp"
+                android:layout_marginRight="10dp"
+                android:text="@string/diaconng8_pump_settings"
+                android:textAlignment="center"
+                android:textAppearance="?android:attr/textAppearanceLarge" />
+
+        </RelativeLayout>
+
+        <LinearLayout
+            android:id="@+id/spacer"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:padding="5dp"></LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="20dp"
+            android:layout_marginEnd="20dp"
+            android:orientation="horizontal">
+
+            <TextView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:gravity="start"
+                android:text="@string/diaconn_g8_pumpalarm"
+                android:textSize="14sp" />
+
+        </LinearLayout>
+
+        <View
+            android:layout_width="fill_parent"
+            android:layout_height="2dip"
+            android:layout_marginLeft="20dp"
+            android:layout_marginTop="5dp"
+            android:layout_marginRight="20dp"
+            android:layout_marginBottom="5dp"
+            android:background="@color/list_delimiter" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="20dp"
+            android:layout_marginEnd="20dp"
+            android:orientation="horizontal">
+
+            <Spinner
+                android:id="@+id/beep_and_alarm"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="right"
+                android:minWidth="120dp" />
+
+            <Spinner
+                android:id="@+id/alarm_intesity"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="right"
+                android:minWidth="120dp" />
+
+            <View
+                android:layout_width="0dp"
+                android:layout_height="0dp"
+                android:layout_weight="1" />
+
+            <Button
+                android:id="@+id/save_alarm"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="Save" />
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="40dp"
+            android:orientation="horizontal"
+            android:padding="5dp"></LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="20dp"
+            android:layout_marginEnd="20dp"
+            android:gravity="center"
+            android:orientation="horizontal">
+
+            <TextView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:gravity="top"
+                android:text="@string/diaconn_g8_screentimeout"
+                android:textSize="14sp" />
+
+        </LinearLayout>
+
+        <View
+            android:layout_width="fill_parent"
+            android:layout_height="2dip"
+            android:layout_marginLeft="20dp"
+            android:layout_marginTop="5dp"
+            android:layout_marginRight="20dp"
+            android:layout_marginBottom="5dp"
+            android:background="@color/list_delimiter" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="20dp"
+            android:layout_marginEnd="20dp"
+            android:orientation="horizontal">
+
+            <RadioGroup
+                android:id="@+id/pumpscreentimeout"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:checkedButton="@+id/pumpalarm_sound"
+                android:orientation="horizontal">
+
+                <RadioButton
+                    android:id="@+id/pumpscreentimeout_10"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/diaconn_g8_pumpscreentimeout_10" />
+
+                <RadioButton
+                    android:id="@+id/pumpscreentimeout_20"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/diaconn_g8_pumpscreentimeout_20" />
+
+                <RadioButton
+                    android:id="@+id/pumpscreentimeout_30"
+                    android:layout_width="171dp"
+                    android:layout_height="wrap_content"
+                    android:text="@string/diaconn_g8_pumpscreentimeout_30" />
+
+            </RadioGroup>
+
+            <View
+                android:layout_width="0dp"
+                android:layout_height="0dp"
+                android:layout_weight="1" />
+
+            <Button
+                android:id="@+id/save_lcd_on_time"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="Save" />
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="40dp"
+            android:orientation="horizontal"
+            android:padding="5dp"></LinearLayout>
+
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="20dp"
+            android:layout_marginEnd="20dp"
+            android:gravity="center"
+            android:orientation="horizontal">
+
+            <TextView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:gravity="start"
+                android:text="@string/diaconn_g8_language"
+                android:textSize="14sp" />
+
+        </LinearLayout>
+
+        <View
+            android:layout_width="fill_parent"
+            android:layout_height="2dip"
+            android:layout_marginLeft="20dp"
+            android:layout_marginTop="5dp"
+            android:layout_marginRight="20dp"
+            android:layout_marginBottom="5dp"
+            android:background="@color/list_delimiter" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="20dp"
+            android:layout_marginEnd="20dp"
+            android:orientation="horizontal">
+
+            <RadioGroup
+                android:id="@+id/pumplang"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:checkedButton="@+id/pumpalarm_sound"
+                android:orientation="horizontal">
+
+                <RadioButton
+                    android:id="@+id/pumplang_english"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/diaconn_g8_pumplang_english" />
+
+                <RadioButton
+                    android:id="@+id/pumplang_korean"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/diaconn_g8_pumplang_korean" />
+
+                <RadioButton
+                    android:id="@+id/pumplang_chiness"
+                    android:layout_width="106dp"
+                    android:layout_height="wrap_content"
+                    android:text="@string/diaconn_g8_pumplang_chiness" />
+
+            </RadioGroup>
+
+            <View
+                android:layout_width="0dp"
+                android:layout_height="0dp"
+                android:layout_weight="1" />
+
+            <Button
+                android:id="@+id/save_lang"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="Save" />
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="40dp"
+            android:orientation="horizontal"
+            android:padding="5dp"></LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="20dp"
+            android:layout_marginEnd="20dp"
+            android:gravity="center"
+            android:orientation="horizontal">
+
+            <TextView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:gravity="start"
+                android:text="@string/diaconn_g8_bolus_speed"
+                android:textSize="14sp" />
+
+        </LinearLayout>
+
+        <View
+            android:layout_width="fill_parent"
+            android:layout_height="2dip"
+            android:layout_marginLeft="20dp"
+            android:layout_marginTop="5dp"
+            android:layout_marginRight="20dp"
+            android:layout_marginBottom="5dp"
+            android:background="@color/list_delimiter" />
+
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="20dp"
+            android:layout_marginEnd="20dp"
+            android:orientation="horizontal">
+
+            <info.nightscout.androidaps.utils.ui.NumberPicker
+                android:id="@+id/bolus_speed"
+                android:layout_width="wrap_content"
+                android:layout_height="40dp"
+                android:layout_marginTop="5dp"
+                android:paddingRight="5dp" />
+
+            <View
+                android:layout_width="0dp"
+                android:layout_height="0dp"
+                android:layout_weight="1" />
+
+            <Button
+                android:id="@+id/save_bolus_speed"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="Save" />
+
+        </LinearLayout>
+
+    </LinearLayout>
+
+</ScrollView>
diff --git a/diaconn/src/main/res/values-af-rZA/strings.xml b/diaconn/src/main/res/values-af-rZA/strings.xml
new file mode 100644
index 0000000000..3ea04e700d
--- /dev/null
+++ b/diaconn/src/main/res/values-af-rZA/strings.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>
diff --git a/diaconn/src/main/res/values-bg-rBG/strings.xml b/diaconn/src/main/res/values-bg-rBG/strings.xml
new file mode 100644
index 0000000000..3ea04e700d
--- /dev/null
+++ b/diaconn/src/main/res/values-bg-rBG/strings.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>
diff --git a/diaconn/src/main/res/values-ca-rES/strings.xml b/diaconn/src/main/res/values-ca-rES/strings.xml
new file mode 100644
index 0000000000..3ea04e700d
--- /dev/null
+++ b/diaconn/src/main/res/values-ca-rES/strings.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>
diff --git a/diaconn/src/main/res/values-cs-rCZ/strings.xml b/diaconn/src/main/res/values-cs-rCZ/strings.xml
new file mode 100644
index 0000000000..62fe26605e
--- /dev/null
+++ b/diaconn/src/main/res/values-cs-rCZ/strings.xml
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="resetpairing">Zrušit párování</string>
+    <string name="diaconn_nodeviceavailable">Nejsou k dispozici žádná zařízení</string>
+    <string name="diaconn_pairing">Párování pumpy Diaconn</string>
+    <string name="pumperror">Chyba pumpy</string>
+    <string name="diaconn_g8_history_alarm">Alarmy</string>
+    <string name="diaconn_g8_history_basalhours">Hodinové bazály</string>
+    <string name="diaconn_g8_history_bolus">Bolusy</string>
+    <string name="diaconn_g8_history_dailyinsulin">Denní inzulín</string>
+    <string name="diaconn_g8_history_errors">Chyby</string>
+    <string name="diaconn_g8_history_prime">Doplňování</string>
+    <string name="diaconn_g8_history_refill">Plnění</string>
+    <string name="diaconn_g8_history_suspend">Pozastavit</string>
+    <string name="diaconn_g8_pairingok">Spárováno</string>
+    <string name="diaconn_g8_waitingforpairing">Čekání na párování</string>
+    <string name="diaconn_firmware_version">Verze</string>
+    <string name="invalidpairing">Neplatné párovací informace. Spouštění nového párování</string>
+    <string name="gettingpumpsettings">Nahrávám nastavení pumpy</string>
+    <string name="gettingpumptime">Nahrávám čas v pumpě</string>
+    <string name="largetimediff">Velký rozdíl v času:\nČas v pumpě se liší minimálně o 1,5 h.\nProsím upravte čas v pumpě ručně a vymažte historii pumpy.\nPokud je to třeba, pozastavte smyčku alespoň na \"DIA\" hodin.</string>
+    <string name="largetimedifftitle">Velký rozdíl v času</string>
+    <string name="approachingdailylimit">Blíží se denní limit inzulínu</string>
+    <string name="startingbolus">Spouštím bolus</string>
+    <string name="waitingforestimatedbolusend">Čekání na předpokládaný konec bolusu</string>
+    <string name="gettingbolusstatus">Nahrávám bolusy</string>
+    <string name="stoppingtempbasal">Zastavuji dočasný bazál</string>
+    <string name="settingtempbasal">Nastavuji dočasný bazál</string>
+    <string name="settingextendedbolus">Nastavuji prodloužený bolus</string>
+    <string name="stoppingextendedbolus">Zastavuji prodloužený bolus</string>
+    <string name="updatingbasalrates">Aktualizuji bazály</string>
+    <string name="description_pump_diaconn_g8">Integrace pumpy pro pumpy Diaconn G8</string>
+    <string name="diaconn_g8_pump">Diakonn G8</string>
+    <string name="diaconn_g8_pump_shortname">Diakonn G8</string>
+    <string name="maxbolusviolation">Překročen maximální bolus</string>
+    <string name="commanderror">Chyba příkazu</string>
+    <string name="speederror">Chyba rychlosti</string>
+    <string name="insulinlimitviolation">Překročen limit inzulínu</string>
+    <string name="boluserrorcode">Požadováno: %1$.2fU Doručeno: %2$.2fU Chyba: %3$s</string>
+    <string name="diaconn_g8_valuenotsetproperly">Hodnota nenastavena správně</string>
+    <string name="diaconn_g8_bt_name_title">Zařízení Bluetooth Diaconn G8</string>
+    <string name="diaconn_g8_password_title">Heslo k pumpě</string>
+    <string name="bolusspeed">Rychlost bolusu</string>
+    <string name="selectedpump">Vybraná pumpa</string>
+    <string name="diaconn_g8_useextended_title">Použít prodloužené bolusy pro &gt;200%%</string>
+    <string name="diaconn_g8_visualizeextendedaspercentage_title">Zobrazovat prodloužený bolus v %%</string>
+    <string name="diaconn_g8_bluetooth_status">Stav Bluetooth</string>
+    <string name="diagonn_g8_tdd_label">CDD</string>
+    <string name="bolus_step">Krok bolusu</string>
+    <string name="basal_step">Krok bazálu</string>
+    <string name="pump_firmware_label">Firmware</string>
+    <string name="diagonn_g8_useroptions">UŽIVATELSKÉ VOLBY</string>
+    <string name="pairfirst">Prosím, spárujte pumpu s telefonem!</string>
+    <string name="processinghistory">"Zpracovávám Událost "</string>
+    <string name="apslastLogNum">aps_last_log_num</string>
+    <string name="apsWrappingCount">aps_wrapping_count</string>
+    <string name="diaconn_g8_history_tempbasal">Dočasný Bazál</string>
+    <string name="diaconng8_pump_settings">Nastavení pumpy Diaconn</string>
+    <string name="diaconn_g8_pumpalarm">Zvuk</string>
+    <string name="diaconn_g8_pumpalarm_sound">zvuk</string>
+    <string name="diaconn_g8_pumpalarm_vibrate">vibrovat</string>
+    <string name="diaconn_g8_pumpalarm_silent">ticho</string>
+    <string name="diaconn_g8_pumpalarmlevel">Hlasitost alarmu</string>
+    <string name="diaconn_g8_pumpalarm_intensity_low">nízká</string>
+    <string name="diaconn_g8_pumpalarm_intensity_middle">střední</string>
+    <string name="diaconn_g8_pumpalarm_intensity_high">vysoká</string>
+    <string name="diaconn_g8_screentimeout">Čas před vypnutím displeje [second]</string>
+    <string name="diaconn_g8_saveuseroptions">ULOŽIT VOLBY DO PUMPY</string>
+    <string name="diaconn_g8_language">Jazyk</string>
+    <string name="diaconn_g8_bolus_speed">Rychlost bolusu</string>
+    <string name="diaconn_g8_pumplang_chiness">Čínština</string>
+    <string name="diaconn_g8_pumplang_korean">Korejština</string>
+    <string name="diaconn_g8_pumplang_english">Angličtina</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">nízká</string>
+    <string name="injectionblocked">Aplikace zablokována</string>
+    <string name="batterywarning">Upozornění na stav baterie</string>
+    <string name="insulinlackwarning">Upozornění na nedostatek inzulínu</string>
+    <string name="needbatteryreplace">Je vyžadována výměna baterie</string>
+    <string name="needinsullinreplace">Je vyžadována výměna inzulínu</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">Zaznamenat výměnu zásobníku</string>
+    <string name="diaconn_g8_loginsulinchange_summary">Přidat událost \"Výměna inzulínu\" do portálu pěče, pokud je zjištěna v historii</string>
+    <string name="diaconn_g8_logcanulachange_title">Zaznamenat změnu jehly</string>
+    <string name="diaconn_g8_logcanulachange_summary">Přidat událost \"Výměna setu\" do portálu pěče, pokud je zjištěna v historii</string>
+    <string name="diaconn_g8_logbatterychange_summary">Přidat událost \"Výměna baterie\" do portálu pěče, pokud je zjištěna v historii</string>
+    <string name="diaconn_g8_logbatterychange_title">Zaznamenat výměnu baterie</string>
+    <string name="diaconn_g8_logsyncinprogress">Probíhá synchronizace logu</string>
+    <string name="diaconn_g8_loginsulinshorage">Nedostatek inzulínu</string>
+    <string name="diaconn_g8_logbatteryshorage">Slabá baterie</string>
+    <string name="diaconn_g8_logneedleprime">Plnění jehly :%1$.2fU</string>
+    <string name="diaconn_g8_resetfactoryreset">Resetovat po obnovení továrního nastavení</string>
+    <string name="diaconn_g8_resetemergencyoff">Resetovat po nouzovém vypnutí</string>
+    <string name="diaconn_g8_resetbatteryreplacement">Resetovat po výměně baterie</string>
+    <string name="diaconn_g8_resetaftercalibration">Po kalibraci resetovat</string>
+    <string name="diaconn_g8_resetunexpected">Neočekávaný reset systému</string>
+    <string name="diaconn_g8_reasoncomplete">Dokončeno</string>
+    <string name="diaconn_g8_reasoninjectonblock">Zablokované vydávání</string>
+    <string name="diaconn_g8_reasonbatteryshortage">Slabá baterie</string>
+    <string name="diaconn_g8_reasoninsulinshortage">Nedostatek inzulínu</string>
+    <string name="diaconn_g8_reasonuserstop">Uživatelské vypnutí</string>
+    <string name="diaconn_g8_reasonsystemreset">Reset systému</string>
+    <string name="diaconn_g8_reasonother">Jiné</string>
+    <string name="diaconn_g8_reasonemergencystop">Nouzové zastavení</string>
+    <string name="diacon_g8_blockbasal">BAZÁL</string>
+    <string name="diacon_g8_blockmealbolus">BOLUS NA JÍDLO</string>
+    <string name="diacon_g8_blocknormalbolus">NORMÁLNÍ BOLUS</string>
+    <string name="diaconn_g8_logsuccess">Úspěch</string>
+    <string name="diaconn_g8_errorcode_1">Nemohu vyhledat kvůli chybě CRC paketu.</string>
+    <string name="diaconn_g8_errorcode_6">Zrušeno pumpou</string>
+    <string name="diaconn_g8_errorcode_7">Přijímání dalších akcí, omezení nastavení aplikace.</string>
+    <string name="diaconn_g8_errorcode_8">V průběhu podávání Bolusu je další Bolus omezen.</string>
+    <string name="diaconn_g8_errorcode_9">Vyžaduje obnovení bazálu</string>
+    <string name="diaconn_g8_errorcode_10">Zrušeno, protože pumpa neodpovídá.</string>
+</resources>
diff --git a/diaconn/src/main/res/values-da-rDK/strings.xml b/diaconn/src/main/res/values-da-rDK/strings.xml
new file mode 100644
index 0000000000..3ea04e700d
--- /dev/null
+++ b/diaconn/src/main/res/values-da-rDK/strings.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>
diff --git a/diaconn/src/main/res/values-de-rDE/strings.xml b/diaconn/src/main/res/values-de-rDE/strings.xml
new file mode 100644
index 0000000000..716f9e053b
--- /dev/null
+++ b/diaconn/src/main/res/values-de-rDE/strings.xml
@@ -0,0 +1,156 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="resetpairing">Kopplung zurücksetzen</string>
+    <string name="diaconn_nodeviceavailable">Keine Geräte verfügbar</string>
+    <string name="diaconn_pairing">Diaconn Pumpe verbinden</string>
+    <string name="pumperror">Pumpenfehler</string>
+    <string name="diaconn_g8_history_alarm">Alarme</string>
+    <string name="diaconn_g8_history_basalhours">Basal-Stunden</string>
+    <string name="diaconn_g8_history_bolus">Boli</string>
+    <string name="diaconn_g8_history_dailyinsulin">Insulin-Tagesmengen</string>
+    <string name="diaconn_g8_history_errors">Fehler</string>
+    <string name="diaconn_g8_history_prime">Füllen</string>
+    <string name="diaconn_g8_history_refill">Befüllen</string>
+    <string name="diaconn_g8_history_suspend">Unterbrechen</string>
+    <string name="diaconn_g8_pairingok">Kopplung OK</string>
+    <string name="diaconn_g8_waitingforpairing">Warte auf Kopplung</string>
+    <string name="diaconn_firmware_version">Version</string>
+    <string name="invalidpairing">Ungültige Kopplungs-Info. Kopple neu.</string>
+    <string name="gettingpumpsettings">Pumpen-Einstellungen werden ermittelt</string>
+    <string name="gettingpumptime">Zeiteinstellung der Pumpe wird ermittelt</string>
+    <string name="largetimediff">Großer Zeitunterschied:\nDie Zeit in der Pumpe weicht um mindestens 1,5 Stunden ab.\nPasse die Zeit auf der Pumpe manuell an und lösche zuvor - falls möglich - die Pumpenhistorie.\nAlternativ kannst Du den Loop für die Stunden der Insulinwirkzeit (DIA) deaktivieren.</string>
+    <string name="largetimedifftitle">Großer Zeitunterschied Titel</string>
+    <string name="approachingdailylimit">Tagesinsulin-Limit wird bald erreicht</string>
+    <string name="startingbolus">Bolus-Abgabe gestartet</string>
+    <string name="waitingforestimatedbolusend">Warte auf das geschätze Bolus-Ende</string>
+    <string name="gettingbolusstatus">Status des Bolus wird ermittelt</string>
+    <string name="stoppingtempbasal">TBR wird abgebrochen</string>
+    <string name="settingtempbasal">TBR wird gesetzt</string>
+    <string name="settingextendedbolus">Verzögerter Bolus wird gesetzt</string>
+    <string name="stoppingextendedbolus">Verzögerter Bolus wird abgebrochen</string>
+    <string name="updatingbasalrates">Basalrate wird aktualisiert</string>
+    <string name="description_pump_diaconn_g8">Pumpenintegration für Diaconn G8 Pumpen</string>
+    <string name="diaconn_g8_pump">Diaconn G8</string>
+    <string name="diaconn_g8_pump_shortname">Diaconn G8</string>
+    <string name="maxbolusviolation">Max. Bolus überschritten</string>
+    <string name="commanderror">Fehler bei Befehlsausführung</string>
+    <string name="speederror">Geschwindigkeits-Fehler</string>
+    <string name="insulinlimitviolation">Insulin-Beschränkung verletzt</string>
+    <string name="boluserrorcode">Angefragt: %1$.2f IE. Abgegeben: %2$.2f IE. Fehlercode: %3$s</string>
+    <string name="diaconn_g8_valuenotsetproperly">Wert nicht korrekt gesetzt</string>
+    <string name="diaconn_g8_bt_name_title">Diaconn G8 Bluetooth Gerät</string>
+    <string name="diaconn_g8_password_title">Pumpen-Passwort</string>
+    <string name="bolusspeed">Bolus-Geschwindigkeit</string>
+    <string name="selectedpump">Ausgewählte Pumpe</string>
+    <string name="diaconn_g8_useextended_title">Benutze verzögerten Bolus für hohe TBR &gt;200%%</string>
+    <string name="diaconn_g8_visualizeextendedaspercentage_title">Zeige verzögerten Bolus als %% an.</string>
+    <string name="diaconn_g8_bluetooth_status">Bluetooth-Status</string>
+    <string name="diagonn_g8_tdd_label">TDD</string>
+    <string name="bolus_step">Bolus-Schritt</string>
+    <string name="basal_step">Basal-Schritt</string>
+    <string name="pump_firmware_label">Firmware</string>
+    <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>
+    <string name="diaconn_g8_pumpalarm_sound">Töne</string>
+    <string name="diaconn_g8_pumpalarm_vibrate">Vibration</string>
+    <string name="diaconn_g8_pumpalarm_silent">Lautlos</string>
+    <string name="diaconn_g8_pumpalarmlevel">Alarmintensität</string>
+    <string name="diaconn_g8_pumpalarm_intensity_low">niedrig</string>
+    <string name="diaconn_g8_pumpalarm_intensity_middle">mittel</string>
+    <string name="diaconn_g8_pumpalarm_intensity_high">hoch</string>
+    <string name="diaconn_g8_screentimeout">LCD-Einschaltdauer [Sek.]</string>
+    <string name="diaconn_g8_saveuseroptions">OPTION IN PUMPE SPEICHERN</string>
+    <string name="diaconn_g8_language">Sprache</string>
+    <string name="diaconn_g8_bolus_speed">Bolus-Geschwindigkeit</string>
+    <string name="diaconn_g8_pumplang_chiness">Chinesisch</string>
+    <string name="diaconn_g8_pumplang_korean">Korean</string>
+    <string name="diaconn_g8_pumplang_english">Englisch</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">niedrig</string>
+    <string name="injectionblocked">Verstopfung</string>
+    <string name="batterywarning">Akku-Alarm</string>
+    <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>
+    <string name="diaconn_g8_logcanulachange_summary">Kanülenwechsel im Careportal hinzufügen, falls dies in der Historie gefunden wird.</string>
+    <string name="diaconn_g8_logbatterychange_summary">Batteriewechsel im Careportal hinzufügen, falls dies in der Historie gefunden wird.</string>
+    <string name="diaconn_g8_logbatterychange_title">Batteriewechsel protokollieren</string>
+    <string name="diaconn_g8_logsyncinprogress">Synchronisierung aufzeichnen</string>
+    <string name="diaconn_g8_loginsulinshorage">Niedriger Insulinstand</string>
+    <string name="diaconn_g8_logbatteryshorage">Niedriger Akkustand</string>
+    <string name="diaconn_g8_logneedleprime">Kanüle füllen :%1$.2f IE</string>
+    <string name="diaconn_g8_loginjectorprime">Injector füllen:%1$.2fIE</string>
+    <string name="diaconn_g8_logtubeprime">Katheter füllen: %1$.2fIE</string>
+    <string name="diaconn_g8_resetfactoryreset">Reset nach Zurücksetzen auf Werkseinstellungen</string>
+    <string name="diaconn_g8_resetemergencyoff">Reset nach Notfallaus</string>
+    <string name="diaconn_g8_resetbatteryreplacement">Reset nach Batteriewechsel</string>
+    <string name="diaconn_g8_resetaftercalibration">Reset nach Kalibrierung</string>
+    <string name="diaconn_g8_resetpreshipment">Zurücksetzen auf Werkseinstellungen</string>
+    <string name="diaconn_g8_resetunexpected">Unerwarteter Systemreset</string>
+    <string name="diaconn_g8_reasoncomplete">Abgeschlossen</string>
+    <string name="diaconn_g8_reasoninjectonblock">Verstopfung</string>
+    <string name="diaconn_g8_reasonbatteryshortage">Niedriger Akkustand</string>
+    <string name="diaconn_g8_reasoninsulinshortage">Niedriger Insulinstand</string>
+    <string name="diaconn_g8_reasonuserstop">Stop durch Benutzer</string>
+    <string name="diaconn_g8_reasonsystemreset">System zurücksetzen</string>
+    <string name="diaconn_g8_reasonother">Andere</string>
+    <string name="diaconn_g8_reasonemergencystop">Notfall-Stop</string>
+    <string name="diacon_g8_blockbasal">BASAL</string>
+    <string name="diacon_g8_blockmealbolus">MAHLZEITEN BOLUS</string>
+    <string name="diacon_g8_blocknormalbolus">NORMALER BOLUS</string>
+    <string name="diacon_g8_blocksquarebolus">VERZÖGERTER BOLUS</string>
+    <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>
+    <string name="diaconn_g8_logdualnormalsuccess">Dual Bolus abgegeben</string>
+    <string name="diaconn_g8_logdualsquarestart">Multiwave Bolus gestartet</string>
+    <string name="diaconn_g8_logdualsquaresuccess">Multiwave Bolus abgegeben</string>
+    <string name="diaconn_g8_logsquarestart">Verzögerter Bolus gestartet</string>
+    <string name="diaconn_g8_logsquaresuccess">Verzögerter Bolus abgegeben</string>
+    <string name="diaconn_g8_logmealfail">Mahlzeit fehlgeschlagen</string>
+    <string name="diaconn_g8_logsuccess">Erfolgreich</string>
+    <string name="diaconn_g8_logmealsuccess">Mahlzeit erfolgreich</string>
+    <string name="key_diaconn_g8_logtubechange">diaconn_g8_logtubechange</string>
+    <string name="diaconn_g8_errorcode_1">CRC Fehler - Lookup nicht möglich.</string>
+    <string name="diaconn_g8_errorcode_2">Kann nicht auf fehlerhaften Eingabeparameter gesetzt werden.</string>
+    <string name="diaconn_g8_errorcode_3">Kann nicht auf fehlerhafte Protokollspezifikation gesetzt werden.</string>
+    <string name="diaconn_g8_errorcode_4">Essenszeitpunkt eingestellt. Keine Insulingabe möglich.</string>
+    <string name="diaconn_g8_errorcode_6">Von Pumpe abgebrochen</string>
+    <string name="diaconn_g8_errorcode_7">Andere Aktionen durchführen, App-Einstellungen beschränkt.</string>
+    <string name="diaconn_g8_errorcode_8">Weitere Injektion während Bolusgabe nicht möglich.</string>
+    <string name="diaconn_g8_errorcode_9">Fortsetzen der Basal-Injektion erforderlich</string>
+    <string name="diaconn_g8_errorcode_10">Abgebrochen, da die Pumpe nicht reagiert.</string>
+    <string name="diaconn_g8_errorcode_11">Abgabe wegen niedrigem Akkustand nicht möglich.</string>
+    <string name="diaconn_g8_errorcode_12">Abgabe wegen Insulinmangel nicht möglich.</string>
+    <string name="diaconn_g8_errorcode_13">Keine Abgabe, da Limit für Einzelabgabe überschritten.</string>
+    <string name="diaconn_g8_errorcode_14">Keine Abgabe, da Tageslimit überschritten.</string>
+    <string name="diaconn_g8_errorcode_15">Nach Abschluss der Basaleinrichtung kann Basalgabe erfolgen.</string>
+    <string name="diaconn_g8_errotpreceivedyet">Der Befehl wurde nicht ausgeführt. Bitte versuche es erneut.</string>
+    <string name="diaconn_g8_logtubechange_title">Katheterwechsel protokollieren</string>
+    <string name="diaconn_g8_logtubechange_summary">Katheterwechsel in Notizen hinzufügen, falls dies in der Historie gefunden wird.</string>
+    <string name="diaconn_g8_logtempstart">TBR Start</string>
+    <string name="diaconn_g8_errorcode_32">Abgabe eingeschränkt während LGS läuft.</string>
+    <string name="diaconn_g8_errorcode_33">LGS aktiv, Befehl zum Einschalten zurückgewiesen.</string>
+    <string name="diaconn_g8_errorcode_34">LGS inaktiv, Befehl zum Ausschalten zurückgewiesen.</string>
+    <string name="diaconn_g8_errorcode_35">TBR Start ist während einer laufenden TBR nicht möglich.</string>
+    <string name="diaconn_g8_errorcode_36">TBR kann nicht gestoppt werden, da keine TBR läuft.</string>
+</resources>
diff --git a/diaconn/src/main/res/values-el-rGR/strings.xml b/diaconn/src/main/res/values-el-rGR/strings.xml
new file mode 100644
index 0000000000..3ea04e700d
--- /dev/null
+++ b/diaconn/src/main/res/values-el-rGR/strings.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>
diff --git a/diaconn/src/main/res/values-es-rES/strings.xml b/diaconn/src/main/res/values-es-rES/strings.xml
new file mode 100644
index 0000000000..3ea04e700d
--- /dev/null
+++ b/diaconn/src/main/res/values-es-rES/strings.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>
diff --git a/diaconn/src/main/res/values-fr-rFR/strings.xml b/diaconn/src/main/res/values-fr-rFR/strings.xml
new file mode 100644
index 0000000000..d289a19934
--- /dev/null
+++ b/diaconn/src/main/res/values-fr-rFR/strings.xml
@@ -0,0 +1,156 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="resetpairing">Réinit. Appairage</string>
+    <string name="diaconn_nodeviceavailable">Aucun appareil disponible</string>
+    <string name="diaconn_pairing">Appairage pompe Diaconn</string>
+    <string name="pumperror">Erreur Pompe</string>
+    <string name="diaconn_g8_history_alarm">Alarmes</string>
+    <string name="diaconn_g8_history_basalhours">Heures Basal</string>
+    <string name="diaconn_g8_history_bolus">Bolus</string>
+    <string name="diaconn_g8_history_dailyinsulin">Insuline quotidienne</string>
+    <string name="diaconn_g8_history_errors">Erreurs</string>
+    <string name="diaconn_g8_history_prime">Amorcer</string>
+    <string name="diaconn_g8_history_refill">Remplir</string>
+    <string name="diaconn_g8_history_suspend">Suspendre</string>
+    <string name="diaconn_g8_pairingok">Appairage Ok</string>
+    <string name="diaconn_g8_waitingforpairing">En attente d\'appairage</string>
+    <string name="diaconn_firmware_version">Version</string>
+    <string name="invalidpairing">Appairage invalide. Demande de nouvel appairage</string>
+    <string name="gettingpumpsettings">Obtenir les paramètres pompe</string>
+    <string name="gettingpumptime">Obtenir l\'heure de la pompe</string>
+    <string name="largetimediff">Différence horaire importante:\nL\'heure de la pompe est en écart de plus d\'une heure et demi.\nVeuillez ajuster manuellement l\'heure de la pompe et assurez-vous que la lecture de l\'historique de la pompe ne cause pas de dysfonctionnements.\nSi possible, effacez l\'historique de la pompe avant de modifier l\'heure ou désactivez la Boucle Fermée pour une DAI après la dernière entrée erronée de l\'historique et au minimum une DAI à partir de maintenant.</string>
+    <string name="largetimedifftitle">Différence horaire importante</string>
+    <string name="approachingdailylimit">Limite quotidienne d\'insuline proche</string>
+    <string name="startingbolus">Injection du bolus démarrée</string>
+    <string name="waitingforestimatedbolusend">En attente de la fin du bolus estimé</string>
+    <string name="gettingbolusstatus">Obtenir l\'état du bolus</string>
+    <string name="stoppingtempbasal">Arrêter basal temp</string>
+    <string name="settingtempbasal">Définir basal temp</string>
+    <string name="settingextendedbolus">Définir bolus étendu</string>
+    <string name="stoppingextendedbolus">Arrêter bolus étendu</string>
+    <string name="updatingbasalrates">Mise à jour des débits basal</string>
+    <string name="description_pump_diaconn_g8">Intégration de la pompe Diaconn G8</string>
+    <string name="diaconn_g8_pump">Diaconn G8</string>
+    <string name="diaconn_g8_pump_shortname">G8</string>
+    <string name="maxbolusviolation">Violation bolus Max</string>
+    <string name="commanderror">Erreur de commande</string>
+    <string name="speederror">Erreur de vitesse</string>
+    <string name="insulinlimitviolation">Violation de limite d\'insuline</string>
+    <string name="boluserrorcode">Demandé : %1$.2fU Injecté : %2$.2fU code d’erreur : %3$s</string>
+    <string name="diaconn_g8_valuenotsetproperly">Valeur incorrecte définie</string>
+    <string name="diaconn_g8_bt_name_title">Dispositif Bluetooth Diaconn G8</string>
+    <string name="diaconn_g8_password_title">Mot de passe pompe</string>
+    <string name="bolusspeed">Vitesse bolus</string>
+    <string name="selectedpump">Pompe sélectionnée</string>
+    <string name="diaconn_g8_useextended_title">Utiliser les bolus étendus pour &gt; 200%%</string>
+    <string name="diaconn_g8_visualizeextendedaspercentage_title">Afficher le bolus étendu en %%</string>
+    <string name="diaconn_g8_bluetooth_status">État Bluetooth</string>
+    <string name="diagonn_g8_tdd_label">DTI</string>
+    <string name="bolus_step">Incrément Bolus</string>
+    <string name="basal_step">Incrément Basal</string>
+    <string name="pump_firmware_label">Firmware</string>
+    <string name="diagonn_g8_useroptions">OPTIONS UTILISATEUR</string>
+    <string name="pairfirst">Veuillez appairer votre pompe avec votre téléphone !</string>
+    <string name="processinghistory">"Traitement d'événement "</string>
+    <string name="apslastLogNum">aps_last_log_num</string>
+    <string name="apsWrappingCount">aps_wrapping_count</string>
+    <string name="diaconn_g8_history_tempbasal">Basal Temp.</string>
+    <string name="diaconng8_pump_settings">Paramètres pompe Diaconn</string>
+    <string name="diaconn_g8_pumpalarm">Son</string>
+    <string name="diaconn_g8_pumpalarm_sound">son</string>
+    <string name="diaconn_g8_pumpalarm_vibrate">vibration</string>
+    <string name="diaconn_g8_pumpalarm_silent">muet</string>
+    <string name="diaconn_g8_pumpalarmlevel">Niveau de l\'alarme</string>
+    <string name="diaconn_g8_pumpalarm_intensity_low">bas</string>
+    <string name="diaconn_g8_pumpalarm_intensity_middle">moyen</string>
+    <string name="diaconn_g8_pumpalarm_intensity_high">haut</string>
+    <string name="diaconn_g8_screentimeout">Durée affichage LCD [secondes]</string>
+    <string name="diaconn_g8_saveuseroptions">ENREGISTRER L\'OPTION DANS LA POMPE</string>
+    <string name="diaconn_g8_language">Langue</string>
+    <string name="diaconn_g8_bolus_speed">Vitesse bolus</string>
+    <string name="diaconn_g8_pumplang_chiness">Chinois</string>
+    <string name="diaconn_g8_pumplang_korean">Coréen</string>
+    <string name="diaconn_g8_pumplang_english">Anglais</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">bas</string>
+    <string name="injectionblocked">Injection bloquée</string>
+    <string name="batterywarning">Alerte batterie</string>
+    <string name="insulinlackwarning">Avertissement manque d\'insuline</string>
+    <string name="needbatteryreplace">Remplacement de pile requis</string>
+    <string name="needinsullinreplace">Remplacement de l\'insuline requis</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">Enreg. changement de réservoir</string>
+    <string name="diaconn_g8_loginsulinchange_summary">Ajouter \"Changement d\'Insuline\" dans careportal si détecté dans l\'historique</string>
+    <string name="diaconn_g8_logcanulachange_title">Enreg. le changement d\'aiguille</string>
+    <string name="diaconn_g8_logcanulachange_summary">Ajouter \"Changement de Site\" dans careportal si détecté dans l\'historique</string>
+    <string name="diaconn_g8_logbatterychange_summary">Ajouter \"Changement de pile\" dans careportal si détecté dans l\'historique</string>
+    <string name="diaconn_g8_logbatterychange_title">Enreg. changement pile</string>
+    <string name="diaconn_g8_logsyncinprogress">Enreg. synchronisation en cours</string>
+    <string name="diaconn_g8_loginsulinshorage">Manque d\'insuline</string>
+    <string name="diaconn_g8_logbatteryshorage">Pile faible</string>
+    <string name="diaconn_g8_logneedleprime">Amorçage site :%1$.2fU</string>
+    <string name="diaconn_g8_loginjectorprime">Amorçage injecteur :%1$.2fU</string>
+    <string name="diaconn_g8_logtubeprime">Amorçage tubulure :%1$.2fU</string>
+    <string name="diaconn_g8_resetfactoryreset">Réinit. après configuration usine</string>
+    <string name="diaconn_g8_resetemergencyoff">Réinit. après la désactivation d\'urgence</string>
+    <string name="diaconn_g8_resetbatteryreplacement">Réinit. après changement de pile</string>
+    <string name="diaconn_g8_resetaftercalibration">Réinit. après calibration</string>
+    <string name="diaconn_g8_resetpreshipment">Réinit. après la configuration de la pré-livraison</string>
+    <string name="diaconn_g8_resetunexpected">Réinit. inattendue du système</string>
+    <string name="diaconn_g8_reasoncomplete">Effectué</string>
+    <string name="diaconn_g8_reasoninjectonblock">Injection bloquée</string>
+    <string name="diaconn_g8_reasonbatteryshortage">Pile faible</string>
+    <string name="diaconn_g8_reasoninsulinshortage">Manque d\'insuline</string>
+    <string name="diaconn_g8_reasonuserstop">Arrêt utilisateur</string>
+    <string name="diaconn_g8_reasonsystemreset">Réinit. système</string>
+    <string name="diaconn_g8_reasonother">Autre</string>
+    <string name="diaconn_g8_reasonemergencystop">Arrêt d\'urgence</string>
+    <string name="diacon_g8_blockbasal">BASAL</string>
+    <string name="diacon_g8_blockmealbolus">BOLUS REPAS</string>
+    <string name="diacon_g8_blocknormalbolus">BOLUS NORMAL</string>
+    <string name="diacon_g8_blocksquarebolus">BOLUS CARRÉ</string>
+    <string name="diacon_g8_blockdualbolus">BOLUS MIXTE</string>
+    <string name="diacon_g8_blockreplacetube">REMPLACER TUBULURE</string>
+    <string name="diacon_g8_blockreplaceneedle">REMPLACER L\'AIGUILLE</string>
+    <string name="diacon_g8_blockreplacesyringe">REMPLACER SERINGUE</string>
+    <string name="diaconn_g8_logalarmblock">Injection bloquée (%s)</string>
+    <string name="diaconn_g8_lgorelease">autorisation basale (%s)</string>
+    <string name="diaconn_g8_lgosuspend">suspension basale (%s)</string>
+    <string name="diaconn_g8_logdualnormalsuccess">Succès du Double Normal</string>
+    <string name="diaconn_g8_logdualsquarestart">Début du double carré</string>
+    <string name="diaconn_g8_logdualsquaresuccess">Succès du double carré</string>
+    <string name="diaconn_g8_logsquarestart">Début du carré</string>
+    <string name="diaconn_g8_logsquaresuccess">Succès du carré</string>
+    <string name="diaconn_g8_logmealfail">Repas échoué</string>
+    <string name="diaconn_g8_logsuccess">Effectué</string>
+    <string name="diaconn_g8_logmealsuccess">Repas réussi</string>
+    <string name="key_diaconn_g8_logtubechange">diaconn_g8_logtubechange</string>
+    <string name="diaconn_g8_errorcode_1">Recherche impossible en raison d\'une erreur CRC de paquets.</string>
+    <string name="diaconn_g8_errorcode_2">Impossible de définir à cause d\'une erreur de paramètre d\'entrée.</string>
+    <string name="diaconn_g8_errorcode_3">Impossible de définir à cause d\'une erreur de spécification de protocole.</string>
+    <string name="diaconn_g8_errorcode_4">Repas retardé, ne peut être injecté.</string>
+    <string name="diaconn_g8_errorcode_6">Annulé par la pompe</string>
+    <string name="diaconn_g8_errorcode_7">Autres actions en cours, limitation des paramètres de l\'application.</string>
+    <string name="diaconn_g8_errorcode_8">Injection restreint pendant une autre injection de Bolus.</string>
+    <string name="diaconn_g8_errorcode_9">Reprise de l\'injection basale nécessaire</string>
+    <string name="diaconn_g8_errorcode_10">Annulé à cause d\'absence de réponse de la pompe.</string>
+    <string name="diaconn_g8_errorcode_11">L\'injection n\'est pas possible en raison d\'une pile faible.</string>
+    <string name="diaconn_g8_errorcode_12">Injection impossible en raison de manque d\'insuline.</string>
+    <string name="diaconn_g8_errorcode_13">Vous ne pouvez pas l\'injecter car il dépasse la limite.</string>
+    <string name="diaconn_g8_errorcode_14">L\'injection ne peut pas être effectuée car elle dépasse le volume d\'injection d\'aujourd\'hui.</string>
+    <string name="diaconn_g8_errorcode_15">Une fois la configuration du basal terminée, l\'injection de basal peut être effectuée.</string>
+    <string name="diaconn_g8_errotpreceivedyet">Commande non transmise. Veuillez réessayer.</string>
+    <string name="diaconn_g8_logtubechange_title">Enreg. changement de tubulure</string>
+    <string name="diaconn_g8_logtubechange_summary">Ajouter \"Changement de tubulure\" à Careportal lorsqu\'il est détecté dans l\'historique</string>
+    <string name="diaconn_g8_logtempstart">Début Basal Temp.</string>
+    <string name="diaconn_g8_errorcode_32">En mode AGB, l\'injection d\'insuline est limitée</string>
+    <string name="diaconn_g8_errorcode_33">Mode AGB activé, la commande de mise en marche est refusée.</string>
+    <string name="diaconn_g8_errorcode_34">Mode AGB désactivé, la commande d\'arrêt est refusée.</string>
+    <string name="diaconn_g8_errorcode_35">Début de basal temp. rejeté quand une basal temp. est en cours d\'exécution</string>
+    <string name="diaconn_g8_errorcode_36">Arrêt de basal temp. rejeté quand une basal temp. n\'est pas en cours d\'exécution</string>
+</resources>
diff --git a/diaconn/src/main/res/values-ga-rIE/strings.xml b/diaconn/src/main/res/values-ga-rIE/strings.xml
new file mode 100644
index 0000000000..3ea04e700d
--- /dev/null
+++ b/diaconn/src/main/res/values-ga-rIE/strings.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>
diff --git a/diaconn/src/main/res/values-hr-rHR/strings.xml b/diaconn/src/main/res/values-hr-rHR/strings.xml
new file mode 100644
index 0000000000..3ea04e700d
--- /dev/null
+++ b/diaconn/src/main/res/values-hr-rHR/strings.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>
diff --git a/diaconn/src/main/res/values-it-rIT/strings.xml b/diaconn/src/main/res/values-it-rIT/strings.xml
new file mode 100644
index 0000000000..2f4e870483
--- /dev/null
+++ b/diaconn/src/main/res/values-it-rIT/strings.xml
@@ -0,0 +1,156 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="resetpairing">Resetta associazione</string>
+    <string name="diaconn_nodeviceavailable">Nessun dispositivo disponibile</string>
+    <string name="diaconn_pairing">Associazione micro Diaconn</string>
+    <string name="pumperror">Errore micro</string>
+    <string name="diaconn_g8_history_alarm">Allarmi</string>
+    <string name="diaconn_g8_history_basalhours">Ore basali</string>
+    <string name="diaconn_g8_history_bolus">Boli</string>
+    <string name="diaconn_g8_history_dailyinsulin">Insulina giornaliera</string>
+    <string name="diaconn_g8_history_errors">Errori</string>
+    <string name="diaconn_g8_history_prime">Caricamento</string>
+    <string name="diaconn_g8_history_refill">Riempimento</string>
+    <string name="diaconn_g8_history_suspend">Sospensione</string>
+    <string name="diaconn_g8_pairingok">Associazione OK</string>
+    <string name="diaconn_g8_waitingforpairing">In attesa dell\'associazione</string>
+    <string name="diaconn_firmware_version">Versione</string>
+    <string name="invalidpairing">Informazioni associazione non valide. Richiesta nuova associazione</string>
+    <string name="gettingpumpsettings">Ricezione impostazioni micro</string>
+    <string name="gettingpumptime">Ricezione ora micro</string>
+    <string name="largetimediff">Grande differenza oraria:\nL\'ora nel micro differisce per più di 1h e 30m. \nRegola l\'ora manualmente e assicurati che la lettura dello storico dal micro non causi comportamenti imprevisti.\nSe possibile, cancella lo storico del micro prima di cambiare l\'ora oppure disabilita il loop chiuso per un tempo corrispondente al tuo valore DIA.</string>
+    <string name="largetimedifftitle">Grande differenza oraria</string>
+    <string name="approachingdailylimit">Si avvicina il limite giornaliero di insulina</string>
+    <string name="startingbolus">Avvio erogazione bolo</string>
+    <string name="waitingforestimatedbolusend">In attesa della fine stimata del bolo</string>
+    <string name="gettingbolusstatus">Ricezione stato bolo</string>
+    <string name="stoppingtempbasal">Stop basale temporanea</string>
+    <string name="settingtempbasal">Impostazione basale temporanea</string>
+    <string name="settingextendedbolus">Impostazione bolo esteso</string>
+    <string name="stoppingextendedbolus">Stop bolo esteso</string>
+    <string name="updatingbasalrates">Aggiornamento velocità basali</string>
+    <string name="description_pump_diaconn_g8">Integrazione del microinfusore Diaconn G8</string>
+    <string name="diaconn_g8_pump">Diaconn G8</string>
+    <string name="diaconn_g8_pump_shortname">Diaconn G8</string>
+    <string name="maxbolusviolation">Violazione bolo massimo</string>
+    <string name="commanderror">Errore comando</string>
+    <string name="speederror">Errore velocità</string>
+    <string name="insulinlimitviolation">Violazione limite insulina</string>
+    <string name="boluserrorcode">Chiesto: %1$.2fU Erogato: %2$.2fU Codice errore: %3$s</string>
+    <string name="diaconn_g8_valuenotsetproperly">Valore non impostato correttamente</string>
+    <string name="diaconn_g8_bt_name_title">Dispositivo Bluetooth Diaconn G8</string>
+    <string name="diaconn_g8_password_title">Password micro</string>
+    <string name="bolusspeed">Velocità bolo</string>
+    <string name="selectedpump">Micro selezionato</string>
+    <string name="diaconn_g8_useextended_title">Usa boli estesi per &gt;200%%</string>
+    <string name="diaconn_g8_visualizeextendedaspercentage_title">Visualizza bolo esteso come %%</string>
+    <string name="diaconn_g8_bluetooth_status">Stato bluetooth</string>
+    <string name="diagonn_g8_tdd_label">TDD</string>
+    <string name="bolus_step">Incremento bolo</string>
+    <string name="basal_step">Incremento basale</string>
+    <string name="pump_firmware_label">Firmware</string>
+    <string name="diagonn_g8_useroptions">OPZIONI UTENTE</string>
+    <string name="pairfirst">Associa il micro col tuo telefono!</string>
+    <string name="processinghistory">"Elaborazione "</string>
+    <string name="apslastLogNum">aps_last_log_num</string>
+    <string name="apsWrappingCount">aps_wrapping_count</string>
+    <string name="diaconn_g8_history_tempbasal">Basale temporanea</string>
+    <string name="diaconng8_pump_settings">Impostazioni micro Diaconn</string>
+    <string name="diaconn_g8_pumpalarm">Suono</string>
+    <string name="diaconn_g8_pumpalarm_sound">suono</string>
+    <string name="diaconn_g8_pumpalarm_vibrate">vibrazione</string>
+    <string name="diaconn_g8_pumpalarm_silent">silenzioso</string>
+    <string name="diaconn_g8_pumpalarmlevel">Intensità allarme</string>
+    <string name="diaconn_g8_pumpalarm_intensity_low">basso</string>
+    <string name="diaconn_g8_pumpalarm_intensity_middle">medio</string>
+    <string name="diaconn_g8_pumpalarm_intensity_high">alto</string>
+    <string name="diaconn_g8_screentimeout">LCD attivo [second]</string>
+    <string name="diaconn_g8_saveuseroptions">SALVA OPZIONE SUL MICRO</string>
+    <string name="diaconn_g8_language">Lingua</string>
+    <string name="diaconn_g8_bolus_speed">Velocità bolo</string>
+    <string name="diaconn_g8_pumplang_chiness">Chiness</string>
+    <string name="diaconn_g8_pumplang_korean">Korean</string>
+    <string name="diaconn_g8_pumplang_english">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">basso</string>
+    <string name="injectionblocked">Erogazione bloccata</string>
+    <string name="batterywarning">Avviso batteria</string>
+    <string name="insulinlackwarning">Avviso mancanza insulina</string>
+    <string name="needbatteryreplace">Necessario sostituire batteria</string>
+    <string name="needinsullinreplace">Necessario sostituire insulina</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">Registra cambio serbatorio</string>
+    <string name="diaconn_g8_loginsulinchange_summary">Aggiungi evento \"cambio insulina\" al portale quando rilevato nello storico</string>
+    <string name="diaconn_g8_logcanulachange_title">Registra cambio cannula</string>
+    <string name="diaconn_g8_logcanulachange_summary">Aggiungi evento \"cambio posizione\" al portale quando rilevato nello storico</string>
+    <string name="diaconn_g8_logbatterychange_summary">Aggiungi evento \"cambio batteria\" al portale quando rilevato nello storico</string>
+    <string name="diaconn_g8_logbatterychange_title">Registra cambio batteria</string>
+    <string name="diaconn_g8_logsyncinprogress">Sincronizzazione log in corso</string>
+    <string name="diaconn_g8_loginsulinshorage">Carenza insulina</string>
+    <string name="diaconn_g8_logbatteryshorage">Carenza batteria</string>
+    <string name="diaconn_g8_logneedleprime">Caricamento cannula :%1$.2fU</string>
+    <string name="diaconn_g8_loginjectorprime">Caricamento erogatore :%1$.2fU</string>
+    <string name="diaconn_g8_logtubeprime">Caricamento cambio catetere :%1$.2fU</string>
+    <string name="diaconn_g8_resetfactoryreset">Reset dopo ripristino impostazioni di fabbrica</string>
+    <string name="diaconn_g8_resetemergencyoff">Reset dopo Emergency Off</string>
+    <string name="diaconn_g8_resetbatteryreplacement">Reset dopo sostituzione batteria dell\'utente</string>
+    <string name="diaconn_g8_resetaftercalibration">Reset dopo calibrazione</string>
+    <string name="diaconn_g8_resetpreshipment">Reset dopo la configurazione iniziale</string>
+    <string name="diaconn_g8_resetunexpected">Reset sistema inatteso</string>
+    <string name="diaconn_g8_reasoncomplete">Completato</string>
+    <string name="diaconn_g8_reasoninjectonblock">Blocco erogazione</string>
+    <string name="diaconn_g8_reasonbatteryshortage">Carenza batteria</string>
+    <string name="diaconn_g8_reasoninsulinshortage">Carenza insulina</string>
+    <string name="diaconn_g8_reasonuserstop">Stop dell\'utente</string>
+    <string name="diaconn_g8_reasonsystemreset">Reset di sistema</string>
+    <string name="diaconn_g8_reasonother">Altro</string>
+    <string name="diaconn_g8_reasonemergencystop">Stop d\'emergenza</string>
+    <string name="diacon_g8_blockbasal">BASALE</string>
+    <string name="diacon_g8_blockmealbolus">BOLO PASTO</string>
+    <string name="diacon_g8_blocknormalbolus">BOLO NORMALE</string>
+    <string name="diacon_g8_blocksquarebolus">BOLO ONDA QUADRA</string>
+    <string name="diacon_g8_blockdualbolus">BOLO ONDA DOPPIA</string>
+    <string name="diacon_g8_blockreplacetube">SOSTITUIRE CATETERE</string>
+    <string name="diacon_g8_blockreplaceneedle">SOSTITUIRE CANNULA</string>
+    <string name="diacon_g8_blockreplacesyringe">SOSTITUIRE SIRINGA</string>
+    <string name="diaconn_g8_logalarmblock">Blocco erogazione (%s)</string>
+    <string name="diaconn_g8_lgorelease">rilascio basale (%s)</string>
+    <string name="diaconn_g8_lgosuspend">sospensione basale (%s)</string>
+    <string name="diaconn_g8_logdualnormalsuccess">Bolo normale doppio: OK</string>
+    <string name="diaconn_g8_logdualsquarestart">Avvio bolo onda quadra doppia</string>
+    <string name="diaconn_g8_logdualsquaresuccess">Bolo onda quadra doppia: OK</string>
+    <string name="diaconn_g8_logsquarestart">Avvio bolo onda quadra</string>
+    <string name="diaconn_g8_logsquaresuccess">Bolo onda quadra: OK</string>
+    <string name="diaconn_g8_logmealfail">Pasto: fallito</string>
+    <string name="diaconn_g8_logsuccess">OK</string>
+    <string name="diaconn_g8_logmealsuccess">Pasto: OK</string>
+    <string name="key_diaconn_g8_logtubechange">diaconn_g8_logtubechange</string>
+    <string name="diaconn_g8_errorcode_1">Ricerca non possibile a causa di un errore CRC del pacchetto.</string>
+    <string name="diaconn_g8_errorcode_2">Impostazione non possibile - errore di un parametro di input.</string>
+    <string name="diaconn_g8_errorcode_3">Impostazione non possibile - errore di specifica del protocollo.</string>
+    <string name="diaconn_g8_errorcode_4">Pasti programmati, erogazione non possibile ora.</string>
+    <string name="diaconn_g8_errorcode_6">Cancellato dal micro</string>
+    <string name="diaconn_g8_errorcode_7">Altre azioni in corso, limitazione impostazioni app.</string>
+    <string name="diaconn_g8_errorcode_8">Durante l\'erogazione di un altro bolo, l\'erogazione è limitata.</string>
+    <string name="diaconn_g8_errorcode_9">Richiedi di riprendere l\'erogazione della basale</string>
+    <string name="diaconn_g8_errorcode_10">Cancellato a causa della mancata risposta del micro.</string>
+    <string name="diaconn_g8_errorcode_11">L\'erogazione non è possibile a causa della batteria quasi scarica.</string>
+    <string name="diaconn_g8_errorcode_12">Insulina non sufficiente. Non può essere erogata.</string>
+    <string name="diaconn_g8_errorcode_13">Non puoi erogare l\'insulina perché la quantità eccede il limite.</string>
+    <string name="diaconn_g8_errorcode_14">Non puoi erogare l\'insulina perché la quantità eccede il limite giornaliero.</string>
+    <string name="diaconn_g8_errorcode_15">Dopo la configurazione della basale, l\'erogazione può essere effettuata.</string>
+    <string name="diaconn_g8_errotpreceivedyet">Il comando non è stato consegnato. Riprova.</string>
+    <string name="diaconn_g8_logtubechange_title">Registra cambio catetere</string>
+    <string name="diaconn_g8_logtubechange_summary">Aggiungi evento \"cambio catetere\" alle note quando rilevato nello storico</string>
+    <string name="diaconn_g8_logtempstart">Avvio basale temporanea</string>
+    <string name="diaconn_g8_errorcode_32">Durante l\'esecuzione di LGS, l’erogazione è limitata</string>
+    <string name="diaconn_g8_errorcode_33">Stato LGS già su ON. Comando di attivazione rifiutato.</string>
+    <string name="diaconn_g8_errorcode_34">Stato LGS già su OFF. Comando di disattivazione rifiutato.</string>
+    <string name="diaconn_g8_errorcode_35">L\'avvio della basale temporanea viene rifiutato quando è già in esecuzione una basale temporanea</string>
+    <string name="diaconn_g8_errorcode_36">Lo stop della basale temporanea viene rifiutato quando non è in esecuzione alcuna basale temporanea</string>
+</resources>
diff --git a/diaconn/src/main/res/values-iw-rIL/strings.xml b/diaconn/src/main/res/values-iw-rIL/strings.xml
new file mode 100644
index 0000000000..4b5a63bed6
--- /dev/null
+++ b/diaconn/src/main/res/values-iw-rIL/strings.xml
@@ -0,0 +1,139 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="resetpairing">מחיקת צימוד</string>
+    <string name="diaconn_nodeviceavailable">אין מכשירים זמינים</string>
+    <string name="diaconn_pairing">צימוד משאבת Diaconn</string>
+    <string name="pumperror">תקלת משאבה</string>
+    <string name="diaconn_g8_history_alarm">התראות</string>
+    <string name="diaconn_g8_history_basalhours">שעות בזאליות</string>
+    <string name="diaconn_g8_history_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שעון המשאבה לא מכוון במעלה משעה וחצי.\n נא להתאים את שעון המשאבה באופן ידני ולוודא כי קריאת ההיסטוריה מהמשאבה אינה גורמת להתנהגות בלתי צפויה.\nבמידת האפשר, מחקו את ההיסטוריה מהמשאבה לפני שתשנו את השעה או השביתו את הלולאה הסגורה למשך פעילות אינסולין (DIA) לאחר רשומת ההיסטוריה השגויה האחרונה אך לפחות DIA אחד מעכשיו.</string>
+    <string name="largetimedifftitle">הפרש זמן גדול</string>
+    <string name="approachingdailylimit">מתקרב למגבלת האינסולין היומית</string>
+    <string name="startingbolus">מתחיל מתן בולוס</string>
+    <string name="waitingforestimatedbolusend">ממתין לסיום הבולוס</string>
+    <string name="gettingbolusstatus">מקבל סטטוס בולוס</string>
+    <string name="stoppingtempbasal">מפסיק בזאלי זמני</string>
+    <string name="settingtempbasal">מגדיר בזאלי זמני</string>
+    <string name="settingextendedbolus">מגדיר בולוס ממושך</string>
+    <string name="stoppingextendedbolus">מפסיק בולוס ממושך</string>
+    <string name="updatingbasalrates">מעדכן את המינון הבזאלי</string>
+    <string name="description_pump_diaconn_g8">חיבור משאבת Diaconn G8</string>
+    <string name="diaconn_g8_pump">Diaconn G8</string>
+    <string name="diaconn_g8_pump_shortname">Diaconn G8</string>
+    <string name="maxbolusviolation">בולוס גבוה מדי</string>
+    <string name="commanderror">שגיאה בפקודה</string>
+    <string name="speederror">שגיאת מהירות</string>
+    <string name="insulinlimitviolation">כמות אינסולין גבוהה מדי</string>
+    <string name="boluserrorcode">התבקש: %1$.2f יח\' הוזרק: %2$.2f יח\' קוד שגיאה: %3$s</string>
+    <string name="diaconn_g8_valuenotsetproperly">ערך לא מוגדר כראוי</string>
+    <string name="diaconn_g8_bt_name_title">מכשיר בלוטות\' Diaconn G8</string>
+    <string name="diaconn_g8_password_title">סיסמת משאבה</string>
+    <string name="bolusspeed">מהירות בולוס</string>
+    <string name="selectedpump">משאבה נבחרת</string>
+    <string name="diaconn_g8_useextended_title">השתמש בבולוס ממושך במשך &gt;200%%</string>
+    <string name="diaconn_g8_visualizeextendedaspercentage_title">הצגת בולוס ממושך כ-%%</string>
+    <string name="diaconn_g8_bluetooth_status">מצב בלוטות\'</string>
+    <string name="diagonn_g8_tdd_label">מינון יומי כולל (TDD)</string>
+    <string name="bolus_step">צעד במינון בולוס</string>
+    <string name="basal_step">צעד במינון בזאלי</string>
+    <string name="pump_firmware_label">קושחה</string>
+    <string name="diagonn_g8_useroptions">אפשרויות משתמש</string>
+    <string name="pairfirst">נא לצמד את המשאבה עם הטלפון שלכם!</string>
+    <string name="processinghistory">"מעבד אירוע "</string>
+    <string name="diaconn_g8_history_tempbasal">בזאלי זמני</string>
+    <string name="diaconng8_pump_settings">הגדרות משאבת Diaconn</string>
+    <string name="diaconn_g8_pumpalarm">צלילים</string>
+    <string name="diaconn_g8_pumpalarm_sound">צלילים</string>
+    <string name="diaconn_g8_pumpalarm_vibrate">רטט</string>
+    <string name="diaconn_g8_pumpalarm_silent">שקט</string>
+    <string name="diaconn_g8_pumpalarmlevel">עוצמת אזעקה</string>
+    <string name="diaconn_g8_pumpalarm_intensity_low">נמוכה</string>
+    <string name="diaconn_g8_pumpalarm_intensity_middle">בינונית</string>
+    <string name="diaconn_g8_pumpalarm_intensity_high">גבוהה</string>
+    <string name="diaconn_g8_screentimeout">זמן הפעלת מסך [second]</string>
+    <string name="diaconn_g8_saveuseroptions">שמירת הגדרה במשאבה</string>
+    <string name="diaconn_g8_language">שפה</string>
+    <string name="diaconn_g8_bolus_speed">מהירות הזרקת הבולוס</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">חסימת הזרקה</string>
+    <string name="batterywarning">אזהרת סוללה</string>
+    <string name="insulinlackwarning">אזהרת מחסור באינסולין</string>
+    <string name="needbatteryreplace">נדרשת החלפת סוללה</string>
+    <string name="needinsullinreplace">נדרשת החלפת אינסולין</string>
+    <string name="pumpversion">גרסת משאבה</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>
+    <string name="diaconn_g8_logcanulachange_summary">הוסף אירוע \"החלפת צינורית\" לפורטל הטיפולים כשימצא בהיסטוריה</string>
+    <string name="diaconn_g8_logbatterychange_summary">הוסף אירוע \"החלפת סוללה\" לפורטל הטיפולים כשימצא בהיסטוריה</string>
+    <string name="diaconn_g8_logbatterychange_title">רישום החלפת סוללה</string>
+    <string name="diaconn_g8_logsyncinprogress">רישום ביצוע סינכרון</string>
+    <string name="diaconn_g8_loginsulinshorage">מחסור באינסולין</string>
+    <string name="diaconn_g8_logbatteryshorage">סוללה חלשה</string>
+    <string name="diaconn_g8_logneedleprime">תיחול מחט: %1$.2f יח\'</string>
+    <string name="diaconn_g8_loginjectorprime">תיחול: %1$.2f יח\'</string>
+    <string name="diaconn_g8_logtubeprime">תיחול החלפת צינורית: %1$.2f יח\'</string>
+    <string name="diaconn_g8_resetfactoryreset">איפוס לאחר חזרה להגדרות יצרן</string>
+    <string name="diaconn_g8_resetemergencyoff">איפוס לאחר כיבוי חירום</string>
+    <string name="diaconn_g8_resetbatteryreplacement">איפוס לאחר החלפת סוללה</string>
+    <string name="diaconn_g8_resetaftercalibration">איפוס לאחר כיול</string>
+    <string name="diaconn_g8_resetunexpected">אתחול מערכת בלתי צפוי</string>
+    <string name="diaconn_g8_reasoncomplete">הושלם</string>
+    <string name="diaconn_g8_reasoninjectonblock">חסימת הזרקה</string>
+    <string name="diaconn_g8_reasonbatteryshortage">סוללה חלשה</string>
+    <string name="diaconn_g8_reasoninsulinshortage">מחסור באינסולין</string>
+    <string name="diaconn_g8_reasonuserstop">עצירה ע\"י המשתמש</string>
+    <string name="diaconn_g8_reasonsystemreset">אתחול מערכת</string>
+    <string name="diaconn_g8_reasonother">אחר</string>
+    <string name="diaconn_g8_reasonemergencystop">עצירת חירום</string>
+    <string name="diacon_g8_blockbasal">בזאלי</string>
+    <string name="diacon_g8_blockmealbolus">בולוס ארוחה</string>
+    <string name="diacon_g8_blocknormalbolus">בולוס רגיל</string>
+    <string name="diacon_g8_blocksquarebolus">בולוס מרובע</string>
+    <string name="diacon_g8_blockdualbolus">בולוס כפול</string>
+    <string name="diacon_g8_blockreplacetube">החלפת צינורית</string>
+    <string name="diacon_g8_blockreplaceneedle">החלפת מחט</string>
+    <string name="diacon_g8_blockreplacesyringe">החלפת מכל</string>
+    <string name="diaconn_g8_logalarmblock">חסימת הזרקה (%s)</string>
+    <string name="diaconn_g8_lgosuspend">הפסק בזאלי (%s)</string>
+    <string name="diaconn_g8_logmealfail">רישום המזון נכשל</string>
+    <string name="diaconn_g8_logsuccess">הצלחה</string>
+    <string name="diaconn_g8_logmealsuccess">רישום המזון הצליח</string>
+    <string name="key_diaconn_g8_logtubechange">רישום החלפת צינורית</string>
+    <string name="diaconn_g8_errorcode_3">לא ניתן להגדיר שגיאת פרוטוקול ספציפי.</string>
+    <string name="diaconn_g8_errorcode_4">הארוחה נרשמה, לא ניתן להזריק.</string>
+    <string name="diaconn_g8_errorcode_6">בוטל על ידי המשאבה</string>
+    <string name="diaconn_g8_errorcode_8">בזמן הזרקת בולוס, הזרקות אחרות אינן אפשריות.</string>
+    <string name="diaconn_g8_errorcode_10">בוטל עקב חוסר תגובה מהמשאבה.</string>
+    <string name="diaconn_g8_errorcode_11">ההזרקה לא אפשרית עקב סוללה חלשה.</string>
+    <string name="diaconn_g8_errorcode_12">חסר אינסולין, לא ניתן להזריק.</string>
+    <string name="diaconn_g8_errorcode_14">ההזרקה לא אפשרית כי היא חורגת מהמינון היומי המותר.</string>
+    <string name="diaconn_g8_errorcode_15">לאחר סיום תצורת הבזאלי, תותר הזרקתו.</string>
+    <string name="diaconn_g8_errotpreceivedyet">הפקודה לא נשלחה. בבקשה נסה שוב.</string>
+    <string name="diaconn_g8_logtubechange_title">רישום החלפת צינורית</string>
+    <string name="diaconn_g8_logtubechange_summary">הוסף אירוע \"החלפת צינורית\" לפורטל הטיפולים כשימצא בהיסטוריה</string>
+    <string name="diaconn_g8_logtempstart">התחלת בזאלי זמני</string>
+    <string name="diaconn_g8_errorcode_32">בעת השהייה עקב סוכר נמוך, ההזרקה מוגבלת</string>
+    <string name="diaconn_g8_errorcode_33">מצב השהייה עקב סוכר נמוך מופעל, פקודת ON נדחתה.</string>
+    <string name="diaconn_g8_errorcode_34">מצב השהייה עקב סוכר נמוך כבוי, פקודת OFF נדחתה.</string>
+</resources>
diff --git a/diaconn/src/main/res/values-ko-rKR/strings.xml b/diaconn/src/main/res/values-ko-rKR/strings.xml
new file mode 100644
index 0000000000..2000c331b4
--- /dev/null
+++ b/diaconn/src/main/res/values-ko-rKR/strings.xml
@@ -0,0 +1,156 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="resetpairing">페어링 초기화</string>
+    <string name="diaconn_nodeviceavailable">장비가 존재하지 않습니다.</string>
+    <string name="diaconn_pairing">디아콘 펌프 페어링</string>
+    <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>
+    <string name="stoppingtempbasal">임시Basal 중지</string>
+    <string name="settingtempbasal">임시Basal 설정</string>
+    <string name="settingextendedbolus">확장 Bolus 설정</string>
+    <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>
+    <string name="diaconn_g8_pumpalarm_sound">소리</string>
+    <string name="diaconn_g8_pumpalarm_vibrate">진동</string>
+    <string name="diaconn_g8_pumpalarm_silent">무음</string>
+    <string name="diaconn_g8_pumpalarmlevel">음향 세기</string>
+    <string name="diaconn_g8_pumpalarm_intensity_low">소</string>
+    <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>
+    <string name="diaconn_g8_logcanulachange_summary">로그 동기화 시 케어포털 \"위치 교체\" 정보 자동 업로드</string>
+    <string name="diaconn_g8_logbatterychange_summary">로그 동기화 시 케어포털 \"베터리 교체\" 정보 자동 업로드</string>
+    <string name="diaconn_g8_logbatterychange_title">베터리 교체</string>
+    <string name="diaconn_g8_logsyncinprogress">로그 동기화 진행 중</string>
+    <string name="diaconn_g8_loginsulinshorage">인슐린 부족 경고</string>
+    <string name="diaconn_g8_logbatteryshorage">베터리 부족 경고</string>
+    <string name="diaconn_g8_logneedleprime">바늘교체 공기 빼기 :%1$.2fU</string>
+    <string name="diaconn_g8_loginjectorprime">주사기 교체 공기빼기 :%1$.2fU</string>
+    <string name="diaconn_g8_logtubeprime">튜브 교체 공기빼기 :%1$.2fU</string>
+    <string name="diaconn_g8_resetfactoryreset">공장초기화 리셋</string>
+    <string name="diaconn_g8_resetemergencyoff">긴급 전원오프 리셋</string>
+    <string name="diaconn_g8_resetbatteryreplacement">베터리교체 후 리셋</string>
+    <string name="diaconn_g8_resetaftercalibration">보정 후 리셋</string>
+    <string name="diaconn_g8_resetpreshipment">출하전설정 후 리셋</string>
+    <string name="diaconn_g8_resetunexpected">예상치 못한 시스템 리셋</string>
+    <string name="diaconn_g8_reasoncomplete">완료</string>
+    <string name="diaconn_g8_reasoninjectonblock">주입 막힘</string>
+    <string name="diaconn_g8_reasonbatteryshortage">베터리 부족</string>
+    <string name="diaconn_g8_reasoninsulinshortage">인슐린 부족</string>
+    <string name="diaconn_g8_reasonuserstop">사용자 중지</string>
+    <string name="diaconn_g8_reasonsystemreset">시스템 리셋</string>
+    <string name="diaconn_g8_reasonother">기타</string>
+    <string name="diaconn_g8_reasonemergencystop">긴급 정지</string>
+    <string name="diacon_g8_blockbasal">기저주입</string>
+    <string name="diacon_g8_blockmealbolus">식사주입</string>
+    <string name="diacon_g8_blocknormalbolus">일반주입</string>
+    <string name="diacon_g8_blocksquarebolus">스퀘어주입</string>
+    <string name="diacon_g8_blockdualbolus">듀얼주입</string>
+    <string name="diacon_g8_blockreplacetube">튜브교체</string>
+    <string name="diacon_g8_blockreplaceneedle">바늘교체</string>
+    <string name="diacon_g8_blockreplacesyringe">주사기교체</string>
+    <string name="diaconn_g8_logalarmblock">주입막힘 (%s)</string>
+    <string name="diaconn_g8_lgorelease">기저 재개 (%s)</string>
+    <string name="diaconn_g8_lgosuspend">기저 중지 (%s)</string>
+    <string name="diaconn_g8_logdualnormalsuccess">듀얼 일반 성공</string>
+    <string name="diaconn_g8_logdualsquarestart">듀얼 스퀘어 시작</string>
+    <string name="diaconn_g8_logdualsquaresuccess">듀얼 스퀘어 성공</string>
+    <string name="diaconn_g8_logsquarestart">스퀘어 시작</string>
+    <string name="diaconn_g8_logsquaresuccess">스퀘어 성공</string>
+    <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>
+    <string name="diaconn_g8_errorcode_4">식사 시간제한 상태로, 주입할 수 없습니다.</string>
+    <string name="diaconn_g8_errorcode_6">펌프에서 취소 하였습니다.</string>
+    <string name="diaconn_g8_errorcode_7">타 작업중으로, 앱 설정 기능이 제한됩니다.</string>
+    <string name="diaconn_g8_errorcode_8">다른 Bolus 주입 중으로, 주입이 제한됩니다.</string>
+    <string name="diaconn_g8_errorcode_9">기저정지 해제가 필요합니다.</string>
+    <string name="diaconn_g8_errorcode_10">펌프 미응답으로 취소 되었습니다.</string>
+    <string name="diaconn_g8_errorcode_11">배터리 부족으로 주입할 수 없습니다.</string>
+    <string name="diaconn_g8_errorcode_12">인슐린 부족으로 주입할 수 없습니다.</string>
+    <string name="diaconn_g8_errorcode_13">1회 제한량 초과로 주입할 수 없습니다.</string>
+    <string name="diaconn_g8_errorcode_14">금일 주입량 초과로 주입할 수 없습니다.</string>
+    <string name="diaconn_g8_errorcode_15">기저설정 완료 후, 기저주입할 수 있습니다.</string>
+    <string name="diaconn_g8_errotpreceivedyet">명령이 전달되지 않았습니다. 다시 시도해주세요.</string>
+    <string name="diaconn_g8_logtubechange_title">튜브 교체</string>
+    <string name="diaconn_g8_logtubechange_summary">로그 동기화 시 \"튜브 교체\" 노트 정보 자동 업로드</string>
+    <string name="diaconn_g8_logtempstart">임시Basal 시작</string>
+    <string name="diaconn_g8_errorcode_32">LGS 동작 중 볼러스 주입 거절</string>
+    <string name="diaconn_g8_errorcode_33">LGS ON일때, ON 거절</string>
+    <string name="diaconn_g8_errorcode_34">LGS OFF일 때, OFF 거절</string>
+    <string name="diaconn_g8_errorcode_35">임시기저 설정중인 상태일 때, 임시기저 시작 명령 거절</string>
+    <string name="diaconn_g8_errorcode_36">임시기저 설정이 안 된 상태일 때, 임시기저 중지 명령 거절</string>
+</resources>
diff --git a/diaconn/src/main/res/values-lt-rLT/strings.xml b/diaconn/src/main/res/values-lt-rLT/strings.xml
new file mode 100644
index 0000000000..3ea04e700d
--- /dev/null
+++ b/diaconn/src/main/res/values-lt-rLT/strings.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>
diff --git a/diaconn/src/main/res/values-nl-rNL/strings.xml b/diaconn/src/main/res/values-nl-rNL/strings.xml
new file mode 100644
index 0000000000..f6d192e705
--- /dev/null
+++ b/diaconn/src/main/res/values-nl-rNL/strings.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="resetpairing">Koppeling verwijderen</string>
+    <string name="diaconn_nodeviceavailable">Geen apparaat beschikbaar</string>
+    <string name="diaconn_pairing">Diaconn Pomp Koppeling</string>
+    <string name="pumperror">Pomp storing</string>
+    <string name="diaconn_g8_history_alarm">Alarmen</string>
+    <string name="diaconn_g8_history_bolus">Bolussen</string>
+    <string name="diaconn_g8_history_dailyinsulin">Dagtotaal insuline</string>
+    <string name="diaconn_g8_history_errors">Foutmeldingen</string>
+    <string name="diaconn_g8_history_prime">Vullen</string>
+    <string name="diaconn_g8_history_suspend">Onderbreken</string>
+    <string name="diaconn_g8_pairingok">Koppeling geslaagd</string>
+    <string name="diaconn_g8_waitingforpairing">Wachten op koppeling</string>
+    <string name="diaconn_firmware_version">Versie</string>
+    <string name="invalidpairing">Ongeldige koppelingsinformatie. Nieuwe koppelingspoging wordt uitgevoerd</string>
+    <string name="gettingpumpsettings">Pomp instellingen aan het ophalen</string>
+    <string name="gettingpumptime">Pomp tijd aan het ophalen</string>
+    <string name="approachingdailylimit">Insuline daglimiet aan het benaderen</string>
+    <string name="startingbolus">Bolus toediening gestart</string>
+    <string name="gettingbolusstatus">Bolus status aan het ophalen</string>
+    <string name="stoppingtempbasal">Stoppen van tijdelijk basaal</string>
+    <string name="settingtempbasal">Instellen tijdelijk basaal</string>
+    <string name="settingextendedbolus">Instellen van vertraagde bolus</string>
+    <string name="stoppingextendedbolus">Stoppen van vertraagde bolus</string>
+    <string name="updatingbasalrates">Bijwerken basaal profiel</string>
+    <string name="description_pump_diaconn_g8">Pomp integratie voor Diaconn G8 Pompen</string>
+</resources>
diff --git a/diaconn/src/main/res/values-no-rNO/strings.xml b/diaconn/src/main/res/values-no-rNO/strings.xml
new file mode 100644
index 0000000000..cef3434eba
--- /dev/null
+++ b/diaconn/src/main/res/values-no-rNO/strings.xml
@@ -0,0 +1,156 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="resetpairing">Slett sammenkobling</string>
+    <string name="diaconn_nodeviceavailable">Ingen enheter er tilgjengelige</string>
+    <string name="diaconn_pairing">Diaconn pumpe sammenkobling</string>
+    <string name="pumperror">Pumpe feil</string>
+    <string name="diaconn_g8_history_alarm">Alarmer</string>
+    <string name="diaconn_g8_history_basalhours">Basal timer</string>
+    <string name="diaconn_g8_history_bolus">Boluser</string>
+    <string name="diaconn_g8_history_dailyinsulin">Daglig insulin</string>
+    <string name="diaconn_g8_history_errors">Feil</string>
+    <string name="diaconn_g8_history_prime">Prime</string>
+    <string name="diaconn_g8_history_refill">Påfyll</string>
+    <string name="diaconn_g8_history_suspend">Pauset</string>
+    <string name="diaconn_g8_pairingok">Sammenkobling OK</string>
+    <string name="diaconn_g8_waitingforpairing">Venter på sammenkobling</string>
+    <string name="diaconn_firmware_version">Versjon</string>
+    <string name="invalidpairing">Ugyldig parringsinformasjon. Krever ny sammenkobling</string>
+    <string name="gettingpumpsettings">Henter pumpe innstillinger</string>
+    <string name="gettingpumptime">Henter pumpens tid</string>
+    <string name="largetimediff">Stor tidsforskjell:\nKlokken i pumpen avviker mer enn 1,5 timer fra mobilen.\nVennligst juster klokke manuelt på pumpen og sørg for at lesing av loggen fra pumpen ikke fører til uventet oppførsel.\nHvis mulig, fjern loggen fra pumpen før du endrer klokkeslettet eller deaktiver lukket loop for én DIA periode etter siste feil oppføring i historikk, men minst én DIA periode fra nå.</string>
+    <string name="largetimedifftitle">Stor tidsforskjell</string>
+    <string name="approachingdailylimit">Maksimal daglig insulindose er snart nådd</string>
+    <string name="startingbolus">Starter bolus dosering</string>
+    <string name="waitingforestimatedbolusend">Venter på avsluttet bolus dosering</string>
+    <string name="gettingbolusstatus">Leser bolus status</string>
+    <string name="stoppingtempbasal">Stopper temp basal</string>
+    <string name="settingtempbasal">Setter temp basal</string>
+    <string name="settingextendedbolus">Setter forlenget bolus</string>
+    <string name="stoppingextendedbolus">Stopper forlenget bolus</string>
+    <string name="updatingbasalrates">Oppdaterer basaldoser</string>
+    <string name="description_pump_diaconn_g8">Pumpe integrasjon for Diaconn G8 Pumper</string>
+    <string name="diaconn_g8_pump">Diaconn G8</string>
+    <string name="diaconn_g8_pump_shortname">Diaconn G8</string>
+    <string name="maxbolusviolation">Max bolus nådd</string>
+    <string name="commanderror">Kommando feil</string>
+    <string name="speederror">Hastighetsfeil</string>
+    <string name="insulinlimitviolation">Insulingrense nådd</string>
+    <string name="boluserrorcode">Forespurt: %1$.2fE Levert: %2$.2fE Feilkode: %3$s</string>
+    <string name="diaconn_g8_valuenotsetproperly">Verdien er ikke satt riktig</string>
+    <string name="diaconn_g8_bt_name_title">Diaconn G8 Bluetooth enhet</string>
+    <string name="diaconn_g8_password_title">Pumpe passord</string>
+    <string name="bolusspeed">Bolus hastighet</string>
+    <string name="selectedpump">Valgt pumpe</string>
+    <string name="diaconn_g8_useextended_title">Bruk forlenget bolus i &gt;200%%</string>
+    <string name="diaconn_g8_visualizeextendedaspercentage_title">Vis forlenget bolus som %%</string>
+    <string name="diaconn_g8_bluetooth_status">Bluetooth status</string>
+    <string name="diagonn_g8_tdd_label">TDD</string>
+    <string name="bolus_step">Bolus trinn</string>
+    <string name="basal_step">Basal trinn</string>
+    <string name="pump_firmware_label">Firmware</string>
+    <string name="diagonn_g8_useroptions">BRUKERVALG</string>
+    <string name="pairfirst">Vennligst sammenkobl pumpen med mobilen!</string>
+    <string name="processinghistory">"Behandler hendelse "</string>
+    <string name="apslastLogNum">aps_last_log_num</string>
+    <string name="apsWrappingCount">aps_wrapping_count</string>
+    <string name="diaconn_g8_history_tempbasal">Temp basal</string>
+    <string name="diaconng8_pump_settings">Diaconn pumpe innstillinger</string>
+    <string name="diaconn_g8_pumpalarm">Lyd</string>
+    <string name="diaconn_g8_pumpalarm_sound">lyd</string>
+    <string name="diaconn_g8_pumpalarm_vibrate">vibrering</string>
+    <string name="diaconn_g8_pumpalarm_silent">lydløs</string>
+    <string name="diaconn_g8_pumpalarmlevel">Alarm intensitet</string>
+    <string name="diaconn_g8_pumpalarm_intensity_low">lav</string>
+    <string name="diaconn_g8_pumpalarm_intensity_middle">medium</string>
+    <string name="diaconn_g8_pumpalarm_intensity_high">høy</string>
+    <string name="diaconn_g8_screentimeout">LCD påslått [second]</string>
+    <string name="diaconn_g8_saveuseroptions">LAGRE INNSTILLINGER TIL PUMPE</string>
+    <string name="diaconn_g8_language">Språk</string>
+    <string name="diaconn_g8_bolus_speed">Bolus hastighet</string>
+    <string name="diaconn_g8_pumplang_chiness">Kinesisk</string>
+    <string name="diaconn_g8_pumplang_korean">Koreansk</string>
+    <string name="diaconn_g8_pumplang_english">Engelsk</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">lav</string>
+    <string name="injectionblocked">Injeksjon blokkert</string>
+    <string name="batterywarning">Advarsel: lavt batteri</string>
+    <string name="insulinlackwarning">Advarsel: lavt insulinnivå</string>
+    <string name="needbatteryreplace">Bytte av batteri er nødvendig</string>
+    <string name="needinsullinreplace">Påfyll av insulin er nødvendig</string>
+    <string name="pumpversion">pump_versjon</string>
+    <string name="apsIncarnationNo">aps_incarnation_no</string>
+    <string name="pumpserialno">pump_serial_no</string>
+    <string name="diaconn_g8_loginsulinchange_title">Logg reservoar bytte</string>
+    <string name="diaconn_g8_loginsulinchange_summary">Legg til \"Insulinbytte\" i Careportal når den oppdages i historikken</string>
+    <string name="diaconn_g8_logcanulachange_title">Logg bytte av kanyle</string>
+    <string name="diaconn_g8_logcanulachange_summary">Legg til \"Bytte av injeksjonssted\" i Careportal når den oppdages i historikken</string>
+    <string name="diaconn_g8_logbatterychange_summary">Legg til \"Bytte av batteri\" i Careportal når den oppdages i historikken</string>
+    <string name="diaconn_g8_logbatterychange_title">Logg batteri bytte</string>
+    <string name="diaconn_g8_logsyncinprogress">Logg synkronisering pågår</string>
+    <string name="diaconn_g8_loginsulinshorage">Lavt insulinnivå</string>
+    <string name="diaconn_g8_logbatteryshorage">Lavt batterinivå</string>
+    <string name="diaconn_g8_logneedleprime">Fyll kanyle:%1$.2fE</string>
+    <string name="diaconn_g8_loginjectorprime">Injector prime :%1$.2fE</string>
+    <string name="diaconn_g8_logtubeprime">Fyll slange: %1$.2fE</string>
+    <string name="diaconn_g8_resetfactoryreset">Nullstill etter tilbakestilling til fabrikkinnstillinger</string>
+    <string name="diaconn_g8_resetemergencyoff">Tilbakestill etter nødstopp</string>
+    <string name="diaconn_g8_resetbatteryreplacement">Tilbakestill etter bytte av batteri</string>
+    <string name="diaconn_g8_resetaftercalibration">Tilbakestill etter kalibrering</string>
+    <string name="diaconn_g8_resetpreshipment">Tilbakestill innstillinger til standard</string>
+    <string name="diaconn_g8_resetunexpected">Uventet tilbakestilling av systemet</string>
+    <string name="diaconn_g8_reasoncomplete">Fullført</string>
+    <string name="diaconn_g8_reasoninjectonblock">Blokkering av injeksjon</string>
+    <string name="diaconn_g8_reasonbatteryshortage">Lavt batterinivå</string>
+    <string name="diaconn_g8_reasoninsulinshortage">Lavt insulinnivå</string>
+    <string name="diaconn_g8_reasonuserstop">Stoppet av bruker</string>
+    <string name="diaconn_g8_reasonsystemreset">Tilbakestilling av systemet</string>
+    <string name="diaconn_g8_reasonother">Annet</string>
+    <string name="diaconn_g8_reasonemergencystop">Nødstopp</string>
+    <string name="diacon_g8_blockbasal">BASAL</string>
+    <string name="diacon_g8_blockmealbolus">MÅLTIDS BOLUS</string>
+    <string name="diacon_g8_blocknormalbolus">NORMAL BOLUS</string>
+    <string name="diacon_g8_blocksquarebolus">FORLENGET BOLUS</string>
+    <string name="diacon_g8_blockdualbolus">KOMBINASJONS BOLUS</string>
+    <string name="diacon_g8_blockreplacetube">ERSTATT SLANGESETT</string>
+    <string name="diacon_g8_blockreplaceneedle">ERSTATT KANYLE</string>
+    <string name="diacon_g8_blockreplacesyringe">ERSTATT SPRØYTE</string>
+    <string name="diaconn_g8_logalarmblock">Injeksjon blokkering (%s)</string>
+    <string name="diaconn_g8_lgorelease">basal levering (%s)</string>
+    <string name="diaconn_g8_lgosuspend">basal stanset (%s)</string>
+    <string name="diaconn_g8_logdualnormalsuccess">Normal kombinasjonsbolus vellykket</string>
+    <string name="diaconn_g8_logdualsquarestart">Kombinasjonsbolus startet</string>
+    <string name="diaconn_g8_logdualsquaresuccess">Kombinasjonsbolus vellykket</string>
+    <string name="diaconn_g8_logsquarestart">Forlenget bolus startet</string>
+    <string name="diaconn_g8_logsquaresuccess">Forlenget bolus vellykket</string>
+    <string name="diaconn_g8_logmealfail">Måltidsbolus feilet</string>
+    <string name="diaconn_g8_logsuccess">Suksess</string>
+    <string name="diaconn_g8_logmealsuccess">Måltidsbolus vellykket</string>
+    <string name="key_diaconn_g8_logtubechange">diaconn_g8_logtubechange</string>
+    <string name="diaconn_g8_errorcode_1">Kan ikke lese på grunn av feil med kommunikasjonen</string>
+    <string name="diaconn_g8_errorcode_2">Kan ikke settes på grunn av feil i parameterverdi.</string>
+    <string name="diaconn_g8_errorcode_3">Kan ikke settes på grunn av feil i kommunikasjonsprotokollen.</string>
+    <string name="diaconn_g8_errorcode_4">Måltid registrert, men kan ikke doseres.</string>
+    <string name="diaconn_g8_errorcode_6">Avbrutt av pumpe</string>
+    <string name="diaconn_g8_errorcode_7">Ta andre handlinger, begrenset av app-innstillingene.</string>
+    <string name="diaconn_g8_errorcode_8">Under levering av bolus dose er ytterligere doseringer begrenset.</string>
+    <string name="diaconn_g8_errorcode_9">Krever gjenopptak av basal injeksjonen</string>
+    <string name="diaconn_g8_errorcode_10">Avbrutt på grunn av at pumpen ikke responderer.</string>
+    <string name="diaconn_g8_errorcode_11">Injeksjonen er ikke mulig på grunn av lavt batterinivå.</string>
+    <string name="diaconn_g8_errorcode_12">Ikke nok insulin for doseringen.</string>
+    <string name="diaconn_g8_errorcode_13">Dosering kan ikke utføres fordi den overstiger maks grense.</string>
+    <string name="diaconn_g8_errorcode_14">Dosering kan ikke utføres fordi den overstiger daglig maks insulingrense.</string>
+    <string name="diaconn_g8_errorcode_15">Når basal oppsett er fullført, kan basaldoseringer startes.</string>
+    <string name="diaconn_g8_errotpreceivedyet">Kommandoen ble ikke utført. Vennligst prøv igjen.</string>
+    <string name="diaconn_g8_logtubechange_title">Logg bytte av slangesett</string>
+    <string name="diaconn_g8_logtubechange_summary">Legg til \"Slangesettbytte\" i Careportal når den oppdages i historikken</string>
+    <string name="diaconn_g8_logtempstart">Temp Basal startet</string>
+    <string name="diaconn_g8_errorcode_32">Vel Lav Glukose Stopp er injeksjoner begrenset</string>
+    <string name="diaconn_g8_errorcode_33">LGS status er PÅ. PÅ kommando er nektet.</string>
+    <string name="diaconn_g8_errorcode_34">LGS status er AV. AV kommandoen er avslått.</string>
+    <string name="diaconn_g8_errorcode_35">Temp basal avslått siden det allerede kjøres en temp basal</string>
+    <string name="diaconn_g8_errorcode_36">Stopp av temp basal avslått siden det ikke kjøres en temp basal</string>
+</resources>
diff --git a/diaconn/src/main/res/values-pl-rPL/strings.xml b/diaconn/src/main/res/values-pl-rPL/strings.xml
new file mode 100644
index 0000000000..3ea04e700d
--- /dev/null
+++ b/diaconn/src/main/res/values-pl-rPL/strings.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>
diff --git a/diaconn/src/main/res/values-pt-rBR/strings.xml b/diaconn/src/main/res/values-pt-rBR/strings.xml
new file mode 100644
index 0000000000..3ea04e700d
--- /dev/null
+++ b/diaconn/src/main/res/values-pt-rBR/strings.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>
diff --git a/diaconn/src/main/res/values-pt-rPT/strings.xml b/diaconn/src/main/res/values-pt-rPT/strings.xml
new file mode 100644
index 0000000000..3ea04e700d
--- /dev/null
+++ b/diaconn/src/main/res/values-pt-rPT/strings.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>
diff --git a/diaconn/src/main/res/values-ro-rRO/strings.xml b/diaconn/src/main/res/values-ro-rRO/strings.xml
new file mode 100644
index 0000000000..3ea04e700d
--- /dev/null
+++ b/diaconn/src/main/res/values-ro-rRO/strings.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>
diff --git a/diaconn/src/main/res/values-ru-rRU/strings.xml b/diaconn/src/main/res/values-ru-rRU/strings.xml
new file mode 100644
index 0000000000..5b4dfdf4d4
--- /dev/null
+++ b/diaconn/src/main/res/values-ru-rRU/strings.xml
@@ -0,0 +1,156 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="resetpairing">Сбросить сопряжение</string>
+    <string name="diaconn_nodeviceavailable">Нет доступных устройств</string>
+    <string name="diaconn_pairing">Сопражение с помпой Diaconn</string>
+    <string name="pumperror">Ошибка помпы</string>
+    <string name="diaconn_g8_history_alarm">Оповещения</string>
+    <string name="diaconn_g8_history_basalhours">Почасовой базал</string>
+    <string name="diaconn_g8_history_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">Сопряжение Ok</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 с настоящего момента.</string>
+    <string name="largetimedifftitle">Большая разница во времени Название</string>
+    <string name="approachingdailylimit">Приближается суточный лимит инсулина</string>
+    <string name="startingbolus">Начало подачи болюса</string>
+    <string name="waitingforestimatedbolusend">Ожидание завершения болюса</string>
+    <string name="gettingbolusstatus">Получение статуса болюса</string>
+    <string name="stoppingtempbasal">Остановка врем базала</string>
+    <string name="settingtempbasal">Установка врем базала</string>
+    <string name="settingextendedbolus">Установка пролонгированного болюса</string>
+    <string name="stoppingextendedbolus">Остановка пролонгированного болюса</string>
+    <string name="updatingbasalrates">Обновление значений базала</string>
+    <string name="description_pump_diaconn_g8">Интеграция с помпами Diaconn G8</string>
+    <string name="diaconn_g8_pump">Diaconn G8</string>
+    <string name="diaconn_g8_pump_shortname">Diaconn G8</string>
+    <string name="maxbolusviolation">Нарушение макс болюса</string>
+    <string name="commanderror">Ошибка в команде</string>
+    <string name="speederror">Ошибка в скорости</string>
+    <string name="insulinlimitviolation">Нарушение лимита инсулина</string>
+    <string name="boluserrorcode">Запрошено: %1$.2f ед. Подано: %2$.2f ед. Код ошибки: %3$s</string>
+    <string name="diaconn_g8_valuenotsetproperly">Значение установлено неправильно</string>
+    <string name="diaconn_g8_bt_name_title">Устройство блутус Diaconn G8</string>
+    <string name="diaconn_g8_password_title">Пароль помпы</string>
+    <string name="bolusspeed">Скорость болюса</string>
+    <string name="selectedpump">Выбранная помпа</string>
+    <string name="diaconn_g8_useextended_title">Для величин &gt;200%% пользуйтесь пролонгированным болюсом</string>
+    <string name="diaconn_g8_visualizeextendedaspercentage_title">Показывать пролонгированный болюс в %%</string>
+    <string name="diaconn_g8_bluetooth_status">Состояние Bluetooth</string>
+    <string name="diagonn_g8_tdd_label">TDD/общая суточная доза</string>
+    <string name="bolus_step">Шаг болюса</string>
+    <string name="basal_step">Шаг базала</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">aps_wrapping_count</string>
+    <string name="diaconn_g8_history_tempbasal">Временный базал</string>
+    <string name="diaconng8_pump_settings">Настройки помпы Diaconn</string>
+    <string name="diaconn_g8_pumpalarm">Звуковое оповещение</string>
+    <string name="diaconn_g8_pumpalarm_sound">звуковой сигнал</string>
+    <string name="diaconn_g8_pumpalarm_vibrate">вибросигнал</string>
+    <string name="diaconn_g8_pumpalarm_silent">без звука</string>
+    <string name="diaconn_g8_pumpalarmlevel">Интенсивность сигнала</string>
+    <string name="diaconn_g8_pumpalarm_intensity_low">низкая</string>
+    <string name="diaconn_g8_pumpalarm_intensity_middle">средняя</string>
+    <string name="diaconn_g8_pumpalarm_intensity_high">высокая</string>
+    <string name="diaconn_g8_screentimeout">Таймаут LCD экрана [second]</string>
+    <string name="diaconn_g8_saveuseroptions">СОХРАНИТЬ ОПЦИЮ В ПОМПУ</string>
+    <string name="diaconn_g8_language">Язык</string>
+    <string name="diaconn_g8_bolus_speed">Скорость болюса</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">Подача заблокирована</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">pump_serial_no</string>
+    <string name="diaconn_g8_loginsulinchange_title">Отслеживать замену резервуара</string>
+    <string name="diaconn_g8_loginsulinchange_summary">Добавить событие \"Замена инсулина\" в портал терапии при обнаружении в хронологии</string>
+    <string name="diaconn_g8_logcanulachange_title">Отслеживать замену катетера помпы в журнале</string>
+    <string name="diaconn_g8_logcanulachange_summary">Добавить событие \"Смена места установки катетера\" в портал терапии при обнаружении в хронологии</string>
+    <string name="diaconn_g8_logbatterychange_summary">Добавить событие \"Замена батареи\" в портал терапии при обнаружении в хронологии</string>
+    <string name="diaconn_g8_logbatterychange_title">Отслеживать замены батареи</string>
+    <string name="diaconn_g8_logsyncinprogress">Отслеживать процесс синхронизации</string>
+    <string name="diaconn_g8_loginsulinshorage">Нехватка инсулина</string>
+    <string name="diaconn_g8_logbatteryshorage">Нехватка заряда батареи</string>
+    <string name="diaconn_g8_logneedleprime">Заполнение катетера %1$.2f ед</string>
+    <string name="diaconn_g8_loginjectorprime">Заполнение инжектора %1$.2f ед</string>
+    <string name="diaconn_g8_logtubeprime">Заполнение новой трубки:%1$.2f ед</string>
+    <string name="diaconn_g8_resetfactoryreset">Сброс после сброса до заводских установок</string>
+    <string name="diaconn_g8_resetemergencyoff">Сброс после аварийного отключения</string>
+    <string name="diaconn_g8_resetbatteryreplacement">Сброс после замены батареи пользователем</string>
+    <string name="diaconn_g8_resetaftercalibration">Сброс после калибровки</string>
+    <string name="diaconn_g8_resetpreshipment">Сброс после настройки перед отправкой</string>
+    <string name="diaconn_g8_resetunexpected">Неожиданный сброс системы</string>
+    <string name="diaconn_g8_reasoncomplete">Завершено</string>
+    <string name="diaconn_g8_reasoninjectonblock">Подача заблокирована</string>
+    <string name="diaconn_g8_reasonbatteryshortage">Нехватка заряда батареи</string>
+    <string name="diaconn_g8_reasoninsulinshortage">Нехватка инсулина</string>
+    <string name="diaconn_g8_reasonuserstop">Остановлено пользователем</string>
+    <string name="diaconn_g8_reasonsystemreset">Сброс системы</string>
+    <string name="diaconn_g8_reasonother">Другое</string>
+    <string name="diaconn_g8_reasonemergencystop">Экстренная остановка</string>
+    <string name="diacon_g8_blockbasal">БАЗАЛ</string>
+    <string name="diacon_g8_blockmealbolus">БОЛЮС НА ЕДУ</string>
+    <string name="diacon_g8_blocknormalbolus">НОРМАЛЬНЫЙ БОЛЮС</string>
+    <string name="diacon_g8_blocksquarebolus">КВАДРАТНЫЙ БОЛЮС</string>
+    <string name="diacon_g8_blockdualbolus">ДВОЙНОЙ БОЛЮС</string>
+    <string name="diacon_g8_blockreplacetube">ЗАМЕНИТЕ ИНФУЗИОННЫЙ НАБОР</string>
+    <string name="diacon_g8_blockreplaceneedle">ЗАМЕНИТЕ ИГЛУ</string>
+    <string name="diacon_g8_blockreplacesyringe">ЗАМЕНИТЕ КАРТРИДЖ</string>
+    <string name="diaconn_g8_logalarmblock">Подача заблокирована (%s)</string>
+    <string name="diaconn_g8_lgorelease">подача базала (%s)</string>
+    <string name="diaconn_g8_lgosuspend">базал остановлен (%s)</string>
+    <string name="diaconn_g8_logdualnormalsuccess">Двойной нормальный подан успешно</string>
+    <string name="diaconn_g8_logdualsquarestart">Начало подачи двойного квадратного</string>
+    <string name="diaconn_g8_logdualsquaresuccess">Двойной квадратный подан успешно</string>
+    <string name="diaconn_g8_logsquarestart">Начало подачи квадратного</string>
+    <string name="diaconn_g8_logsquaresuccess">Квадратный подан успешно</string>
+    <string name="diaconn_g8_logmealfail">Прием пищи не записан</string>
+    <string name="diaconn_g8_logsuccess">Успешно</string>
+    <string name="diaconn_g8_logmealsuccess">Прием пиши записан</string>
+    <string name="key_diaconn_g8_logtubechange">diaconn_g8_logtubechange</string>
+    <string name="diaconn_g8_errorcode_1">Не удается найти из-за ошибки пакета CRC.</string>
+    <string name="diaconn_g8_errorcode_2">Не удается установить ошибку входного параметра.</string>
+    <string name="diaconn_g8_errorcode_3">Не удается установить ошибку спецификации протокола.</string>
+    <string name="diaconn_g8_errorcode_4">Ошибка подачи по времени еды.</string>
+    <string name="diaconn_g8_errorcode_6">Отменено помпой</string>
+    <string name="diaconn_g8_errorcode_7">Принимаются другие действия, ограничивая настройки приложений.</string>
+    <string name="diaconn_g8_errorcode_8">Во время другой подачи болюса болюс невозможен.</string>
+    <string name="diaconn_g8_errorcode_9">Требуется возобновление подачи базала</string>
+    <string name="diaconn_g8_errorcode_10">Отменено из-за отсутствия ответа помпы.</string>
+    <string name="diaconn_g8_errorcode_11">Подача невозможна из-за низкого заряда батареи.</string>
+    <string name="diaconn_g8_errorcode_12">Нехватка инсулина, подача невозможна.</string>
+    <string name="diaconn_g8_errorcode_13">Подача невозможнаб превышен лимит.</string>
+    <string name="diaconn_g8_errorcode_14">Подача инсулина невозможна т. к. превышен суточный объем.</string>
+    <string name="diaconn_g8_errorcode_15">По завершении настройки базала возможна подача базального инсулина.</string>
+    <string name="diaconn_g8_errotpreceivedyet">Команда не выполнена. Попробуйте еще раз.</string>
+    <string name="diaconn_g8_logtubechange_title">Внести запись о замене катетера</string>
+    <string name="diaconn_g8_logtubechange_summary">Добавить событие \"Замена катетера\" в портал терапии при обнаружении в журнале</string>
+    <string name="diaconn_g8_logtempstart">Начало подачи врем базала</string>
+    <string name="diaconn_g8_errorcode_32">Во время приостановки на низких подача инсулина невозможна</string>
+    <string name="diaconn_g8_errorcode_33">Работает Приостановка на низких, команда ВКЛ отклонена.</string>
+    <string name="diaconn_g8_errorcode_34">Приостановка на низких отключена, команда ВЫКЛ отклонена.</string>
+    <string name="diaconn_g8_errorcode_35">Запуск временного базала отклоняется при работе tempbasal</string>
+    <string name="diaconn_g8_errorcode_36">Остановка временного базала отклоняется при неработающем tempbasal</string>
+</resources>
diff --git a/diaconn/src/main/res/values-sk-rSK/strings.xml b/diaconn/src/main/res/values-sk-rSK/strings.xml
new file mode 100644
index 0000000000..b0da6f5f9a
--- /dev/null
+++ b/diaconn/src/main/res/values-sk-rSK/strings.xml
@@ -0,0 +1,138 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="resetpairing">Zrušiť párovanie</string>
+    <string name="diaconn_nodeviceavailable">Nie sú k dispozícii žiadne zariadenia</string>
+    <string name="diaconn_pairing">Párovanie pumpy Diaconn</string>
+    <string name="pumperror">Chyba pumpy</string>
+    <string name="diaconn_g8_history_alarm">Alarmy</string>
+    <string name="diaconn_g8_history_basalhours">Hodinové bazály</string>
+    <string name="diaconn_g8_history_bolus">Bolusy</string>
+    <string name="diaconn_g8_history_dailyinsulin">Denný inzulín</string>
+    <string name="diaconn_g8_history_errors">Chyby</string>
+    <string name="diaconn_g8_history_prime">Doplňovanie</string>
+    <string name="diaconn_g8_history_refill">Plnenie</string>
+    <string name="diaconn_g8_history_suspend">Pozastaviť</string>
+    <string name="diaconn_g8_pairingok">Spárované</string>
+    <string name="diaconn_g8_waitingforpairing">Čakanie na párovanie</string>
+    <string name="diaconn_firmware_version">Verzia</string>
+    <string name="invalidpairing">Neplatné informácie o párovaní. Požiadavka na nové párovanie</string>
+    <string name="gettingpumpsettings">Získavam nastavenia pumpy</string>
+    <string name="gettingpumptime">Získavam čas z pumpy</string>
+    <string name="largetimediff">Veľký rozdiel v čase:\nČas v pumpe sa líši minimálne o 1,5 h.\nProsím upravte čas v pumpe manuálne a vymažte históriu pumpy.\nPokiaľ je to potrebné, pozastavte uzavretý okruh aspoň na \"DIA\" hodín.</string>
+    <string name="largetimedifftitle">Veľký rozdiel v čase</string>
+    <string name="approachingdailylimit">Blíži sa denný limit inzulínu</string>
+    <string name="startingbolus">Spúšťam podávanie bolusu</string>
+    <string name="waitingforestimatedbolusend">Čakanie na predpokladaný koniec bolusu</string>
+    <string name="gettingbolusstatus">Získavam stav bolusov</string>
+    <string name="stoppingtempbasal">Zastavujem dočasný bazál</string>
+    <string name="settingtempbasal">Nastavujem dočasný bazál</string>
+    <string name="settingextendedbolus">Nastavujem predĺžený bolus</string>
+    <string name="stoppingextendedbolus">Zastavujem predĺžený bolus</string>
+    <string name="updatingbasalrates">Aktualizujem bazály</string>
+    <string name="description_pump_diaconn_g8">Integrácia pumpy pre pumpy Diaconn G8</string>
+    <string name="diaconn_g8_pump">Diaconn G8</string>
+    <string name="diaconn_g8_pump_shortname">Diaconn G8</string>
+    <string name="maxbolusviolation">Prekročený maximálny bolus</string>
+    <string name="commanderror">Chyba príkazu</string>
+    <string name="speederror">Chyba rýchlosti</string>
+    <string name="insulinlimitviolation">Prekročený limit inzulínu</string>
+    <string name="boluserrorcode">Požadované: %1$.2fJI Podané: %2$.2fJI Chyba: %3$s</string>
+    <string name="diaconn_g8_valuenotsetproperly">Hodnota nenastavená správne</string>
+    <string name="diaconn_g8_bt_name_title">Zariadenie Bluetooth Diaconn G8</string>
+    <string name="diaconn_g8_password_title">Heslo do pumpy</string>
+    <string name="bolusspeed">Rýchlosť bolusu</string>
+    <string name="selectedpump">Vybraná pumpa</string>
+    <string name="diaconn_g8_useextended_title">Použiť predĺžené bolusy pre &gt;200%%</string>
+    <string name="diaconn_g8_visualizeextendedaspercentage_title">Zobrazovať predĺžený bolus v %%</string>
+    <string name="diaconn_g8_bluetooth_status">Stav Bluetooth</string>
+    <string name="diagonn_g8_tdd_label">CDD</string>
+    <string name="bolus_step">Krok bolusu</string>
+    <string name="basal_step">Krok bazálu</string>
+    <string name="pump_firmware_label">Firmware</string>
+    <string name="diagonn_g8_useroptions">UŽIVATEĽSKÉ NASTAVENIA</string>
+    <string name="pairfirst">Prosím spárujte pumpu s telefónom!</string>
+    <string name="processinghistory">"Spracúvam udalosť "</string>
+    <string name="apslastLogNum">aps_last_log_num</string>
+    <string name="apsWrappingCount">aps_wrapping_count</string>
+    <string name="diaconn_g8_history_tempbasal">Dočasný Bazál</string>
+    <string name="diaconng8_pump_settings">Nastavenie pumpy Diaconn</string>
+    <string name="diaconn_g8_pumpalarm">Zvuk</string>
+    <string name="diaconn_g8_pumpalarm_sound">zvuk</string>
+    <string name="diaconn_g8_pumpalarm_vibrate">vibrovať</string>
+    <string name="diaconn_g8_pumpalarm_silent">ticho</string>
+    <string name="diaconn_g8_pumpalarmlevel">Hlasitosť alarmu</string>
+    <string name="diaconn_g8_pumpalarm_intensity_low">nízka</string>
+    <string name="diaconn_g8_pumpalarm_intensity_middle">stredná</string>
+    <string name="diaconn_g8_pumpalarm_intensity_high">vysoká</string>
+    <string name="diaconn_g8_screentimeout">Čas pred vypnutím displeja [sekundy]</string>
+    <string name="diaconn_g8_saveuseroptions">ULOŽIŤ NASTAVENIA DO PUMPY</string>
+    <string name="diaconn_g8_language">Jazyk</string>
+    <string name="diaconn_g8_bolus_speed">Rýchlosť bolusu</string>
+    <string name="diaconn_g8_pumplang_chiness">Čínština</string>
+    <string name="diaconn_g8_pumplang_korean">Kórejčina</string>
+    <string name="diaconn_g8_pumplang_english">Angličtina</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">nízka</string>
+    <string name="injectionblocked">Zablokované vydávanie</string>
+    <string name="batterywarning">Upozornenie na nízky stav batérie</string>
+    <string name="insulinlackwarning">Upozornenie na nedostatok inzulínu</string>
+    <string name="needbatteryreplace">Je požadovaná výmena batérie</string>
+    <string name="needinsullinreplace">Je požadovaná výmena inzulínu</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">Zaznamenať výmenu zásobníka</string>
+    <string name="diaconn_g8_loginsulinchange_summary">Pridať udalosť \"Výmena inzulínu\" do portálu starostlivosti, pokiaľ je zistená v histórii</string>
+    <string name="diaconn_g8_logcanulachange_title">Zaznamenať výmenu kanyly</string>
+    <string name="diaconn_g8_logcanulachange_summary">Pridať udalosť \"Výmena setu\" do portálu starostlivosti, pokiaľ je zistená v histórii</string>
+    <string name="diaconn_g8_logbatterychange_summary">Pridať udalosť \"Výmena batérie\" do portálu starostlivosti, pokiaľ je zistená v histórii</string>
+    <string name="diaconn_g8_logbatterychange_title">Zaznamenať výmenu batérie</string>
+    <string name="diaconn_g8_logsyncinprogress">Prebieha synchronizácia logov</string>
+    <string name="diaconn_g8_loginsulinshorage">Nedostatok inzulínu</string>
+    <string name="diaconn_g8_logbatteryshorage">Slabá batéria</string>
+    <string name="diaconn_g8_logneedleprime">Plnenie ihly :%1$.2fJI</string>
+    <string name="diaconn_g8_logtubeprime">Plnenie hadičky :%1$.2fJI</string>
+    <string name="diaconn_g8_resetfactoryreset">Resetovať po obnovení na továrenské nastavenia</string>
+    <string name="diaconn_g8_resetemergencyoff">Resetovať po núdzovom vypnutí</string>
+    <string name="diaconn_g8_resetbatteryreplacement">Resetovať po výmene batérie</string>
+    <string name="diaconn_g8_resetaftercalibration">Resetovať po kalibrácii</string>
+    <string name="diaconn_g8_resetpreshipment">Resetovať na továrenské nastavenia</string>
+    <string name="diaconn_g8_resetunexpected">Neočakávaný reset systému</string>
+    <string name="diaconn_g8_reasoncomplete">Dokončené</string>
+    <string name="diaconn_g8_reasoninjectonblock">Zablokované vydávanie</string>
+    <string name="diaconn_g8_reasonbatteryshortage">Slabá batéria</string>
+    <string name="diaconn_g8_reasoninsulinshortage">Nedostatok inzulínu</string>
+    <string name="diaconn_g8_reasonuserstop">Užívateľské vypnutie</string>
+    <string name="diaconn_g8_reasonsystemreset">Reset systému</string>
+    <string name="diaconn_g8_reasonother">Iné</string>
+    <string name="diaconn_g8_reasonemergencystop">Núdzové zastavenie</string>
+    <string name="diacon_g8_blockbasal">BAZÁL</string>
+    <string name="diacon_g8_blockmealbolus">BOLUS NA JEDLO</string>
+    <string name="diacon_g8_blocknormalbolus">NORMÁLNY BOLUS</string>
+    <string name="diacon_g8_blocksquarebolus">ONESKORENÝ BOLUS</string>
+    <string name="diacon_g8_blockdualbolus">KOMBINOVANÝ BOLUS</string>
+    <string name="diacon_g8_blockreplacetube">VYMEŇTE HADIČKU</string>
+    <string name="diacon_g8_blockreplaceneedle">VYMEŇTE KANYLU</string>
+    <string name="diacon_g8_blockreplacesyringe">VYMEŇTE ZÁSOBNÍK</string>
+    <string name="diaconn_g8_logalarmblock">Zablokované vydávanie (%s)</string>
+    <string name="diaconn_g8_lgorelease">výdaj bazálu (%s)</string>
+    <string name="diaconn_g8_lgosuspend">bazál pozastavený (%s)</string>
+    <string name="diaconn_g8_logdualnormalsuccess">Kombinovaný bolus vydaný</string>
+    <string name="diaconn_g8_logmealfail">Jedlo zlyhalo</string>
+    <string name="diaconn_g8_logsuccess">Hotovo</string>
+    <string name="diaconn_g8_logmealsuccess">Jedlo úspešné</string>
+    <string name="key_diaconn_g8_logtubechange">diaconn_g8_logtubechange</string>
+    <string name="diaconn_g8_errorcode_1">Nie je možné vyhľadať kvôli chybe CRC.</string>
+    <string name="diaconn_g8_errorcode_2">Nemôže byť nastavené na základe chybných vstupných parametrov.</string>
+    <string name="diaconn_g8_errorcode_3">Nemôže byť nastavené na základe chyby špecifikácie protokolu.</string>
+    <string name="diaconn_g8_errorcode_4">Čas na jedlo nastavený. Nie je možný výdaj inzulínu.</string>
+    <string name="diaconn_g8_errorcode_6">Zrušené pumpou</string>
+    <string name="diaconn_g8_errorcode_7">Prijímanie ďalších akcií, obmedzenie nastavenia aplikácie.</string>
+    <string name="diaconn_g8_errorcode_8">V priebehu podávania bolusu je ďalší bolus obmedzený.</string>
+    <string name="diaconn_g8_errorcode_9">Vyžaduje sa obnovenie bazálu</string>
+    <string name="diaconn_g8_errorcode_10">Zrušené, pretože pumpa neodpovedá.</string>
+    <string name="diaconn_g8_errorcode_11">Podávanie nie je možné z dôvodu slabej batérie.</string>
+</resources>
diff --git a/diaconn/src/main/res/values-sl-rSI/strings.xml b/diaconn/src/main/res/values-sl-rSI/strings.xml
new file mode 100644
index 0000000000..3ea04e700d
--- /dev/null
+++ b/diaconn/src/main/res/values-sl-rSI/strings.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>
diff --git a/diaconn/src/main/res/values-sv-rSE/strings.xml b/diaconn/src/main/res/values-sv-rSE/strings.xml
new file mode 100644
index 0000000000..3ea04e700d
--- /dev/null
+++ b/diaconn/src/main/res/values-sv-rSE/strings.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>
diff --git a/diaconn/src/main/res/values-ta-rIN/strings.xml b/diaconn/src/main/res/values-ta-rIN/strings.xml
new file mode 100644
index 0000000000..3ea04e700d
--- /dev/null
+++ b/diaconn/src/main/res/values-ta-rIN/strings.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>
diff --git a/diaconn/src/main/res/values-tr-rTR/strings.xml b/diaconn/src/main/res/values-tr-rTR/strings.xml
new file mode 100644
index 0000000000..3ea04e700d
--- /dev/null
+++ b/diaconn/src/main/res/values-tr-rTR/strings.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>
diff --git a/diaconn/src/main/res/values-zh-rCN/strings.xml b/diaconn/src/main/res/values-zh-rCN/strings.xml
new file mode 100644
index 0000000000..3ea04e700d
--- /dev/null
+++ b/diaconn/src/main/res/values-zh-rCN/strings.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>
diff --git a/diaconn/src/main/res/values/arrays.xml b/diaconn/src/main/res/values/arrays.xml
new file mode 100644
index 0000000000..ab98405145
--- /dev/null
+++ b/diaconn/src/main/res/values/arrays.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string-array name="diaconnSpeedArray">
+        <item>1 U/min</item>
+        <item>2 U/min</item>
+        <item>3 U/min</item>
+        <item>4 U/min</item>
+        <item>5 U/min</item>
+        <item>6 U/min</item>
+        <item>7 U/min</item>
+        <item>8 U/min</item>
+    </string-array>
+    <string-array name="diaconnSpeedValues">
+        <item>1</item>
+        <item>2</item>
+        <item>3</item>
+        <item>4</item>
+        <item>5</item>
+        <item>6</item>
+        <item>7</item>
+        <item>8</item>
+    </string-array>
+
+    <string-array name="diaconnlanguageArray">
+        <item>Chiness</item>
+        <item>Korean</item>
+        <item>English</item>
+    </string-array>
+    <string-array name="diaconnlanguageValues">
+        <item>1</item>
+        <item>2</item>
+        <item>3</item>
+    </string-array>
+
+    <string-array name="diaconnVolumnLevelArray">
+        <item>Small</item>
+        <item>Medium</item>
+        <item>Large</item>
+    </string-array>
+    <string-array name="diaconnVolumnLevelValues">
+        <item>1</item>
+        <item>2</item>
+        <item>3</item>
+    </string-array>
+
+
+</resources>
\ No newline at end of file
diff --git a/diaconn/src/main/res/values/colors.xml b/diaconn/src/main/res/values/colors.xml
new file mode 100644
index 0000000000..f8c6127d32
--- /dev/null
+++ b/diaconn/src/main/res/values/colors.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="purple_200">#FFBB86FC</color>
+    <color name="purple_500">#FF6200EE</color>
+    <color name="purple_700">#FF3700B3</color>
+    <color name="teal_200">#FF03DAC5</color>
+    <color name="teal_700">#FF018786</color>
+    <color name="black">#FF000000</color>
+    <color name="white">#FFFFFFFF</color>
+</resources>
\ No newline at end of file
diff --git a/diaconn/src/main/res/values/ids.xml b/diaconn/src/main/res/values/ids.xml
new file mode 100644
index 0000000000..ab4bb053a1
--- /dev/null
+++ b/diaconn/src/main/res/values/ids.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <item name="diaconn_g8_history_time" type="id" />
+    <item name="diaconn_g8_history_value" type="id" />
+    <item name="diaconn_g8_history_bolustype" type="id" />
+    <item name="diaconn_g8_history_stringvalue" type="id" />
+    <item name="diaconn_g8_history_duration" type="id" />
+    <item name="diaconn_g8_history_dailybasal" type="id" />
+    <item name="diaconn_g8_history_dailybolus" type="id" />
+    <item name="diaconn_g8_history_dailytotal" type="id" />
+    <item name="diaconn_g8_history_alarm" type="id" />
+</resources>
\ No newline at end of file
diff --git a/diaconn/src/main/res/values/strings.xml b/diaconn/src/main/res/values/strings.xml
new file mode 100644
index 0000000000..3a51a9ff15
--- /dev/null
+++ b/diaconn/src/main/res/values/strings.xml
@@ -0,0 +1,171 @@
+<resources>
+    <string name="diaconn_g8_pump_settings" translatable="false" >diaconn_g8_pump_settings</string>
+    <string name="key_diaconn_g8_address" translatable="false">diagonn_g8_address</string>
+    <string name="key_diaconn_g8_name" translatable="false">Diaconn G8</string>
+    <string name="key_diaconn_g8_bt_name" translatable="false" >key_diaconn_g8_bt_name</string>
+    <string name="key_diaconn_g8_useextended" translatable="false">diaconn_g8_useextended</string>
+    <string name="key_diaconn_g8_visualizeextendedaspercentage"  translatable="false">diaconn_g8_visualizeextendedaspercentage</string>
+
+    <string name="key_diaconn_g8_bolusspeed"  translatable="false">g8_bolusspeed</string>
+    <string name="key_diaconn_g8_logbatterychange" translatable="false">diaconn_g8_logbatterychanges</string>
+    <string name="key_diaconn_g8_loginsulinchange" translatable="false">diaconn_g8_loginsulinchange</string>
+    <string name="key_diaconn_g8_logneedlechange" translatable="false">diaconn_g8_logneedlechange</string>
+
+    <string name="resetpairing" >Reset Pairing</string>
+    <string name="diaconn_nodeviceavailable" >No Device available</string>
+    <string name="diaconn_pairing" >Diaconn Pump Pairing</string>
+    <string name="pumperror" >Pump Error</string>
+    <string name="diaconn_g8_history_alarm" >Alarms</string>
+    <string name="diaconn_g8_history_basalhours" >Basal Hours</string>
+    <string name="diaconn_g8_history_bolus" >Boluses</string>
+    <string name="diaconn_g8_history_dailyinsulin" >Daily insulin</string>
+    <string name="diaconn_g8_history_errors">Errors</string>
+    <string name="diaconn_g8_history_prime">Prime</string>
+    <string name="diaconn_g8_history_refill">Refill</string>
+    <string name="diaconn_g8_history_suspend">Suspend</string>
+    <string name="diaconn_g8_pairingok" >Pairing Ok</string>
+    <string name="diaconn_g8_waitingforpairing" >Waiting for Pairing</string>
+    <string name="diaconn_firmware_version" >Version</string>
+    <string name="invalidpairing" >Invalid pairing information. Requesting new pairing</string>
+    <string name="gettingpumpsettings" >Getting pump settings</string>
+    <string name="gettingpumptime" >Getting pump time</string>
+    <string name="largetimediff" >Large time difference:\nTime in pump is off by more than 1.5 hours.\nPlease adjust the time manually on the pump and make sure that reading the history from the pump does not cause unexpected behaviour.\nIf possible, remove the history from the pump before changing the time or disable the closed loop for one DIA after the last wrong history entry but minimum one DIA from now.</string>
+    <string name="largetimedifftitle" >Large time difference Title</string>
+    <string name="approachingdailylimit" >Approaching insulin daily limit</string>
+    <string name="startingbolus" >Starting bolus delivery</string>
+    <string name="waitingforestimatedbolusend" >Waiting for estimated bolus end</string>
+    <string name="gettingbolusstatus" >Getting Bolus Status</string>
+    <string name="stoppingtempbasal">Stopping temp basal</string>
+    <string name="settingtempbasal" >Setting temp basal</string>
+    <string name="settingextendedbolus" >Setting extended bolus</string>
+    <string name="stoppingextendedbolus" >Stopping extended bolus</string>
+    <string name="updatingbasalrates" >Updating basal rates</string>
+    <string name="description_pump_diaconn_g8">Pump Integration for Diaconn G8 Pumps</string>
+    <string name="diaconn_g8_pump">Diaconn G8</string>
+    <string name="diaconn_g8_pump_shortname">Diaconn G8</string>
+    <string name="maxbolusviolation" >Max bolus violation</string>
+    <string name="commanderror" >Command error</string>
+    <string name="speederror" >Speed error</string>
+    <string name="insulinlimitviolation" >Insulin limit violation</string>
+    <string name="boluserrorcode" >Asked: %1$.2fU Delivered: %2$.2fU Error code: %3$s</string>
+    <string name="diaconn_g8_valuenotsetproperly" >Value not set properly</string>
+    <string name="diaconn_g8_bt_name_title" >Diaconn G8 Bluetooth device</string>
+
+    <string name="diaconn_g8_password_title" >Pump Password</string>
+
+    <string name="bolusspeed">Bolus speed</string>
+    <string name="selectedpump">Selected pump</string>
+    <string name="diaconn_g8_useextended_title">Use extended boluses for >200%%</string>
+    <string name="diaconn_g8_visualizeextendedaspercentage_title">Visualize extended bolus as %%</string>
+    <string name="diaconn_g8_bluetooth_status">Bluetooth Status</string>
+    <string name="diagonn_g8_tdd_label">TDD</string>
+    <string name="bolus_step">Bolus Step</string>
+    <string name="basal_step">Basal Step</string>
+    <string name="pump_firmware_label">Firmware</string>
+    <string name="diagonn_g8_useroptions">USER OPTIONS</string>
+    <string name="pairfirst">Please pair your pump with your phone!</string>
+    <string name="processinghistory">"Processing Event "</string>
+    <string name="apslastLogNum">aps_last_log_num</string>
+    <string name="apsWrappingCount">aps_wrapping_count</string>
+    <string name="diaconn_g8_history_tempbasal">Temp Basal</string>
+    <string name="diaconng8_pump_settings">Diaconn pump Settings</string>
+    <string name="diaconn_g8_pumpalarm">Sound</string>
+    <string name="diaconn_g8_pumpalarm_sound">sound</string>
+    <string name="diaconn_g8_pumpalarm_vibrate">vibrate</string>
+    <string name="diaconn_g8_pumpalarm_silent">silent</string>
+    <string name="diaconn_g8_pumpalarmlevel">Alarm intensity</string>
+    <string name="diaconn_g8_pumpalarm_intensity_low">low</string>
+    <string name="diaconn_g8_pumpalarm_intensity_middle">middle</string>
+    <string name="diaconn_g8_pumpalarm_intensity_high">high</string>
+    <string name="diaconn_g8_screentimeout">LCD on time [second]</string>
+    <string name="diaconn_g8_saveuseroptions">SAVE OPTION TO PUMP</string>
+    <string name="diaconn_g8_language">Language</string>
+    <string name="diaconn_g8_bolus_speed">Bolus speed</string>
+    <string name="diaconn_g8_pumplang_chiness">Chiness</string>
+    <string name="diaconn_g8_pumplang_korean">Korean</string>
+    <string name="diaconn_g8_pumplang_english">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">low</string>
+    <string name="injectionblocked">Injection Blocked</string>
+    <string name="batterywarning">Battery Warning</string>
+    <string name="insulinlackwarning">Insulin Lack Warning</string>
+    <string name="needbatteryreplace">Battery replacement is required</string>
+    <string name="needinsullinreplace">Insulin replacement is required</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">Log reservoir change</string>
+    <string name="diaconn_g8_loginsulinchange_summary">Add \"Insulin Change\" event to careportal when detected in history</string>
+    <string name="diaconn_g8_logcanulachange_title">Log needle change</string>
+    <string name="diaconn_g8_logcanulachange_summary">Add \"Site Change\" event to careportal when detected in history</string>
+    <string name="diaconn_g8_logbatterychange_summary">Add \"Battery Change\" event to careportal when detected in history</string>
+    <string name="diaconn_g8_logbatterychange_title">Log battery change</string>
+    <string name="diaconn_g8_logsyncinprogress">Log Synchronization in progress</string>
+    <string name="diaconn_g8_loginsulinshorage">Inuslin shortage</string>
+    <string name="diaconn_g8_logbatteryshorage">Battery shortage</string>
+    <string name="diaconn_g8_logneedleprime">Needle prime :%1$.2fU</string>
+    <string name="diaconn_g8_loginjectorprime">Injector prime :%1$.2fU</string>
+    <string name="diaconn_g8_logtubeprime">Tube change prime :%1$.2fU</string>
+    <string name="diaconn_g8_resetfactoryreset">Reset after factory reset</string>
+    <string name="diaconn_g8_resetemergencyoff">Reset after Emergency Off</string>
+    <string name="diaconn_g8_resetbatteryreplacement">Reset after user battery replacement</string>
+    <string name="diaconn_g8_resetaftercalibration">Reset after Calibration</string>
+    <string name="diaconn_g8_resetpreshipment">Reset after pre-shipment setup</string>
+    <string name="diaconn_g8_resetunexpected">Unexpected system reset</string>
+    <string name="diaconn_g8_reasoncomplete">Complete</string>
+    <string name="diaconn_g8_reasoninjectonblock">Injection block</string>
+    <string name="diaconn_g8_reasonbatteryshortage">Battery shortage</string>
+    <string name="diaconn_g8_reasoninsulinshortage">Insuiln shortage</string>
+    <string name="diaconn_g8_reasonuserstop">User stop</string>
+    <string name="diaconn_g8_reasonsystemreset">System reset</string>
+    <string name="diaconn_g8_reasonother">Other</string>
+    <string name="diaconn_g8_reasonemergencystop">Emergency stop</string>
+    <string name="diacon_g8_blockbasal">BASAL</string>
+    <string name="diacon_g8_blockmealbolus">MEAL BOLUS</string>
+    <string name="diacon_g8_blocknormalbolus">NORMAL BOLUS</string>
+    <string name="diacon_g8_blocksquarebolus">SQUARE BOLUS</string>
+    <string name="diacon_g8_blockdualbolus">DUAL BOLUS</string>
+    <string name="diacon_g8_blockreplacetube">REPLACE TUBE</string>
+    <string name="diacon_g8_blockreplaceneedle">REPLACE NEEDLE</string>
+    <string name="diacon_g8_blockreplacesyringe">REPLACE SYRINGE</string>
+    <string name="diaconn_g8_logalarmblock" >Injection Block (%s)</string>
+    <string name="diaconn_g8_lgorelease" >basal release (%s)</string>
+    <string name="diaconn_g8_lgosuspend" >basal suspend (%s)</string>
+    <string name="diaconn_g8_logdualnormalsuccess">Dual Nomarl Success</string>
+    <string name="diaconn_g8_logdualsquarestart">Dual Square Start</string>
+    <string name="diaconn_g8_logdualsquaresuccess">Dual Square Success</string>
+    <string name="diaconn_g8_logsquarestart">Square Start</string>
+    <string name="diaconn_g8_logsquaresuccess">Square Success</string>
+    <string name="diaconn_g8_logmealfail">Meal Failed</string>
+    <string name="diaconn_g8_logsuccess">Success</string>
+    <string name="diaconn_g8_logmealsuccess">Meal Success</string>
+    <string name="key_diaconn_g8_logtubechange">diaconn_g8_logtubechange</string>
+    <string name="diaconn_g8_errorcode_1">Can\'t lookup due to packet CRC error.</string>
+    <string name="diaconn_g8_errorcode_2">Can\'t be set to an input parameter error.</string>
+    <string name="diaconn_g8_errorcode_3">Can\'t be set to a protocol specification error.</string>
+    <string name="diaconn_g8_errorcode_4">Eating timed, cannot be injected.</string>
+    <string name="diaconn_g8_errorcode_6">Cancelled by pump</string>
+    <string name="diaconn_g8_errorcode_7">Taking other actions, limiting app settings.</string>
+    <string name="diaconn_g8_errorcode_8">During another Bolus injection, injection is restricted.</string>
+    <string name="diaconn_g8_errorcode_9">Require resume the basal injection</string>
+    <string name="diaconn_g8_errorcode_10">Cancelled due to pump not responding.</string>
+    <string name="diaconn_g8_errorcode_11">Injection is not possible due to low battery.</string>
+    <string name="diaconn_g8_errorcode_12">Insulin insufficiency cannot be injected.</string>
+    <string name="diaconn_g8_errorcode_13">You cannot inject it because it exceeds the limit once.</string>
+    <string name="diaconn_g8_errorcode_14">Injection cannot be injected because it exceeds the injection volume today.</string>
+    <string name="diaconn_g8_errorcode_15">After basal setup is complete, basal injection can be performed.</string>
+    <string name="diaconn_g8_errotpreceivedyet">The command was not delivered. Please try again.</string>
+    <string name="diaconn_g8_logtubechange_title">Log tube change</string>
+    <string name="diaconn_g8_logtubechange_summary">Add \"Tube Change\" event to Note when detected in history</string>
+    <string name="diaconn_g8_logtempstart">TempBasal Start</string>
+    <string name="diaconn_g8_errorcode_32">During LGS running, injection is restricted</string>
+    <string name="diaconn_g8_errorcode_33">LGS status is ON, ON Command is declined.</string>
+    <string name="diaconn_g8_errorcode_34">LGS status is OFF, OFF Command is declined.</string>
+    <string name="diaconn_g8_errorcode_35">Tempbasal start is rejected  when tempbasal is running</string>
+    <string name="diaconn_g8_errorcode_36">Tempbasal stop is rejected  when tempbasal is not running</string>
+
+
+</resources>
\ No newline at end of file
diff --git a/diaconn/src/main/res/values/themes.xml b/diaconn/src/main/res/values/themes.xml
new file mode 100644
index 0000000000..e52448bafa
--- /dev/null
+++ b/diaconn/src/main/res/values/themes.xml
@@ -0,0 +1,16 @@
+<resources xmlns:tools="http://schemas.android.com/tools">
+    <!-- Base application theme. -->
+    <style name="Theme.AndroidAPS" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
+        <!-- Primary brand color. -->
+        <item name="colorPrimary">@color/purple_500</item>
+        <item name="colorPrimaryVariant">@color/purple_700</item>
+        <item name="colorOnPrimary">@color/white</item>
+        <!-- Secondary brand color. -->
+        <item name="colorSecondary">@color/teal_200</item>
+        <item name="colorSecondaryVariant">@color/teal_700</item>
+        <item name="colorOnSecondary">@color/black</item>
+        <!-- Status bar color. -->
+        <item name="android:statusBarColor" tools:targetApi="l">?attr/colorPrimaryVariant</item>
+        <!-- Customize your theme here. -->
+    </style>
+</resources>
\ No newline at end of file
diff --git a/diaconn/src/main/res/xml/pref_diaconn.xml b/diaconn/src/main/res/xml/pref_diaconn.xml
new file mode 100644
index 0000000000..f81699e887
--- /dev/null
+++ b/diaconn/src/main/res/xml/pref_diaconn.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:validate="http://schemas.android.com/apk/res-auto"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <PreferenceCategory
+        android:title="@string/diaconn_g8_pump"
+        app:initialExpandedChildrenCount="0">
+
+        <Preference
+            android:key="@string/key_diaconn_g8_name"
+            android:summary=""
+            android:title="@string/selectedpump">
+            <intent android:action="info.nightscout.androidaps.plugins.PumpDiaconnG8.activities.DiaconnG8BLEScanActivity" />
+        </Preference>
+
+        <ListPreference
+            android:defaultValue="5"
+            android:entries="@array/diaconnSpeedArray"
+            android:entryValues="@array/diaconnSpeedValues"
+            android:key="@string/key_diaconn_g8_bolusspeed"
+            android:title="@string/bolusspeed" />
+
+        <SwitchPreference
+            android:defaultValue="true"
+            android:key="@string/key_diaconn_g8_loginsulinchange"
+            android:summary="@string/diaconn_g8_loginsulinchange_summary"
+            android:title="@string/diaconn_g8_loginsulinchange_title" />
+
+        <SwitchPreference
+            android:defaultValue="true"
+            android:key="@string/key_diaconn_g8_logneedlechange"
+            android:summary="@string/diaconn_g8_logcanulachange_summary"
+            android:title="@string/diaconn_g8_logcanulachange_title" />
+
+        <SwitchPreference
+            android:defaultValue="true"
+            android:key="@string/key_diaconn_g8_logtubechange"
+            android:summary="@string/diaconn_g8_logtubechange_summary"
+            android:title="@string/diaconn_g8_logtubechange_title" />
+
+        <SwitchPreference
+            android:defaultValue="true"
+            android:key="@string/key_diaconn_g8_logbatterychange"
+            android:summary="@string/diaconn_g8_logbatterychange_summary"
+            android:title="@string/diaconn_g8_logbatterychange_title" />
+
+    </PreferenceCategory>
+
+</androidx.preference.PreferenceScreen>
\ No newline at end of file
diff --git a/gradle.properties b/gradle.properties
index 43ad963b2f..489d41472f 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -16,8 +16,8 @@
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 org.gradle.parallel=true
-
+org.gradle.warning.mode=all
 org.gradle.jvmargs=-Xmx2g
 
 android.enableJetifier=true
-android.useAndroidX=true
\ No newline at end of file
+android.useAndroidX=true
diff --git a/gradle/android_dependencies.gradle b/gradle/android_dependencies.gradle
index c07f69eea0..264cf88b77 100644
--- a/gradle/android_dependencies.gradle
+++ b/gradle/android_dependencies.gradle
@@ -1,11 +1,10 @@
 android {
-    compileSdkVersion 28
+    compileSdkVersion 30
     defaultConfig {
         minSdkVersion 26
         targetSdkVersion 28
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-        consumerProguardFiles 'consumer-rules.pro'
     }
 
     kotlinOptions {
diff --git a/gradle/android_module_dependencies.gradle b/gradle/android_module_dependencies.gradle
index 7125e612f7..d163350b9b 100644
--- a/gradle/android_module_dependencies.gradle
+++ b/gradle/android_module_dependencies.gradle
@@ -22,4 +22,9 @@ dependencies {
     annotationProcessor "com.google.dagger:dagger-android-processor:$dagger_version"
     kapt "com.google.dagger:dagger-android-processor:$dagger_version"
     kapt "com.google.dagger:dagger-compiler:$dagger_version"
-}
\ No newline at end of file
+}
+
+allOpen {
+    // allows mocking for classes w/o directly opening them for release builds
+    annotation 'info.nightscout.androidaps.annotations.OpenForTesting'
+}
diff --git a/gradle/jacoco_global.gradle b/gradle/jacoco_global.gradle
new file mode 100644
index 0000000000..991d9597b6
--- /dev/null
+++ b/gradle/jacoco_global.gradle
@@ -0,0 +1,8 @@
+jacoco {
+    toolVersion = "0.8.7"
+}
+
+tasks.withType(Test) {
+    jacoco.includeNoLocationClasses = true
+    jacoco.excludes = ['jdk.internal.*']
+}
\ No newline at end of file
diff --git a/gradle/test_dependencies.gradle b/gradle/test_dependencies.gradle
index 3a484c419c..ec62814a21 100644
--- a/gradle/test_dependencies.gradle
+++ b/gradle/test_dependencies.gradle
@@ -1,19 +1,16 @@
 dependencies {
     testImplementation "junit:junit:$junit_version"
-    testImplementation 'org.json:json:20201115'
-    testImplementation "org.mockito:mockito-core:${mockitoVersion}"
-    testImplementation "org.powermock:powermock-api-mockito2:${powermockVersion}"
-    testImplementation "org.powermock:powermock-module-junit4-rule-agent:${powermockVersion}"
-    testImplementation "org.powermock:powermock-module-junit4-rule:${powermockVersion}"
-    testImplementation "org.powermock:powermock-module-junit4:${powermockVersion}"
+    testImplementation 'org.json:json:20210307'
+    testImplementation "org.mockito:mockito-core:$mockitoVersion"
+    testImplementation "org.mockito:mockito-inline:$mockitoVersion"
     testImplementation "joda-time:joda-time:$jodatime_version"
-    testImplementation('com.google.truth:truth:1.1.2') {
+    testImplementation('com.google.truth:truth:1.1.3') {
         exclude group: "com.google.guava", module: "guava"
     }
     testImplementation "org.skyscreamer:jsonassert:1.5.0"
     testImplementation "org.hamcrest:hamcrest-all:1.3"
 
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0-alpha04'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
     androidTestImplementation "androidx.test.ext:junit:$androidx_junit"
     androidTestImplementation "androidx.test:rules:$androidx_rules"
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 404e613d00..3014b24804 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl = https://services.gradle.org/distributions/gradle-6.8.2-all.zip
+distributionUrl = https\://services.gradle.org/distributions/gradle-7.1-all.zip
diff --git a/insight/build.gradle b/insight/build.gradle
index 33b66a5090..2f86ece0a2 100644
--- a/insight/build.gradle
+++ b/insight/build.gradle
@@ -1,17 +1,16 @@
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-kapt'
+apply plugin: 'kotlin-allopen'
 apply plugin: 'com.hiya.jacoco-android'
 
 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"
 
 android {
     defaultConfig {
-        versionCode 1
-        versionName "1.0"
         kapt {
             arguments {
                 arg("room.incremental", "true")
diff --git a/insight/src/main/AndroidManifest.xml b/insight/src/main/AndroidManifest.xml
index feecfc8067..f00fc7fba9 100644
--- a/insight/src/main/AndroidManifest.xml
+++ b/insight/src/main/AndroidManifest.xml
@@ -2,6 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="info.nightscout.androidaps.insight">
 
+    <uses-permission android:name="android.permission.VIBRATE" />
     <application>
         <activity
             android:name="info.nightscout.androidaps.plugins.pump.insight.activities.InsightPairingActivity"
diff --git a/insight/src/main/java/info/nightscout/androidaps/insight/di/InsightCommModule.kt b/insight/src/main/java/info/nightscout/androidaps/insight/di/InsightCommModule.kt
index 7073ad14ae..4359b8d9fa 100644
--- a/insight/src/main/java/info/nightscout/androidaps/insight/di/InsightCommModule.kt
+++ b/insight/src/main/java/info/nightscout/androidaps/insight/di/InsightCommModule.kt
@@ -4,5 +4,4 @@ import dagger.Module
 
 @Module
 @Suppress("unused")
-abstract class InsightCommModule {
-}
\ No newline at end of file
+abstract class InsightCommModule
\ No newline at end of file
diff --git a/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/InsightAlertService.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/InsightAlertService.java
index a134c904be..8278203eae 100644
--- a/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/InsightAlertService.java
+++ b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/InsightAlertService.java
@@ -302,17 +302,17 @@ public class InsightAlertService extends DaggerService implements InsightConnect
             notificationBuilder.setContentText(HtmlHelper.INSTANCE.fromHtml(description).toString());
 
         Intent fullScreenIntent = new Intent(this, InsightAlertActivity.class);
-        PendingIntent fullScreenPendingIntent = PendingIntent.getActivity(this, 0, fullScreenIntent, PendingIntent.FLAG_UPDATE_CURRENT);
+        PendingIntent fullScreenPendingIntent = PendingIntent.getActivity(this, 0, fullScreenIntent, PendingIntent.FLAG_IMMUTABLE | PendingIntent.FLAG_UPDATE_CURRENT);
         notificationBuilder.setFullScreenIntent(fullScreenPendingIntent, true);
 
         switch (alert.getAlertStatus()) {
             case ACTIVE:
                 Intent muteIntent = new Intent(this, InsightAlertService.class).putExtra("command", "mute");
-                PendingIntent mutePendingIntent = PendingIntent.getService(this, 1, muteIntent, PendingIntent.FLAG_UPDATE_CURRENT);
+                PendingIntent mutePendingIntent = PendingIntent.getService(this, 1, muteIntent, PendingIntent.FLAG_IMMUTABLE | PendingIntent.FLAG_UPDATE_CURRENT);
                 notificationBuilder.addAction(0, resourceHelper.gs(R.string.mute_alert), mutePendingIntent);
             case SNOOZED:
                 Intent confirmIntent = new Intent(this, InsightAlertService.class).putExtra("command", "confirm");
-                PendingIntent confirmPendingIntent = PendingIntent.getService(this, 2, confirmIntent, PendingIntent.FLAG_UPDATE_CURRENT);
+                PendingIntent confirmPendingIntent = PendingIntent.getService(this, 2, confirmIntent, PendingIntent.FLAG_IMMUTABLE | PendingIntent.FLAG_UPDATE_CURRENT);
                 notificationBuilder.addAction(0, resourceHelper.gs(R.string.confirm), confirmPendingIntent);
         }
 
diff --git a/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightFragment.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightFragment.java
index bf89837dda..4a16e1aee0 100644
--- a/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightFragment.java
+++ b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightFragment.java
@@ -178,6 +178,7 @@ public class LocalInsightFragment extends DaggerFragment implements View.OnClick
         getTDDItems(statusItems);
         getBaseBasalRateItem(statusItems);
         getTBRItem(statusItems);
+        getLastBolusItem(statusItems);
         getBolusItems(statusItems);
         for (int i = 0; i < statusItems.size(); i++) {
             statusItemContainer.addView(statusItems.get(i));
@@ -239,7 +240,16 @@ public class LocalInsightFragment extends DaggerFragment implements View.OnClick
             default:
                 long lastConnection = localInsightPlugin.getConnectionService().getLastConnected();
                 if (lastConnection == 0) return;
-                statusItems.add(getStatusItem(resourceHelper.gs(R.string.last_connected), dateUtil.timeString(lastConnection)));
+                long agoMsc = System.currentTimeMillis() - lastConnection;
+                double lastConnectionMinAgo = agoMsc / 60d / 1000d;
+                String ago;
+                if (lastConnectionMinAgo < 60) {
+                    ago = dateUtil.minAgo(resourceHelper, lastConnection);
+                } else {
+                    ago = dateUtil.hourAgo(lastConnection, resourceHelper);
+                }
+                statusItems.add(getStatusItem(resourceHelper.gs(R.string.last_connected),
+                        dateUtil.timeString(lastConnection) + " (" + ago + ")"));
         }
     }
 
@@ -306,6 +316,21 @@ public class LocalInsightFragment extends DaggerFragment implements View.OnClick
                 resourceHelper.gs(R.string.tbr_formatter, activeTBR.getPercentage(), activeTBR.getInitialDuration() - activeTBR.getRemainingDuration(), activeTBR.getInitialDuration())));
     }
 
+    private void getLastBolusItem(List<View> statusItems) {
+        if (localInsightPlugin.lastBolusAmount == 0 || localInsightPlugin.lastBolusTimestamp == 0) return;
+        long agoMsc = System.currentTimeMillis() - localInsightPlugin.lastBolusTimestamp;
+        double bolusMinAgo = agoMsc / 60d / 1000d;
+        String unit = resourceHelper.gs(R.string.insulin_unit_shortname);
+        String ago;
+        if (bolusMinAgo < 60) {
+            ago = dateUtil.minAgo(resourceHelper, localInsightPlugin.lastBolusTimestamp);
+        } else {
+            ago = dateUtil.hourAgo(localInsightPlugin.lastBolusTimestamp, resourceHelper);
+        }
+        statusItems.add(getStatusItem(resourceHelper.gs(R.string.insight_last_bolus),
+                resourceHelper.gs(R.string.insight_last_bolus_formater, localInsightPlugin.lastBolusAmount, unit, ago)));
+    }
+
     private void getBolusItems(List<View> statusItems) {
         if (localInsightPlugin.getActiveBoluses() == null) return;
         for (ActiveBolus activeBolus : localInsightPlugin.getActiveBoluses()) {
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 141f60a52a..c93a7e895f 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
@@ -190,6 +190,8 @@ public class LocalInsightPlugin extends PumpPluginBase implements Pump, Constrai
     private List<ActiveBolus> activeBoluses;
     private boolean statusLoaded;
     private TBROverNotificationBlock tbrOverNotificationBlock;
+    public double lastBolusAmount = 0;
+    public long lastBolusTimestamp = 0L;
 
     @Inject
     public LocalInsightPlugin(
@@ -590,7 +592,7 @@ public class LocalInsightPlugin extends PumpPluginBase implements Pump, Constrai
                 bolusingEvent.setPercent(0);
                 rxBus.send(bolusingEvent);
                 int trials = 0;
-                Long now = dateUtil.now();
+                long now = dateUtil.now();
                 String serial = serialNumber();
                 insightDbHelper.createOrUpdate( new InsightBolusID(
                         now,
@@ -1183,8 +1185,8 @@ public class LocalInsightPlugin extends PumpPluginBase implements Pump, Constrai
         for (InsightPumpID pumpID : pumpStartedEvents) {
             InsightPumpID stoppedEvent = insightDbHelper.getPumpStoppedEvent(pumpID.getPumpSerial(), pumpID.getTimestamp());
             if (stoppedEvent != null && stoppedEvent.getEventType().equals(EventType.PumpStopped)) {             // Search if Stop event is after 15min of Pause
-                InsightPumpID pauseEvent = insightDbHelper.getPumpStoppedEvent(pumpID.getPumpSerial(), stoppedEvent.getTimestamp() - T.mins(1).msecs());
-                if (pauseEvent != null && pauseEvent.getEventType().equals(EventType.PumpPaused) && (stoppedEvent.getTimestamp() - pauseEvent.getTimestamp() < T.mins(16).msecs())) {
+                InsightPumpID pauseEvent = insightDbHelper.getPumpStoppedEvent(pumpID.getPumpSerial(), stoppedEvent.getTimestamp() - T.Companion.mins(1).msecs());
+                if (pauseEvent != null && pauseEvent.getEventType().equals(EventType.PumpPaused) && (stoppedEvent.getTimestamp() - pauseEvent.getTimestamp() < T.Companion.mins(16).msecs())) {
                     stoppedEvent = pauseEvent;
                     stoppedEvent.setEventType(EventType.PumpStopped);
                 }
@@ -1343,7 +1345,7 @@ public class LocalInsightPlugin extends PumpPluginBase implements Pump, Constrai
                 event.getEventPosition()));
         temporaryBasals.add(new TemporaryBasal(
                 timestamp,
-                T.mins(event.getDuration()).msecs(),
+                T.Companion.mins(event.getDuration()).msecs(),
                 event.getAmount(),
                 false,
                 PumpSync.TemporaryBasalType.NORMAL,
@@ -1406,7 +1408,7 @@ public class LocalInsightPlugin extends PumpPluginBase implements Pump, Constrai
                 pumpSync.syncExtendedBolusWithPumpId(
                         bolusID.getTimestamp(),
                         event.getExtendedAmount(),
-                        T.mins(event.getDuration()).msecs(),
+                        T.Companion.mins(event.getDuration()).msecs(),
                         isFakingTempsByExtendedBoluses(),
                         bolusID.getId(),
                         PumpType.ACCU_CHEK_INSIGHT,
@@ -1439,13 +1441,15 @@ public class LocalInsightPlugin extends PumpPluginBase implements Pump, Constrai
                     bolusID.getId(),
                     PumpType.ACCU_CHEK_INSIGHT,
                     serial);
+            lastBolusTimestamp = bolusID.getTimestamp();
+            lastBolusAmount = event.getImmediateAmount();
         }
         if (event.getBolusType() == BolusType.EXTENDED || event.getBolusType() == BolusType.MULTIWAVE) {
             if (event.getDuration() > 0 && profileFunction.getProfile(bolusID.getTimestamp()) != null)
                     pumpSync.syncExtendedBolusWithPumpId(
                             bolusID.getTimestamp(),
                             event.getExtendedAmount(),
-                            T.mins(event.getDuration()).msecs(),
+                            timestamp - startTimestamp,
                             isFakingTempsByExtendedBoluses(),
                             bolusID.getId(),
                             PumpType.ACCU_CHEK_INSIGHT,
@@ -1557,8 +1561,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 +1568,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/layout/activity_insight_pairing_information.xml b/insight/src/main/res/layout/activity_insight_pairing_information.xml
index 3d6e0d56ed..c6e4ec51db 100644
--- a/insight/src/main/res/layout/activity_insight_pairing_information.xml
+++ b/insight/src/main/res/layout/activity_insight_pairing_information.xml
@@ -14,7 +14,7 @@
             android:layout_height="wrap_content"
             android:textColor="#FFFFFF"
             android:textSize="16sp"
-            android:text="@string/serial_number" />
+            android:text="@string/serialnumber" />
 
         <TextView
             android:id="@+id/serial_number"
diff --git a/insight/src/main/res/values-ko-rKR/alert_descriptions.xml b/insight/src/main/res/values-ko-rKR/alert_descriptions.xml
index 6687bd33e6..1eaf1759ab 100644
--- a/insight/src/main/res/values-ko-rKR/alert_descriptions.xml
+++ b/insight/src/main/res/values-ko-rKR/alert_descriptions.xml
@@ -4,6 +4,7 @@
     <string name="alert_w31_description"><![CDATA[카트리지 내용: <b>%1$s U</b>]]></string>
     <string name="alert_w32_description">베터리 교체.</string>
     <string name="alert_w33_description">시간/날짜 설정</string>
+    <string name="alert_w34_description">아큐-첵 지원 문의</string>
     <string name="alert_w36_description"><![CDATA[총량: <b>%1$d%%</b><br/>기간: <b>%2$s h</b>]]></string>
     <string name="alert_w38_description"><![CDATA[설정: <b>%1$s U</b><br/>주입: <b>%2$s U</b>]]></string>
     <string name="alert_m20_description">카트리지를 삽입.</string>
@@ -12,9 +13,12 @@
     <string name="alert_m23_description">펌프 상태를 체크.</string>
     <string name="alert_m24_description">주입세트를 교체.</string>
     <string name="alert_m25_description">아큐-첵 지원 문의</string>
+    <string name="alert_m26_description">카트리지를 교체.</string>
     <string name="alert_m27_description">데이터 다운로드 재시작</string>
+    <string name="alert_m28_description">펌프 상태를 체크.</string>
     <string name="alert_m29_description">베터리 타입 설정.</string>
     <string name="alert_m30_description">카트리지 타입 설정.</string>
     <string name="alert_e6_description">베터리와 카트리지를 교체.</string>
+    <string name="alert_e10_description">카트리지를 교체.</string>
     <string name="alert_e13_description">언어 변경.</string>
 </resources>
diff --git a/insight/src/main/res/values-ko-rKR/alert_titles.xml b/insight/src/main/res/values-ko-rKR/alert_titles.xml
index 0a675c63ce..ca4cf3ddde 100644
--- a/insight/src/main/res/values-ko-rKR/alert_titles.xml
+++ b/insight/src/main/res/values-ko-rKR/alert_titles.xml
@@ -3,6 +3,7 @@
     <string name="alert_r1_title">Bolus 주입.</string>
     <string name="alert_r2_title">Bolus 누락</string>
     <string name="alert_r3_title">알람 시계</string>
+    <string name="alert_r4_title">주입세트를 교체</string>
     <string name="alert_r7_title">TBR 완료</string>
     <string name="alert_w31_title">카트리지 부족</string>
     <string name="alert_w32_title">베터리 부족</string>
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/insight/src/main/res/values-lt-rLT/alert_descriptions.xml b/insight/src/main/res/values-lt-rLT/alert_descriptions.xml
index bb70b971c9..4c5d7e5b0f 100644
--- a/insight/src/main/res/values-lt-rLT/alert_descriptions.xml
+++ b/insight/src/main/res/values-lt-rLT/alert_descriptions.xml
@@ -2,7 +2,9 @@
 <resources>
     <string name="alert_r7_description"><![CDATA[Kiekis: <b>%1$d%%</b>\nTrukmė: <b>%2$s h</b>]]></string>
     <string name="alert_w31_description"><![CDATA[Rezervuaro tūris: <b>%1$s U</b>]]></string>
+    <string name="alert_w32_description">Pakeiskite bateriją.</string>
     <string name="alert_w33_description">Nustatykite laiką/datą.</string>
+    <string name="alert_w34_description">Kreipkitės į Accu-Chek palaikymo tarnybą.</string>
     <string name="alert_w36_description"><![CDATA[Kiekis: <b>%1$d%%</b><br/>Trukmė: <b>%2$s h</b>]]></string>
     <string name="alert_w38_description"><![CDATA[Suprogramuota: <b>%1$s U</b><br/>Suleista: <b>%2$s U</b>]]></string>
     <string name="alert_m20_description">Įdėkite rezervuarą.</string>
@@ -11,9 +13,12 @@
     <string name="alert_m23_description">Patikrinkite pompos būseną.</string>
     <string name="alert_m24_description">Pakeiskite infuzijos rinkinį.</string>
     <string name="alert_m25_description">Kreipkitės į Accu-Chek palaikymo tarnybą.</string>
+    <string name="alert_m26_description">Pakeiskite rezervuarą.</string>
     <string name="alert_m27_description">Iš naujo paleiskite duomenų atsisiuntimą.</string>
+    <string name="alert_m28_description">Patikrinkite pompos būseną.</string>
     <string name="alert_m29_description">Nustatykite baterijos tipą.</string>
     <string name="alert_m30_description">Nustatykite rezervuaro tipą.</string>
     <string name="alert_e6_description">Pakeiskite bateriją ir rezervuarą.</string>
+    <string name="alert_e10_description">Pakeiskite rezervuarą.</string>
     <string name="alert_e13_description">Pakeiskite kalbą.</string>
 </resources>
diff --git a/insight/src/main/res/values/strings.xml b/insight/src/main/res/values/strings.xml
index dd12e644a3..ba021a8b99 100644
--- a/insight/src/main/res/values/strings.xml
+++ b/insight/src/main/res/values/strings.xml
@@ -21,6 +21,8 @@
     <string name="tbr_formatter">%1$d%% for %2$d / %3$d min</string>
     <string name="multiwave_bolus">Multiwave bolus</string>
     <string name="eb_formatter">%1$.2f / %2$.2f U for %3$d min</string>
+    <string name="insight_last_bolus" >Last Bolus</string>
+    <string name="insight_last_bolus_formater" translatable="false">%1$.1f %2$s (%3$s)</string>
     <string name="searching_for_devices">Searching for devices…</string>
     <string name="pairing_completed">Pairing completed</string>
     <string name="code_compare">Do the codes displayed on this device and on your pump match?</string>
diff --git a/medtronic/build.gradle b/medtronic/build.gradle
index a3cb9f789e..136b5a3b05 100644
--- a/medtronic/build.gradle
+++ b/medtronic/build.gradle
@@ -1,20 +1,16 @@
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-kapt'
+apply plugin: 'kotlin-allopen'
 apply plugin: 'com.hiya.jacoco-android'
 
 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"
-
-android {
-    defaultConfig {
-        versionCode 1
-        versionName "1.0"
-    }
-}
+apply from: "${project.rootDir}/gradle/jacoco_global.gradle"
 
 dependencies {
     implementation project(':core')
+    implementation project(':pump-common')
     implementation project(':rileylink')
 }
diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/common/PumpPluginAbstract.java b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/common/PumpPluginAbstract.java
deleted file mode 100644
index d418787039..0000000000
--- a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/common/PumpPluginAbstract.java
+++ /dev/null
@@ -1,476 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.common;
-
-import static info.nightscout.androidaps.extensions.PumpStateExtensionKt.convertedToAbsolute;
-import static info.nightscout.androidaps.extensions.PumpStateExtensionKt.getPlannedRemainingMinutes;
-
-import android.content.Context;
-import android.content.Intent;
-import android.content.ServiceConnection;
-
-import androidx.annotation.NonNull;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import dagger.android.HasAndroidInjector;
-import info.nightscout.androidaps.core.R;
-import info.nightscout.androidaps.data.DetailedBolusInfo;
-import info.nightscout.androidaps.interfaces.Profile;
-import info.nightscout.androidaps.data.PumpEnactResult;
-import info.nightscout.androidaps.events.EventAppExit;
-import info.nightscout.androidaps.events.EventCustomActionsChanged;
-import info.nightscout.androidaps.extensions.PumpStateExtensionKt;
-import info.nightscout.androidaps.interfaces.ActivePlugin;
-import info.nightscout.androidaps.interfaces.CommandQueueProvider;
-import info.nightscout.androidaps.interfaces.Constraints;
-import info.nightscout.androidaps.interfaces.PluginDescription;
-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.bus.RxBusWrapper;
-import info.nightscout.androidaps.plugins.common.ManufacturerType;
-import info.nightscout.androidaps.plugins.general.overview.events.EventOverviewBolusProgress;
-import info.nightscout.androidaps.plugins.pump.common.data.PumpStatus;
-import info.nightscout.androidaps.plugins.pump.common.defs.PumpDriverState;
-import info.nightscout.androidaps.plugins.pump.common.defs.PumpType;
-import info.nightscout.androidaps.utils.DateUtil;
-import info.nightscout.androidaps.utils.DecimalFormatter;
-import info.nightscout.androidaps.utils.FabricPrivacy;
-import info.nightscout.androidaps.utils.resources.ResourceHelper;
-import info.nightscout.androidaps.utils.rx.AapsSchedulers;
-import info.nightscout.androidaps.utils.sharedPreferences.SP;
-import io.reactivex.disposables.CompositeDisposable;
-
-/**
- * Created by andy on 23.04.18.
- */
-
-// When using this class, make sure that your first step is to create mConnection (see MedtronicPumpPlugin)
-
-public abstract class PumpPluginAbstract extends PumpPluginBase implements Pump, Constraints {
-    private final CompositeDisposable disposable = new CompositeDisposable();
-
-    protected HasAndroidInjector injector;
-    protected AAPSLogger aapsLogger;
-    protected RxBusWrapper rxBus;
-    protected ActivePlugin activePlugin;
-    protected Context context;
-    protected FabricPrivacy fabricPrivacy;
-    protected ResourceHelper resourceHelper;
-    protected CommandQueueProvider commandQueue;
-    protected SP sp;
-    protected DateUtil dateUtil;
-    protected PumpDescription pumpDescription = new PumpDescription();
-    protected ServiceConnection serviceConnection;
-    protected boolean serviceRunning = false;
-    protected PumpDriverState pumpState = PumpDriverState.NotInitialized;
-    protected boolean displayConnectionMessages = false;
-    protected PumpType pumpType;
-    protected AapsSchedulers aapsSchedulers;
-    protected PumpSync pumpSync;
-
-    protected PumpPluginAbstract(
-            PluginDescription pluginDescription,
-            PumpType pumpType,
-            HasAndroidInjector injector,
-            ResourceHelper resourceHelper,
-            AAPSLogger aapsLogger,
-            CommandQueueProvider commandQueue,
-            RxBusWrapper rxBus,
-            ActivePlugin activePlugin,
-            SP sp,
-            Context context,
-            FabricPrivacy fabricPrivacy,
-            DateUtil dateUtil,
-            AapsSchedulers aapsSchedulers,
-            PumpSync pumpSync
-    ) {
-
-        super(pluginDescription, injector, aapsLogger, resourceHelper, commandQueue);
-        this.aapsLogger = aapsLogger;
-        this.rxBus = rxBus;
-        this.activePlugin = activePlugin;
-        this.context = context;
-        this.fabricPrivacy = fabricPrivacy;
-        this.resourceHelper = resourceHelper;
-        this.sp = sp;
-        this.commandQueue = commandQueue;
-
-        pumpDescription.fillFor(pumpType);
-        this.pumpType = pumpType;
-        this.dateUtil = dateUtil;
-        this.aapsSchedulers = aapsSchedulers;
-        this.pumpSync = pumpSync;
-    }
-
-
-    public abstract void initPumpStatusData();
-
-
-    @Override
-    protected void onStart() {
-        super.onStart();
-
-        initPumpStatusData();
-
-        Intent intent = new Intent(context, getServiceClass());
-        context.bindService(intent, serviceConnection, Context.BIND_AUTO_CREATE);
-
-        serviceRunning = true;
-
-        disposable.add(rxBus
-                .toObservable(EventAppExit.class)
-                .observeOn(aapsSchedulers.getIo())
-                .subscribe(event -> context.unbindService(serviceConnection), fabricPrivacy::logException)
-        );
-        onStartCustomActions();
-    }
-
-
-    @Override
-    protected void onStop() {
-        aapsLogger.debug(LTag.PUMP, this.deviceID() + " onStop()");
-
-        context.unbindService(serviceConnection);
-
-        serviceRunning = false;
-
-        disposable.clear();
-        super.onStop();
-    }
-
-
-    /**
-     * If we need to run any custom actions in onStart (triggering events, etc)
-     */
-    public abstract void onStartCustomActions();
-
-    /**
-     * Service class (same one you did serviceConnection for)
-     *
-     * @return Class
-     */
-    public abstract Class getServiceClass();
-
-    public abstract PumpStatus getPumpStatusData();
-
-
-    public boolean isInitialized() {
-        return pumpState.isInitialized();
-    }
-
-
-    public boolean isSuspended() {
-        return pumpState == PumpDriverState.Suspended;
-    }
-
-
-    public boolean isBusy() {
-        return pumpState == PumpDriverState.Busy;
-    }
-
-
-    public boolean isConnected() {
-        if (displayConnectionMessages)
-            aapsLogger.debug(LTag.PUMP, "isConnected [PumpPluginAbstract].");
-        return pumpState.isConnected();
-    }
-
-
-    public boolean isConnecting() {
-        if (displayConnectionMessages)
-            aapsLogger.debug(LTag.PUMP, "isConnecting [PumpPluginAbstract].");
-        return pumpState == PumpDriverState.Connecting;
-    }
-
-
-    public void connect(@NonNull String reason) {
-        if (displayConnectionMessages)
-            aapsLogger.debug(LTag.PUMP, "connect (reason={}) [PumpPluginAbstract] - default (empty) implementation." + reason);
-    }
-
-
-    public void disconnect(@NonNull String reason) {
-        if (displayConnectionMessages)
-            aapsLogger.debug(LTag.PUMP, "disconnect (reason={}) [PumpPluginAbstract] - default (empty) implementation." + reason);
-    }
-
-
-    public void stopConnecting() {
-        if (displayConnectionMessages)
-            aapsLogger.debug(LTag.PUMP, "stopConnecting [PumpPluginAbstract] - default (empty) implementation.");
-    }
-
-
-    @Override
-    public boolean isHandshakeInProgress() {
-        if (displayConnectionMessages)
-            aapsLogger.debug(LTag.PUMP, "isHandshakeInProgress [PumpPluginAbstract] - default (empty) implementation.");
-        return false;
-    }
-
-
-    @Override
-    public void finishHandshaking() {
-        if (displayConnectionMessages)
-            aapsLogger.debug(LTag.PUMP, "finishHandshaking [PumpPluginAbstract] - default (empty) implementation.");
-    }
-
-    // Upload to pump new basal profile
-    @NonNull public PumpEnactResult setNewBasalProfile(@NonNull Profile profile) {
-        aapsLogger.debug(LTag.PUMP, "setNewBasalProfile [PumpPluginAbstract] - Not implemented.");
-        return getOperationNotSupportedWithCustomText(R.string.pump_operation_not_supported_by_pump_driver);
-    }
-
-
-    public boolean isThisProfileSet(@NonNull Profile profile) {
-        aapsLogger.debug(LTag.PUMP, "isThisProfileSet [PumpPluginAbstract] - Not implemented.");
-        return true;
-    }
-
-
-    public long lastDataTime() {
-        aapsLogger.debug(LTag.PUMP, "lastDataTime [PumpPluginAbstract].");
-        return getPumpStatusData().lastConnection;
-    }
-
-
-    public double getBaseBasalRate() {
-        aapsLogger.debug(LTag.PUMP, "getBaseBasalRate [PumpPluginAbstract] - Not implemented.");
-        return 0.0d;
-    } // base basal rate, not temp basal
-
-
-    public void stopBolusDelivering() {
-        aapsLogger.debug(LTag.PUMP, "stopBolusDelivering [PumpPluginAbstract] - Not implemented.");
-    }
-
-
-    @NonNull @Override
-    public PumpEnactResult setTempBasalAbsolute(double absoluteRate, int durationInMinutes, @NonNull Profile profile, boolean enforceNew, @NonNull PumpSync.TemporaryBasalType tbrType) {
-        aapsLogger.debug(LTag.PUMP, "setTempBasalAbsolute [PumpPluginAbstract] - Not implemented.");
-        return getOperationNotSupportedWithCustomText(R.string.pump_operation_not_supported_by_pump_driver);
-    }
-
-
-    @NonNull @Override
-    public PumpEnactResult setTempBasalPercent(int percent, int durationInMinutes, @NonNull Profile profile, boolean enforceNew, @NonNull PumpSync.TemporaryBasalType tbrType) {
-        aapsLogger.debug(LTag.PUMP, "setTempBasalPercent [PumpPluginAbstract] - Not implemented.");
-        return getOperationNotSupportedWithCustomText(R.string.pump_operation_not_supported_by_pump_driver);
-    }
-
-
-    @NonNull public PumpEnactResult setExtendedBolus(double insulin, int durationInMinutes) {
-        aapsLogger.debug(LTag.PUMP, "setExtendedBolus [PumpPluginAbstract] - Not implemented.");
-        return getOperationNotSupportedWithCustomText(R.string.pump_operation_not_supported_by_pump_driver);
-    }
-
-
-    // some pumps might set a very short temp close to 100% as cancelling a temp can be noisy
-    // when the cancel request is requested by the user (forced), the pump should always do a real cancel
-
-    @NonNull public PumpEnactResult cancelTempBasal(boolean enforceNew) {
-        aapsLogger.debug(LTag.PUMP, "cancelTempBasal [PumpPluginAbstract] - Not implemented.");
-        return getOperationNotSupportedWithCustomText(R.string.pump_operation_not_supported_by_pump_driver);
-    }
-
-
-    @NonNull public PumpEnactResult cancelExtendedBolus() {
-        aapsLogger.debug(LTag.PUMP, "cancelExtendedBolus [PumpPluginAbstract] - Not implemented.");
-        return getOperationNotSupportedWithCustomText(R.string.pump_operation_not_supported_by_pump_driver);
-    }
-
-
-    // Status to be passed to NS
-
-    // public JSONObject getJSONStatus(Profile profile, String profileName) {
-    // return pumpDriver.getJSONStatus(profile, profileName);
-    // }
-
-    public String deviceID() {
-        aapsLogger.debug(LTag.PUMP, "deviceID [PumpPluginAbstract] - Not implemented.");
-        return "FakeDevice";
-    }
-
-
-    // Pump capabilities
-
-    @NonNull public PumpDescription getPumpDescription() {
-        return pumpDescription;
-    }
-
-
-    // Short info for SMS, Wear etc
-
-    public boolean isFakingTempsByExtendedBoluses() {
-        aapsLogger.debug(LTag.PUMP, "isFakingTempsByExtendedBoluses [PumpPluginAbstract] - Not implemented.");
-        return false;
-    }
-
-
-    @NonNull @Override
-    public PumpEnactResult loadTDDs() {
-        aapsLogger.debug(LTag.PUMP, "loadTDDs [PumpPluginAbstract] - Not implemented.");
-        return getOperationNotSupportedWithCustomText(R.string.pump_operation_not_supported_by_pump_driver);
-    }
-
-
-    @NonNull @Override
-    public JSONObject getJSONStatus(@NonNull Profile profile, @NonNull String profileName, @NonNull String version) {
-
-        if ((getPumpStatusData().lastConnection + 60 * 60 * 1000L) < System.currentTimeMillis()) {
-            return new JSONObject();
-        }
-
-        long now = System.currentTimeMillis();
-        JSONObject pump = new JSONObject();
-        JSONObject battery = new JSONObject();
-        JSONObject status = new JSONObject();
-        JSONObject extended = new JSONObject();
-        try {
-            battery.put("percent", getPumpStatusData().batteryRemaining);
-            status.put("status", getPumpStatusData().pumpStatusType != null ? getPumpStatusData().pumpStatusType.getStatus() : "normal");
-            extended.put("Version", version);
-            try {
-                extended.put("ActiveProfile", profileName);
-            } catch (Exception ignored) {
-            }
-
-            PumpSync.PumpState.TemporaryBasal tb = pumpSync.expectedPumpState().getTemporaryBasal();
-            if (tb != null) {
-                extended.put("TempBasalAbsoluteRate", convertedToAbsolute(tb, now, profile));
-                extended.put("TempBasalStart", dateUtil.dateAndTimeString(tb.getTimestamp()));
-                extended.put("TempBasalRemaining", getPlannedRemainingMinutes(tb));
-            }
-
-            PumpSync.PumpState.ExtendedBolus eb = pumpSync.expectedPumpState().getExtendedBolus();
-            if (eb != null) {
-                extended.put("ExtendedBolusAbsoluteRate", eb.getRate());
-                extended.put("ExtendedBolusStart", dateUtil.dateAndTimeString(eb.getTimestamp()));
-                extended.put("ExtendedBolusRemaining", getPlannedRemainingMinutes(eb));
-            }
-
-            status.put("timestamp", dateUtil.toISOString(dateUtil.now()));
-
-            pump.put("battery", battery);
-            pump.put("status", status);
-            pump.put("extended", extended);
-            pump.put("reservoir", getPumpStatusData().reservoirRemainingUnits);
-            pump.put("clock", dateUtil.toISOString(dateUtil.now()));
-        } catch (JSONException e) {
-            aapsLogger.error("Unhandled exception", e);
-        }
-        return pump;
-    }
-
-
-    // FIXME i18n, null checks: iob, TDD
-    @NonNull @Override
-    public String shortStatus(boolean veryShort) {
-        String ret = "";
-        if (getPumpStatusData().lastConnection != 0) {
-            long agoMsec = System.currentTimeMillis() - getPumpStatusData().lastConnection;
-            int agoMin = (int) (agoMsec / 60d / 1000d);
-            ret += "LastConn: " + agoMin + " min ago\n";
-        }
-        if (getPumpStatusData().lastBolusTime != null && getPumpStatusData().lastBolusTime.getTime() != 0) {
-            ret += "LastBolus: " + DecimalFormatter.INSTANCE.to2Decimal(getPumpStatusData().lastBolusAmount) + "U @" + //
-                    android.text.format.DateFormat.format("HH:mm", getPumpStatusData().lastBolusTime) + "\n";
-        }
-        PumpSync.PumpState.TemporaryBasal activeTemp = pumpSync.expectedPumpState().getTemporaryBasal();
-        if (activeTemp != null) {
-            ret += "Temp: " + PumpStateExtensionKt.toStringFull(activeTemp, dateUtil) + "\n";
-        }
-        PumpSync.PumpState.ExtendedBolus activeExtendedBolus = pumpSync.expectedPumpState().getExtendedBolus();
-        if (activeExtendedBolus != null) {
-            ret += "Extended: " + PumpStateExtensionKt.toStringFull(activeExtendedBolus, dateUtil) + "\n";
-        }
-        // if (!veryShort) {
-        // ret += "TDD: " + DecimalFormatter.to0Decimal(pumpStatus.dailyTotalUnits) + " / "
-        // + pumpStatus.maxDailyTotalUnits + " U\n";
-        // }
-        ret += "IOB: " + getPumpStatusData().iob + "U\n";
-        ret += "Reserv: " + DecimalFormatter.INSTANCE.to0Decimal(getPumpStatusData().reservoirRemainingUnits) + "U\n";
-        ret += "Batt: " + getPumpStatusData().batteryRemaining + "\n";
-        return ret;
-    }
-
-
-    @NonNull @Override
-    public PumpEnactResult deliverTreatment(DetailedBolusInfo detailedBolusInfo) {
-
-        try {
-            if (detailedBolusInfo.insulin == 0 && detailedBolusInfo.carbs == 0) {
-                // neither carbs nor bolus requested
-                aapsLogger.error("deliverTreatment: Invalid input");
-                return new PumpEnactResult(getInjector()).success(false).enacted(false).bolusDelivered(0d).carbsDelivered(0d)
-                        .comment(R.string.invalidinput);
-            } else if (detailedBolusInfo.insulin > 0) {
-                // bolus needed, ask pump to deliver it
-                return deliverBolus(detailedBolusInfo);
-            } else {
-                //if (MedtronicHistoryData.doubleBolusDebug)
-                //    aapsLogger.debug("DoubleBolusDebug: deliverTreatment::(carb only entry)");
-
-                // no bolus required, carb only treatment
-                activePlugin.getActiveTreatments().addToHistoryTreatment(detailedBolusInfo, true);
-
-                EventOverviewBolusProgress bolusingEvent = EventOverviewBolusProgress.INSTANCE;
-                bolusingEvent.setT(new EventOverviewBolusProgress.Treatment(0, 0, detailedBolusInfo.getBolusType() == DetailedBolusInfo.BolusType.SMB));
-                bolusingEvent.setPercent(100);
-                rxBus.send(bolusingEvent);
-
-                aapsLogger.debug(LTag.PUMP, "deliverTreatment: Carb only treatment.");
-
-                return new PumpEnactResult(getInjector()).success(true).enacted(true).bolusDelivered(0d)
-                        .carbsDelivered(detailedBolusInfo.carbs).comment(R.string.common_resultok);
-            }
-        } finally {
-            triggerUIChange();
-        }
-
-    }
-
-
-    protected void refreshCustomActionsList() {
-        rxBus.send(new EventCustomActionsChanged());
-    }
-
-
-    @NonNull public ManufacturerType manufacturer() {
-        return pumpType.getManufacturer();
-    }
-
-    @NonNull
-    public PumpType model() {
-        return pumpType;
-    }
-
-
-    public PumpType getPumpType() {
-        return pumpType;
-    }
-
-
-    public void setPumpType(PumpType pumpType) {
-        this.pumpType = pumpType;
-        this.pumpDescription.fillFor(pumpType);
-    }
-
-
-    public boolean canHandleDST() {
-        return false;
-    }
-
-
-    protected abstract PumpEnactResult deliverBolus(DetailedBolusInfo detailedBolusInfo);
-
-    protected abstract void triggerUIChange();
-
-    private PumpEnactResult getOperationNotSupportedWithCustomText(int resourceId) {
-        return new PumpEnactResult(getInjector()).success(false).enacted(false).comment(resourceId);
-    }
-}
diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/common/data/PumpStatus.java b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/common/data/PumpStatus.java
deleted file mode 100644
index 505cd1388f..0000000000
--- a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/common/data/PumpStatus.java
+++ /dev/null
@@ -1,71 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.common.data;
-
-import java.util.Date;
-
-import info.nightscout.androidaps.interfaces.ProfileStore;
-import info.nightscout.androidaps.plugins.pump.common.defs.PumpStatusType;
-import info.nightscout.androidaps.plugins.pump.common.defs.PumpType;
-import info.nightscout.androidaps.utils.DateUtil;
-
-/**
- * Created by andy on 4/28/18.
- */
-
-public abstract class PumpStatus {
-
-    // connection
-    public long lastDataTime;
-    public long lastConnection = 0L;
-    public long previousConnection = 0L; // here should be stored last connection of previous session (so needs to be
-    // read before lastConnection is modified for first time).
-
-    // last bolus
-    public Date lastBolusTime;
-    public Double lastBolusAmount;
-
-    // other pump settings
-    public String activeProfileName = "0";
-    public double reservoirRemainingUnits = 0.0d;
-    public int reservoirFullUnits = 0;
-    public int batteryRemaining = 0; // percent, so 0-100
-    public Double batteryVoltage = null;
-
-
-    // iob
-    public String iob = null;
-
-    // TDD
-    public Double dailyTotalUnits;
-    public String maxDailyTotalUnits;
-    public boolean validBasalRateProfileSelectedOnPump = true;
-    public ProfileStore profileStore;
-    public String units; // Constants.MGDL or Constants.MMOL
-    public PumpStatusType pumpStatusType = PumpStatusType.Running;
-    public Double[] basalsByHour;
-    public double currentBasal = 0;
-    public int tempBasalInProgress = 0;
-    public int tempBasalRatio = 0;
-    public int tempBasalRemainMin = 0;
-    public Date tempBasalStart;
-    public PumpType pumpType;
-    //protected PumpDescription pumpDescription;
-
-
-    public PumpStatus(PumpType pumpType) {
-        //  public PumpStatus(PumpDescription pumpDescription) {
-        //       this.pumpDescription = pumpDescription;
-
-//        this.initSettings();
-        this.pumpType = pumpType;
-    }
-
-    public abstract void initSettings();
-
-    public void setLastCommunicationToNow() {
-        this.lastDataTime = System.currentTimeMillis();
-        this.lastConnection = System.currentTimeMillis();
-    }
-
-    public abstract String getErrorInfo();
-
-}
diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/MedtronicFragment.kt b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/MedtronicFragment.kt
index d9124ec15e..275b70bbdb 100644
--- a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/MedtronicFragment.kt
+++ b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/MedtronicFragment.kt
@@ -5,6 +5,7 @@ import android.content.Intent
 import android.graphics.Color
 import android.os.Bundle
 import android.os.Handler
+import android.os.Looper
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -12,7 +13,6 @@ import dagger.android.support.DaggerFragment
 import info.nightscout.androidaps.events.EventExtendedBolusChange
 import info.nightscout.androidaps.events.EventPumpStatusChanged
 import info.nightscout.androidaps.events.EventTempBasalChange
-import info.nightscout.androidaps.extensions.toStringFull
 import info.nightscout.androidaps.interfaces.ActivePlugin
 import info.nightscout.androidaps.interfaces.CommandQueueProvider
 import info.nightscout.androidaps.interfaces.PumpSync
@@ -68,7 +68,7 @@ class MedtronicFragment : DaggerFragment() {
 
     private var disposable: CompositeDisposable = CompositeDisposable()
 
-    private val loopHandler = Handler()
+    private val loopHandler = Handler(Looper.getMainLooper())
     private lateinit var refreshLoop: Runnable
 
     init {
@@ -90,8 +90,6 @@ class MedtronicFragment : DaggerFragment() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
-        binding.pumpStatus.setBackgroundColor(resourceHelper.gc(R.color.colorInitializingBorder))
-
         binding.rlStatus.text = resourceHelper.gs(RileyLinkServiceState.NotStarted.resourceId)
 
         binding.pumpStatusIcon.setTextColor(Color.WHITE)
@@ -99,7 +97,7 @@ class MedtronicFragment : DaggerFragment() {
         binding.pumpStatusIcon.text = "{fa-bed}"
 
         binding.history.setOnClickListener {
-            if (medtronicPumpPlugin.rileyLinkService?.verifyConfiguration() == true) {
+            if (medtronicPumpPlugin.rileyLinkService.verifyConfiguration()) {
                 startActivity(Intent(context, MedtronicHistoryActivity::class.java))
             } else {
                 displayNotConfiguredDialog()
@@ -107,7 +105,7 @@ class MedtronicFragment : DaggerFragment() {
         }
 
         binding.refresh.setOnClickListener {
-            if (medtronicPumpPlugin.rileyLinkService?.verifyConfiguration() != true) {
+            if (!medtronicPumpPlugin.rileyLinkService.verifyConfiguration()) {
                 displayNotConfiguredDialog()
             } else {
                 binding.refresh.isEnabled = false
@@ -121,7 +119,7 @@ class MedtronicFragment : DaggerFragment() {
         }
 
         binding.stats.setOnClickListener {
-            if (medtronicPumpPlugin.rileyLinkService?.verifyConfiguration() == true) {
+            if (medtronicPumpPlugin.rileyLinkService.verifyConfiguration()) {
                 startActivity(Intent(context, RileyLinkStatusActivity::class.java))
             } else {
                 displayNotConfiguredDialog()
@@ -161,7 +159,7 @@ class MedtronicFragment : DaggerFragment() {
             .observeOn(aapsSchedulers.main)
             .subscribe({
                 aapsLogger.debug(LTag.PUMP, "EventMedtronicPumpConfigurationChanged triggered")
-                medtronicPumpPlugin.rileyLinkService?.verifyConfiguration()
+                medtronicPumpPlugin.rileyLinkService.verifyConfiguration()
                 updateGUI()
             }, fabricPrivacy::logException)
         disposable += rxBus
@@ -193,7 +191,7 @@ class MedtronicFragment : DaggerFragment() {
     @Synchronized
     private fun setDeviceStatus() {
         val resourceId = rileyLinkServiceData.rileyLinkServiceState.resourceId
-        val rileyLinkError = medtronicPumpPlugin.rileyLinkService?.error
+        val rileyLinkError = medtronicPumpPlugin.rileyLinkService.error
         binding.rlStatus.text =
             when {
                 rileyLinkServiceData.rileyLinkServiceState == RileyLinkServiceState.NotStarted -> resourceHelper.gs(resourceId)
@@ -210,35 +208,38 @@ class MedtronicFragment : DaggerFragment() {
             } ?: "-"
 
         when (medtronicPumpStatus.pumpDeviceState) {
-            null,
-            PumpDeviceState.Sleeping             -> binding.pumpStatusIcon.text = "{fa-bed}   " // + pumpStatus.pumpDeviceState.name());
+            PumpDeviceState.Sleeping             ->
+                binding.pumpStatusIcon.text = "{fa-bed}   " // + pumpStatus.pumpDeviceState.name());
+
             PumpDeviceState.NeverContacted,
             PumpDeviceState.WakingUp,
             PumpDeviceState.PumpUnreachable,
             PumpDeviceState.ErrorWhenCommunicating,
             PumpDeviceState.TimeoutWhenCommunicating,
-            PumpDeviceState.InvalidConfiguration -> binding.pumpStatusIcon.text = " " + resourceHelper.gs(medtronicPumpStatus.pumpDeviceState.resourceId)
+            PumpDeviceState.InvalidConfiguration ->
+                binding.pumpStatusIcon.text = " " + resourceHelper.gs(medtronicPumpStatus.pumpDeviceState.resourceId)
 
             PumpDeviceState.Active               -> {
-                val cmd = medtronicUtil.currentCommand
+                val cmd = medtronicUtil.getCurrentCommand()
                 if (cmd == null)
                     binding.pumpStatusIcon.text = " " + resourceHelper.gs(medtronicPumpStatus.pumpDeviceState.resourceId)
                 else {
                     aapsLogger.debug(LTag.PUMP, "Command: $cmd")
-                    val cmdResourceId = cmd.resourceId
+                    val cmdResourceId = cmd.resourceId //!!
                     if (cmd == MedtronicCommandType.GetHistoryData) {
                         binding.pumpStatusIcon.text = medtronicUtil.frameNumber?.let {
-                            resourceHelper.gs(cmdResourceId, medtronicUtil.pageNumber, medtronicUtil.frameNumber)
+                            resourceHelper.gs(cmdResourceId!!, medtronicUtil.pageNumber, medtronicUtil.frameNumber)
                         }
                             ?: resourceHelper.gs(R.string.medtronic_cmd_desc_get_history_request, medtronicUtil.pageNumber)
                     } else {
                         binding.pumpStatusIcon.text = " " + (cmdResourceId?.let { resourceHelper.gs(it) }
-                            ?: cmd.getCommandDescription())
+                            ?: cmd.commandDescription)
                     }
                 }
             }
 
-            else                                 -> aapsLogger.warn(LTag.PUMP, "Unknown pump state: " + medtronicPumpStatus.pumpDeviceState)
+            else                                 ->
+                aapsLogger.warn(LTag.PUMP, "Unknown pump state: " + medtronicPumpStatus.pumpDeviceState)
         }
 
         val status = commandQueue.spannedStatus()
@@ -298,26 +299,31 @@ class MedtronicFragment : DaggerFragment() {
         val bolus = medtronicPumpStatus.lastBolusAmount
         val bolusTime = medtronicPumpStatus.lastBolusTime
         if (bolus != null && bolusTime != null) {
-            val agoMsc = System.currentTimeMillis() - medtronicPumpStatus.lastBolusTime.time
+            val agoMsc = System.currentTimeMillis() - bolusTime.time
             val bolusMinAgo = agoMsc.toDouble() / 60.0 / 1000.0
             val unit = resourceHelper.gs(R.string.insulin_unit_shortname)
             val ago = when {
                 agoMsc < 60 * 1000 -> resourceHelper.gs(R.string.medtronic_pump_connected_now)
-                bolusMinAgo < 60   -> dateUtil.minAgo(resourceHelper, medtronicPumpStatus.lastBolusTime.time)
-                else               -> dateUtil.hourAgo(medtronicPumpStatus.lastBolusTime.time, resourceHelper)
+                bolusMinAgo < 60   -> dateUtil.minAgo(resourceHelper, bolusTime.time)
+                else               -> dateUtil.hourAgo(bolusTime.time, resourceHelper)
             }
             binding.lastBolus.text = resourceHelper.gs(R.string.mdt_last_bolus, bolus, unit, ago)
         } else {
             binding.lastBolus.text = ""
         }
 
-        val pumpState = pumpSync.expectedPumpState()
         // base basal rate
         binding.baseBasalRate.text = ("(" + medtronicPumpStatus.activeProfileName + ")  "
             + resourceHelper.gs(R.string.pump_basebasalrate, medtronicPumpPlugin.baseBasalRate))
 
-        binding.tempBasal.text = pumpState.temporaryBasal?.toStringFull(dateUtil)
-            ?: ""
+        // TBR
+        var tbrStr = ""
+        val tbrRemainingTime: Int? = medtronicPumpStatus.tbrRemainingTime
+
+        if (tbrRemainingTime != null) {
+            tbrStr = resourceHelper.gs(R.string.mdt_tbr_remaining, medtronicPumpStatus.tempBasalAmount, tbrRemainingTime)
+        }
+        binding.tempBasal.text = tbrStr
 
         // battery
         if (medtronicPumpStatus.batteryType == BatteryType.None || medtronicPumpStatus.batteryVoltage == null) {
@@ -331,7 +337,7 @@ class MedtronicFragment : DaggerFragment() {
         binding.reservoir.text = resourceHelper.gs(R.string.reservoirvalue, medtronicPumpStatus.reservoirRemainingUnits, medtronicPumpStatus.reservoirFullUnits)
         warnColors.setColorInverse(binding.reservoir, medtronicPumpStatus.reservoirRemainingUnits, 50.0, 20.0)
 
-        medtronicPumpPlugin.rileyLinkService?.verifyConfiguration()
+        medtronicPumpPlugin.rileyLinkService.verifyConfiguration()
         binding.errors.text = medtronicPumpStatus.errorInfo
 
         val showRileyLinkBatteryLevel: Boolean = rileyLinkServiceData.showBatteryLevel
diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/MedtronicPumpPlugin.java b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/MedtronicPumpPlugin.java
deleted file mode 100644
index b77081c48b..0000000000
--- a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/MedtronicPumpPlugin.java
+++ /dev/null
@@ -1,1600 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.medtronic;
-
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.ServiceConnection;
-import android.os.IBinder;
-import android.os.SystemClock;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.preference.Preference;
-
-import org.joda.time.LocalDateTime;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.GregorianCalendar;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Set;
-
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
-import dagger.android.HasAndroidInjector;
-import info.nightscout.androidaps.activities.ErrorHelperActivity;
-import info.nightscout.androidaps.data.DetailedBolusInfo;
-import info.nightscout.androidaps.interfaces.Profile;
-import info.nightscout.androidaps.data.PumpEnactResult;
-import info.nightscout.androidaps.db.Source;
-import info.nightscout.androidaps.db.TemporaryBasal;
-import info.nightscout.androidaps.events.EventRefreshOverview;
-import info.nightscout.androidaps.interfaces.ActivePlugin;
-import info.nightscout.androidaps.interfaces.CommandQueueProvider;
-import info.nightscout.androidaps.interfaces.PluginDescription;
-import info.nightscout.androidaps.interfaces.PluginType;
-import info.nightscout.androidaps.interfaces.Pump;
-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.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.EventNewNotification;
-import info.nightscout.androidaps.plugins.general.overview.notifications.Notification;
-import info.nightscout.androidaps.plugins.pump.common.PumpPluginAbstract;
-import info.nightscout.androidaps.plugins.pump.common.data.PumpStatus;
-import info.nightscout.androidaps.plugins.pump.common.defs.PumpDriverState;
-import info.nightscout.androidaps.plugins.pump.common.defs.PumpType;
-import info.nightscout.androidaps.plugins.pump.common.events.EventRefreshButtonState;
-import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkConst;
-import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.defs.RileyLinkPumpDevice;
-import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.defs.RileyLinkPumpInfo;
-import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.defs.RileyLinkServiceState;
-import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.service.RileyLinkServiceData;
-import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.service.tasks.ResetRileyLinkConfigurationTask;
-import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.service.tasks.ServiceTaskExecutor;
-import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.service.tasks.WakeAndTuneTask;
-import info.nightscout.androidaps.plugins.pump.common.utils.DateTimeUtil;
-import info.nightscout.androidaps.plugins.pump.medtronic.comm.history.pump.PumpHistoryEntry;
-import info.nightscout.androidaps.plugins.pump.medtronic.comm.history.pump.PumpHistoryResult;
-import info.nightscout.androidaps.plugins.pump.medtronic.comm.ui.MedtronicUITask;
-import info.nightscout.androidaps.plugins.pump.medtronic.data.MedtronicHistoryData;
-import info.nightscout.androidaps.plugins.pump.medtronic.data.dto.BasalProfile;
-import info.nightscout.androidaps.plugins.pump.medtronic.data.dto.BasalProfileEntry;
-import info.nightscout.androidaps.plugins.pump.medtronic.data.dto.ClockDTO;
-import info.nightscout.androidaps.plugins.pump.medtronic.data.dto.TempBasalPair;
-import info.nightscout.androidaps.plugins.pump.medtronic.defs.BasalProfileStatus;
-import info.nightscout.androidaps.plugins.pump.medtronic.defs.MedtronicCommandType;
-import info.nightscout.androidaps.plugins.pump.medtronic.defs.MedtronicCustomActionType;
-import info.nightscout.androidaps.plugins.pump.medtronic.defs.MedtronicNotificationType;
-import info.nightscout.androidaps.plugins.pump.medtronic.defs.MedtronicStatusRefreshType;
-import info.nightscout.androidaps.plugins.pump.medtronic.defs.MedtronicUIResponseType;
-import info.nightscout.androidaps.plugins.pump.medtronic.driver.MedtronicPumpStatus;
-import info.nightscout.androidaps.plugins.pump.medtronic.events.EventMedtronicPumpConfigurationChanged;
-import info.nightscout.androidaps.plugins.pump.medtronic.events.EventMedtronicPumpValuesChanged;
-import info.nightscout.androidaps.plugins.pump.medtronic.service.RileyLinkMedtronicService;
-import info.nightscout.androidaps.plugins.pump.medtronic.util.MedtronicConst;
-import info.nightscout.androidaps.plugins.pump.medtronic.util.MedtronicUtil;
-import info.nightscout.androidaps.utils.DateUtil;
-import info.nightscout.androidaps.utils.FabricPrivacy;
-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;
-
-
-/**
- * Created by andy on 23.04.18.
- *
- * @author Andy Rozman (andy.rozman@gmail.com)
- */
-@Singleton
-public class MedtronicPumpPlugin extends PumpPluginAbstract implements Pump, RileyLinkPumpDevice {
-
-    private final SP sp;
-    private final MedtronicUtil medtronicUtil;
-    private final MedtronicPumpStatus medtronicPumpStatus;
-    private final MedtronicHistoryData medtronicHistoryData;
-    private final RileyLinkServiceData rileyLinkServiceData;
-    private final ServiceTaskExecutor serviceTaskExecutor;
-
-    private RileyLinkMedtronicService rileyLinkMedtronicService;
-
-    // variables for handling statuses and history
-    private boolean firstRun = true;
-    private boolean isRefresh = false;
-    private final Map<MedtronicStatusRefreshType, Long> statusRefreshMap = new HashMap<>();
-    private boolean isInitialized = false;
-    private PumpHistoryEntry lastPumpHistoryEntry;
-
-    public static boolean isBusy = false;
-    private final List<Long> busyTimestamps = new ArrayList<>();
-    private boolean hasTimeDateOrTimeZoneChanged = false;
-
-
-    @Inject
-    public MedtronicPumpPlugin(
-            HasAndroidInjector injector,
-            AAPSLogger aapsLogger,
-            RxBusWrapper rxBus,
-            Context context,
-            ResourceHelper resourceHelper,
-            ActivePlugin activePlugin,
-            SP sp,
-            CommandQueueProvider commandQueue,
-            FabricPrivacy fabricPrivacy,
-            MedtronicUtil medtronicUtil,
-            MedtronicPumpStatus medtronicPumpStatus,
-            MedtronicHistoryData medtronicHistoryData,
-            RileyLinkServiceData rileyLinkServiceData,
-            ServiceTaskExecutor serviceTaskExecutor,
-            DateUtil dateUtil,
-            AapsSchedulers aapsSchedulers,
-            PumpSync pumpSync
-    ) {
-
-        super(new PluginDescription() //
-                        .mainType(PluginType.PUMP) //
-                        .fragmentClass(MedtronicFragment.class.getName()) //
-                        .pluginIcon(R.drawable.ic_veo_128)
-                        .pluginName(R.string.medtronic_name) //
-                        .shortName(R.string.medtronic_name_short) //
-                        .preferencesId(R.xml.pref_medtronic)
-                        .description(R.string.description_pump_medtronic), //
-                PumpType.MEDTRONIC_522_722, // we default to most basic model, correct model from config is loaded later
-                injector, resourceHelper, aapsLogger, commandQueue, rxBus, activePlugin, sp, context, fabricPrivacy, dateUtil, aapsSchedulers, pumpSync
-        );
-
-        this.medtronicUtil = medtronicUtil;
-        this.sp = sp;
-        this.medtronicPumpStatus = medtronicPumpStatus;
-        this.medtronicHistoryData = medtronicHistoryData;
-        this.rileyLinkServiceData = rileyLinkServiceData;
-        this.serviceTaskExecutor = serviceTaskExecutor;
-
-        displayConnectionMessages = false;
-    }
-
-
-    @Override
-    protected void onStart() {
-        aapsLogger.debug(LTag.PUMP, this.deviceID() + " started.");
-
-        serviceConnection = new ServiceConnection() {
-
-            public void onServiceDisconnected(ComponentName name) {
-                aapsLogger.debug(LTag.PUMP, "RileyLinkMedtronicService is disconnected");
-                rileyLinkMedtronicService = null;
-            }
-
-            public void onServiceConnected(ComponentName name, IBinder service) {
-                aapsLogger.debug(LTag.PUMP, "RileyLinkMedtronicService is connected");
-                RileyLinkMedtronicService.LocalBinder mLocalBinder = (RileyLinkMedtronicService.LocalBinder) service;
-                rileyLinkMedtronicService = mLocalBinder.getServiceInstance();
-                rileyLinkMedtronicService.verifyConfiguration();
-
-                new Thread(() -> {
-
-                    for (int i = 0; i < 20; i++) {
-                        SystemClock.sleep(5000);
-
-                        aapsLogger.debug(LTag.PUMP, "Starting Medtronic-RileyLink service");
-                        if (rileyLinkMedtronicService.setNotInPreInit()) {
-                            break;
-                        }
-                    }
-                }).start();
-            }
-        };
-
-        super.onStart();
-    }
-
-    @Override
-    public void updatePreferenceSummary(@NonNull Preference pref) {
-        super.updatePreferenceSummary(pref);
-
-        if (pref.getKey().equals(getResourceHelper().gs(R.string.key_rileylink_mac_address))) {
-            String value = sp.getStringOrNull(R.string.key_rileylink_mac_address, null);
-            pref.setSummary(value == null ? getResourceHelper().gs(R.string.not_set_short) : value);
-        }
-    }
-
-    private String getLogPrefix() {
-        return "MedtronicPumpPlugin::";
-    }
-
-    @Override
-    public void initPumpStatusData() {
-
-        medtronicPumpStatus.lastConnection = sp.getLong(RileyLinkConst.Prefs.LastGoodDeviceCommunicationTime, 0L);
-        medtronicPumpStatus.lastDataTime = medtronicPumpStatus.lastConnection;
-        medtronicPumpStatus.previousConnection = medtronicPumpStatus.lastConnection;
-
-        //if (rileyLinkMedtronicService != null) rileyLinkMedtronicService.verifyConfiguration();
-
-        aapsLogger.debug(LTag.PUMP, "initPumpStatusData: " + this.medtronicPumpStatus);
-
-        // this is only thing that can change, by being configured
-        pumpDescription.setMaxTempAbsolute((medtronicPumpStatus.maxBasal != null) ? medtronicPumpStatus.maxBasal : 35.0d);
-
-        // set first Medtronic Pump Start
-        if (!sp.contains(MedtronicConst.Statistics.FirstPumpStart)) {
-            sp.putLong(MedtronicConst.Statistics.FirstPumpStart, System.currentTimeMillis());
-        }
-
-        migrateSettings();
-
-    }
-
-    @Override
-    public void triggerPumpConfigurationChangedEvent() {
-        rxBus.send(new EventMedtronicPumpConfigurationChanged());
-    }
-
-    private void migrateSettings() {
-
-        if ("US (916 MHz)".equals(sp.getString(MedtronicConst.Prefs.PumpFrequency, "US (916 MHz)"))) {
-            sp.putString(MedtronicConst.Prefs.PumpFrequency, getResourceHelper().gs(R.string.key_medtronic_pump_frequency_us_ca));
-        }
-
-        String encoding = sp.getString(MedtronicConst.Prefs.Encoding, "RileyLink 4b6b Encoding");
-
-        if ("RileyLink 4b6b Encoding".equals(encoding)) {
-            sp.putString(MedtronicConst.Prefs.Encoding, getResourceHelper().gs(R.string.key_medtronic_pump_encoding_4b6b_rileylink));
-        }
-
-        if ("Local 4b6b Encoding".equals(encoding)) {
-            sp.putString(MedtronicConst.Prefs.Encoding, getResourceHelper().gs(R.string.key_medtronic_pump_encoding_4b6b_local));
-        }
-    }
-
-
-    public void onStartCustomActions() {
-
-        // check status every minute (if any status needs refresh we send readStatus command)
-        new Thread(() -> {
-
-            do {
-                SystemClock.sleep(60000);
-
-                if (this.isInitialized) {
-
-                    Map<MedtronicStatusRefreshType, Long> statusRefresh = workWithStatusRefresh(
-                            StatusRefreshAction.GetData, null, null);
-
-                    if (doWeHaveAnyStatusNeededRefereshing(statusRefresh)) {
-                        if (!getCommandQueue().statusInQueue()) {
-                            getCommandQueue().readStatus("Scheduled Status Refresh", null);
-                        }
-                    }
-
-                    clearBusyQueue();
-                }
-
-            } while (serviceRunning);
-
-        }).start();
-    }
-
-
-    public Class getServiceClass() {
-        return RileyLinkMedtronicService.class;
-    }
-
-    @Override public PumpStatus getPumpStatusData() {
-        return medtronicPumpStatus;
-    }
-
-    @Override
-    public String deviceID() {
-        return "Medtronic";
-    }
-
-
-    @Override
-    public boolean isFakingTempsByExtendedBoluses() {
-        return false;
-    }
-
-
-    @Override
-    public boolean canHandleDST() {
-        return false;
-    }
-
-
-    // Pump Plugin
-
-    private boolean isServiceSet() {
-        return rileyLinkMedtronicService != null;
-    }
-
-    @Nullable
-    public RileyLinkMedtronicService getRileyLinkService() {
-        return rileyLinkMedtronicService;
-    }
-
-    @Override public RileyLinkPumpInfo getPumpInfo() {
-        String frequency = resourceHelper.gs(medtronicPumpStatus.pumpFrequency.equals("medtronic_pump_frequency_us_ca") ? R.string.medtronic_pump_frequency_us_ca : R.string.medtronic_pump_frequency_worldwide);
-        String model = medtronicPumpStatus.medtronicDeviceType == null ? "???" : "Medtronic " + medtronicPumpStatus.medtronicDeviceType.getPumpModel();
-        String serialNumber = medtronicPumpStatus.serialNumber;
-        return new RileyLinkPumpInfo(frequency, model, serialNumber);
-    }
-
-    @Override public long getLastConnectionTimeMillis() {
-        return medtronicPumpStatus.lastConnection;
-    }
-
-    @Override public void setLastCommunicationToNow() {
-        medtronicPumpStatus.setLastCommunicationToNow();
-    }
-
-    @Override
-    public boolean isInitialized() {
-        if (displayConnectionMessages)
-            aapsLogger.debug(LTag.PUMP, "MedtronicPumpPlugin::isInitialized");
-        return isServiceSet() && isInitialized;
-    }
-
-
-    @Override
-    public void setBusy(boolean busy) {
-        isBusy = busy;
-    }
-
-    @Override
-    public boolean isBusy() {
-        if (displayConnectionMessages)
-            aapsLogger.debug(LTag.PUMP, "MedtronicPumpPlugin::isBusy");
-
-        if (isServiceSet()) {
-
-            if (isBusy)
-                return true;
-
-            if (busyTimestamps.size() > 0) {
-
-                clearBusyQueue();
-
-                return busyTimestamps.size() > 0;
-            }
-        }
-
-        return false;
-    }
-
-
-    private synchronized void clearBusyQueue() {
-
-        if (busyTimestamps.size() == 0) {
-            return;
-        }
-
-        Set<Long> deleteFromQueue = new HashSet<>();
-
-        for (Long busyTimestamp : busyTimestamps) {
-
-            if (System.currentTimeMillis() > busyTimestamp) {
-                deleteFromQueue.add(busyTimestamp);
-            }
-        }
-
-        if (deleteFromQueue.size() == busyTimestamps.size()) {
-            busyTimestamps.clear();
-            setEnableCustomAction(MedtronicCustomActionType.ClearBolusBlock, false);
-        }
-
-        if (deleteFromQueue.size() > 0) {
-            busyTimestamps.removeAll(deleteFromQueue);
-        }
-
-    }
-
-
-    @Override
-    public boolean isConnected() {
-        if (displayConnectionMessages)
-            aapsLogger.debug(LTag.PUMP, "MedtronicPumpPlugin::isConnected");
-        return isServiceSet() && rileyLinkMedtronicService.isInitialized();
-    }
-
-
-    @Override
-    public boolean isConnecting() {
-        if (displayConnectionMessages)
-            aapsLogger.debug(LTag.PUMP, "MedtronicPumpPlugin::isConnecting");
-        return !isServiceSet() || !rileyLinkMedtronicService.isInitialized();
-    }
-
-
-    @Override
-    public void getPumpStatus(String reason) {
-        boolean needRefresh = true;
-
-        if (firstRun) {
-            needRefresh = initializePump(!isRefresh);
-        } else {
-            refreshAnyStatusThatNeedsToBeRefreshed();
-        }
-
-        if (needRefresh)
-            rxBus.send(new EventMedtronicPumpValuesChanged());
-    }
-
-
-    void resetStatusState() {
-        firstRun = true;
-        isRefresh = true;
-    }
-
-
-    private boolean isPumpNotReachable() {
-
-        RileyLinkServiceState rileyLinkServiceState = rileyLinkServiceData.rileyLinkServiceState;
-
-        if (rileyLinkServiceState == null) {
-            aapsLogger.debug(LTag.PUMP, "RileyLink unreachable. RileyLinkServiceState is null.");
-            return false;
-        }
-
-        if (rileyLinkServiceState != RileyLinkServiceState.PumpConnectorReady //
-                && rileyLinkServiceState != RileyLinkServiceState.RileyLinkReady //
-                && rileyLinkServiceState != RileyLinkServiceState.TuneUpDevice) {
-            aapsLogger.debug(LTag.PUMP, "RileyLink unreachable.");
-            return false;
-        }
-
-        return (!rileyLinkMedtronicService.getDeviceCommunicationManager().isDeviceReachable());
-    }
-
-
-    private void refreshAnyStatusThatNeedsToBeRefreshed() {
-
-        Map<MedtronicStatusRefreshType, Long> statusRefresh = workWithStatusRefresh(StatusRefreshAction.GetData, null,
-                null);
-
-        if (!doWeHaveAnyStatusNeededRefereshing(statusRefresh)) {
-            return;
-        }
-
-        boolean resetTime = false;
-
-        if (isPumpNotReachable()) {
-            aapsLogger.error("Pump unreachable.");
-            medtronicUtil.sendNotification(MedtronicNotificationType.PumpUnreachable, getResourceHelper(), rxBus);
-
-            return;
-        }
-
-        medtronicUtil.dismissNotification(MedtronicNotificationType.PumpUnreachable, rxBus);
-
-
-        if (hasTimeDateOrTimeZoneChanged) {
-
-            checkTimeAndOptionallySetTime();
-
-            // read time if changed, set new time
-            hasTimeDateOrTimeZoneChanged = false;
-        }
-
-
-        // execute
-        Set<MedtronicStatusRefreshType> refreshTypesNeededToReschedule = new HashSet<>();
-
-        for (Map.Entry<MedtronicStatusRefreshType, Long> refreshType : statusRefresh.entrySet()) {
-
-            if (refreshType.getValue() > 0 && System.currentTimeMillis() > refreshType.getValue()) {
-
-                switch (refreshType.getKey()) {
-                    case PumpHistory: {
-                        readPumpHistory();
-                    }
-                    break;
-
-                    case PumpTime: {
-                        checkTimeAndOptionallySetTime();
-                        refreshTypesNeededToReschedule.add(refreshType.getKey());
-                        resetTime = true;
-                    }
-                    break;
-
-                    case BatteryStatus:
-                    case RemainingInsulin: {
-                        rileyLinkMedtronicService.getMedtronicUIComm().executeCommand(refreshType.getKey().getCommandType(medtronicUtil.getMedtronicPumpModel()));
-                        refreshTypesNeededToReschedule.add(refreshType.getKey());
-                        resetTime = true;
-                    }
-                    break;
-
-                    case Configuration: {
-                        rileyLinkMedtronicService.getMedtronicUIComm().executeCommand(refreshType.getKey().getCommandType(medtronicUtil.getMedtronicPumpModel()));
-                        resetTime = true;
-                    }
-                    break;
-                }
-            }
-
-            // reschedule
-            for (MedtronicStatusRefreshType refreshType2 : refreshTypesNeededToReschedule) {
-                scheduleNextRefresh(refreshType2);
-            }
-
-        }
-
-        if (resetTime)
-            medtronicPumpStatus.setLastCommunicationToNow();
-
-    }
-
-
-    private boolean doWeHaveAnyStatusNeededRefereshing(Map<MedtronicStatusRefreshType, Long> statusRefresh) {
-
-        for (Map.Entry<MedtronicStatusRefreshType, Long> refreshType : statusRefresh.entrySet()) {
-
-            if (refreshType.getValue() > 0 && System.currentTimeMillis() > refreshType.getValue()) {
-                return true;
-            }
-        }
-
-        return hasTimeDateOrTimeZoneChanged;
-    }
-
-
-    private void setRefreshButtonEnabled(boolean enabled) {
-        rxBus.send(new EventRefreshButtonState(enabled));
-    }
-
-
-    private boolean initializePump(boolean realInit) {
-
-        if (rileyLinkMedtronicService == null)
-            return false;
-
-        aapsLogger.info(LTag.PUMP, getLogPrefix() + "initializePump - start");
-
-        rileyLinkMedtronicService.getDeviceCommunicationManager().setDoWakeUpBeforeCommand(false);
-
-        setRefreshButtonEnabled(false);
-
-        if (isRefresh) {
-            if (isPumpNotReachable()) {
-                aapsLogger.error(getLogPrefix() + "initializePump::Pump unreachable.");
-                medtronicUtil.sendNotification(MedtronicNotificationType.PumpUnreachable, getResourceHelper(), rxBus);
-
-                setRefreshButtonEnabled(true);
-
-                return true;
-            }
-
-            medtronicUtil.dismissNotification(MedtronicNotificationType.PumpUnreachable, rxBus);
-        }
-
-        // model (once)
-        if (medtronicUtil.getMedtronicPumpModel() == null) {
-            rileyLinkMedtronicService.getMedtronicUIComm().executeCommand(MedtronicCommandType.PumpModel);
-        } else {
-            if (medtronicPumpStatus.medtronicDeviceType != medtronicUtil.getMedtronicPumpModel()) {
-                aapsLogger.warn(LTag.PUMP, getLogPrefix() + "Configured pump is not the same as one detected.");
-                medtronicUtil.sendNotification(MedtronicNotificationType.PumpTypeNotSame, getResourceHelper(), rxBus);
-            }
-        }
-
-        this.pumpState = PumpDriverState.Connected;
-
-        // time (1h)
-        checkTimeAndOptionallySetTime();
-
-        readPumpHistory();
-
-        // remaining insulin (>50 = 4h; 50-20 = 1h; 15m)
-        rileyLinkMedtronicService.getMedtronicUIComm().executeCommand(MedtronicCommandType.GetRemainingInsulin);
-        scheduleNextRefresh(MedtronicStatusRefreshType.RemainingInsulin, 10);
-
-        // remaining power (1h)
-        rileyLinkMedtronicService.getMedtronicUIComm().executeCommand(MedtronicCommandType.GetBatteryStatus);
-        scheduleNextRefresh(MedtronicStatusRefreshType.BatteryStatus, 20);
-
-        // configuration (once and then if history shows config changes)
-        rileyLinkMedtronicService.getMedtronicUIComm().executeCommand(MedtronicCommandType.getSettings(medtronicUtil.getMedtronicPumpModel()));
-
-        // read profile (once, later its controlled by isThisProfileSet method)
-        getBasalProfiles();
-
-        int errorCount = rileyLinkMedtronicService.getMedtronicUIComm().getInvalidResponsesCount();
-
-        if (errorCount >= 5) {
-            aapsLogger.error("Number of error counts was 5 or more. Starting tunning.");
-            setRefreshButtonEnabled(true);
-            serviceTaskExecutor.startTask(new WakeAndTuneTask(getInjector()));
-            return true;
-        }
-
-        medtronicPumpStatus.setLastCommunicationToNow();
-        setRefreshButtonEnabled(true);
-
-        if (!isRefresh) {
-            pumpState = PumpDriverState.Initialized;
-        }
-
-        isInitialized = true;
-        // this.pumpState = PumpDriverState.Initialized;
-
-        this.firstRun = false;
-
-        return true;
-    }
-
-    private void getBasalProfiles() {
-
-        MedtronicUITask medtronicUITask = rileyLinkMedtronicService.getMedtronicUIComm().executeCommand(MedtronicCommandType.GetBasalProfileSTD);
-
-        if (medtronicUITask.getResponseType() == MedtronicUIResponseType.Error) {
-            rileyLinkMedtronicService.getMedtronicUIComm().executeCommand(MedtronicCommandType.GetBasalProfileSTD);
-        }
-    }
-
-
-    @Override
-    public boolean isThisProfileSet(@NonNull Profile profile) {
-        aapsLogger.debug(LTag.PUMP, "isThisProfileSet: basalInitalized=" + medtronicPumpStatus.basalProfileStatus);
-
-        if (!isInitialized)
-            return true;
-
-        if (medtronicPumpStatus.basalProfileStatus == BasalProfileStatus.NotInitialized) {
-            // this shouldn't happen, but if there was problem we try again
-            getBasalProfiles();
-            return isProfileSame(profile);
-        } else if (medtronicPumpStatus.basalProfileStatus == BasalProfileStatus.ProfileChanged) {
-            return false;
-        }
-
-        return (medtronicPumpStatus.basalProfileStatus != BasalProfileStatus.ProfileOK) || isProfileSame(profile);
-    }
-
-
-    private boolean isProfileSame(Profile profile) {
-
-        boolean invalid = false;
-        Double[] basalsByHour = medtronicPumpStatus.basalsByHour;
-
-        aapsLogger.debug(LTag.PUMP, "Current Basals (h):   "
-                + (basalsByHour == null ? "null" : BasalProfile.getProfilesByHourToString(basalsByHour)));
-
-        // int index = 0;
-
-        if (basalsByHour == null)
-            return true; // we don't want to set profile again, unless we are sure
-
-        StringBuilder stringBuilder = new StringBuilder("Requested Basals (h): ");
-
-        for (Profile.ProfileValue basalValue : profile.getBasalValues()) {
-
-            double basalValueValue = pumpDescription.getPumpType().determineCorrectBasalSize(basalValue.getValue());
-
-            int hour = basalValue.getTimeAsSeconds() / (60 * 60);
-
-            if (!MedtronicUtil.isSame(basalsByHour[hour], basalValueValue)) {
-                invalid = true;
-            }
-
-            stringBuilder.append(String.format(Locale.ENGLISH, "%.3f", basalValueValue));
-            stringBuilder.append(" ");
-        }
-
-        aapsLogger.debug(LTag.PUMP, stringBuilder.toString());
-
-        if (!invalid) {
-            aapsLogger.debug(LTag.PUMP, "Basal profile is same as AAPS one.");
-        } else {
-            aapsLogger.debug(LTag.PUMP, "Basal profile on Pump is different than the AAPS one.");
-        }
-
-        return (!invalid);
-    }
-
-
-    @Override
-    public long lastDataTime() {
-
-        if (medtronicPumpStatus.lastConnection != 0) {
-            return medtronicPumpStatus.lastConnection;
-        }
-
-        return System.currentTimeMillis();
-    }
-
-
-    @Override
-    public double getBaseBasalRate() {
-        return medtronicPumpStatus.getBasalProfileForHour();
-    }
-
-
-    @Override
-    public double getReservoirLevel() {
-        return medtronicPumpStatus.reservoirRemainingUnits;
-    }
-
-
-    @Override
-    public int getBatteryLevel() {
-        return medtronicPumpStatus.batteryRemaining;
-    }
-
-    protected void triggerUIChange() {
-        rxBus.send(new EventMedtronicPumpValuesChanged());
-    }
-
-    private BolusDeliveryType bolusDeliveryType = BolusDeliveryType.Idle;
-
-    private enum BolusDeliveryType {
-        Idle, //
-        DeliveryPrepared, //
-        Delivering, //
-        CancelDelivery
-    }
-
-
-    private void checkTimeAndOptionallySetTime() {
-
-        aapsLogger.info(LTag.PUMP, "MedtronicPumpPlugin::checkTimeAndOptionallySetTime - Start");
-
-        setRefreshButtonEnabled(false);
-
-        if (isPumpNotReachable()) {
-            aapsLogger.debug(LTag.PUMP, "MedtronicPumpPlugin::checkTimeAndOptionallySetTime - Pump Unreachable.");
-            setRefreshButtonEnabled(true);
-            return;
-        }
-
-        medtronicUtil.dismissNotification(MedtronicNotificationType.PumpUnreachable, rxBus);
-
-        rileyLinkMedtronicService.getMedtronicUIComm().executeCommand(MedtronicCommandType.GetRealTimeClock);
-
-        ClockDTO clock = medtronicUtil.getPumpTime();
-
-        if (clock == null) { // retry
-            rileyLinkMedtronicService.getMedtronicUIComm().executeCommand(MedtronicCommandType.GetRealTimeClock);
-
-            clock = medtronicUtil.getPumpTime();
-        }
-
-        if (clock == null)
-            return;
-
-        int timeDiff = Math.abs(clock.timeDifference);
-
-        if (timeDiff > 20) {
-
-            if ((clock.localDeviceTime.getYear() <= 2015) || (timeDiff <= 24 * 60 * 60)) {
-
-                aapsLogger.info(LTag.PUMP, String.format(Locale.ENGLISH, "MedtronicPumpPlugin::checkTimeAndOptionallySetTime - Time difference is %d s. Set time on pump.", timeDiff));
-
-                rileyLinkMedtronicService.getMedtronicUIComm().executeCommand(MedtronicCommandType.SetRealTimeClock);
-
-                if (clock.timeDifference == 0) {
-                    Notification notification = new Notification(Notification.INSIGHT_DATE_TIME_UPDATED, getResourceHelper().gs(R.string.pump_time_updated), Notification.INFO, 60);
-                    rxBus.send(new EventNewNotification(notification));
-                }
-            } else {
-                if ((clock.localDeviceTime.getYear() > 2015)) {
-                    aapsLogger.error(String.format(Locale.ENGLISH, "MedtronicPumpPlugin::checkTimeAndOptionallySetTime - Time difference over 24h requested [diff=%d s]. Doing nothing.", timeDiff));
-                    medtronicUtil.sendNotification(MedtronicNotificationType.TimeChangeOver24h, getResourceHelper(), rxBus);
-                }
-            }
-
-        } else {
-            aapsLogger.info(LTag.PUMP, String.format(Locale.ENGLISH, "MedtronicPumpPlugin::checkTimeAndOptionallySetTime - Time difference is %d s. Do nothing.", timeDiff));
-        }
-
-        scheduleNextRefresh(MedtronicStatusRefreshType.PumpTime, 0);
-    }
-
-
-    @NonNull
-    protected PumpEnactResult deliverBolus(final DetailedBolusInfo detailedBolusInfo) {
-
-        aapsLogger.info(LTag.PUMP, "MedtronicPumpPlugin::deliverBolus - " + BolusDeliveryType.DeliveryPrepared);
-
-        setRefreshButtonEnabled(false);
-
-        if (detailedBolusInfo.insulin > medtronicPumpStatus.reservoirRemainingUnits) {
-            return new PumpEnactResult(getInjector()) //
-                    .success(false) //
-                    .enacted(false) //
-                    .comment(getResourceHelper().gs(R.string.medtronic_cmd_bolus_could_not_be_delivered_no_insulin,
-                            medtronicPumpStatus.reservoirRemainingUnits,
-                            detailedBolusInfo.insulin));
-        }
-
-        bolusDeliveryType = BolusDeliveryType.DeliveryPrepared;
-
-        if (isPumpNotReachable()) {
-            aapsLogger.debug(LTag.PUMP, "MedtronicPumpPlugin::deliverBolus - Pump Unreachable.");
-            return setNotReachable(true, false);
-        }
-
-        medtronicUtil.dismissNotification(MedtronicNotificationType.PumpUnreachable, rxBus);
-
-        if (bolusDeliveryType == BolusDeliveryType.CancelDelivery) {
-            // LOG.debug("MedtronicPumpPlugin::deliverBolus - Delivery Canceled.");
-            return setNotReachable(true, true);
-        }
-
-        // LOG.debug("MedtronicPumpPlugin::deliverBolus - Starting wait period.");
-
-        int sleepTime = sp.getInt(MedtronicConst.Prefs.BolusDelay, 10) * 1000;
-
-        SystemClock.sleep(sleepTime);
-
-        if (bolusDeliveryType == BolusDeliveryType.CancelDelivery) {
-            // LOG.debug("MedtronicPumpPlugin::deliverBolus - Delivery Canceled, before wait period.");
-            return setNotReachable(true, true);
-        }
-
-        // LOG.debug("MedtronicPumpPlugin::deliverBolus - End wait period. Start delivery");
-
-        try {
-
-            bolusDeliveryType = BolusDeliveryType.Delivering;
-
-            // LOG.debug("MedtronicPumpPlugin::deliverBolus - Start delivery");
-
-            MedtronicUITask responseTask = rileyLinkMedtronicService.getMedtronicUIComm().executeCommand(MedtronicCommandType.SetBolus,
-                    detailedBolusInfo.insulin);
-
-            Boolean response = (Boolean) responseTask.returnData;
-
-            setRefreshButtonEnabled(true);
-
-            // LOG.debug("MedtronicPumpPlugin::deliverBolus - Response: {}", response);
-
-            if (response) {
-
-                if (bolusDeliveryType == BolusDeliveryType.CancelDelivery) {
-                    // LOG.debug("MedtronicPumpPlugin::deliverBolus - Delivery Canceled after Bolus started.");
-
-                    new Thread(() -> {
-                        // Looper.prepare();
-                        // LOG.debug("MedtronicPumpPlugin::deliverBolus - Show dialog - before");
-                        SystemClock.sleep(2000);
-                        // LOG.debug("MedtronicPumpPlugin::deliverBolus - Show dialog. Context: "
-                        // + MainApp.instance().getApplicationContext());
-
-                        ErrorHelperActivity.Companion.runAlarm(context, getResourceHelper().gs(R.string.medtronic_cmd_cancel_bolus_not_supported), getResourceHelper().gs(R.string.medtronic_warning), R.raw.boluserror);
-                    }).start();
-                }
-
-                long now = System.currentTimeMillis();
-
-                detailedBolusInfo.timestamp = now;
-                detailedBolusInfo.deliverAtTheLatest = now; // not sure about that one
-
-                activePlugin.getActiveTreatments().addToHistoryTreatment(detailedBolusInfo, true);
-
-                // we subtract insulin, exact amount will be visible with next remainingInsulin update.
-                medtronicPumpStatus.reservoirRemainingUnits -= detailedBolusInfo.insulin;
-
-                incrementStatistics(detailedBolusInfo.getBolusType() == DetailedBolusInfo.BolusType.SMB ? MedtronicConst.Statistics.SMBBoluses
-                        : MedtronicConst.Statistics.StandardBoluses);
-
-
-                // calculate time for bolus and set driver to busy for that time
-                int bolusTime = (int) (detailedBolusInfo.insulin * 42.0d);
-                long time = now + (bolusTime * 1000);
-
-                this.busyTimestamps.add(time);
-                setEnableCustomAction(MedtronicCustomActionType.ClearBolusBlock, true);
-
-                return new PumpEnactResult(getInjector()).success(true) //
-                        .enacted(true) //
-                        .bolusDelivered(detailedBolusInfo.insulin) //
-                        .carbsDelivered(detailedBolusInfo.carbs);
-
-            } else {
-                return new PumpEnactResult(getInjector()) //
-                        .success(bolusDeliveryType == BolusDeliveryType.CancelDelivery) //
-                        .enacted(false) //
-                        .comment(R.string.medtronic_cmd_bolus_could_not_be_delivered);
-            }
-
-        } finally {
-            finishAction("Bolus");
-            this.bolusDeliveryType = BolusDeliveryType.Idle;
-        }
-    }
-
-
-    private PumpEnactResult setNotReachable(boolean isBolus, boolean success) {
-        setRefreshButtonEnabled(true);
-
-        if (isBolus) {
-            bolusDeliveryType = BolusDeliveryType.Idle;
-        }
-
-        if (success) {
-            return new PumpEnactResult(getInjector()) //
-                    .success(true) //
-                    .enacted(false);
-        } else {
-            return new PumpEnactResult(getInjector()) //
-                    .success(false) //
-                    .enacted(false) //
-                    .comment(R.string.medtronic_pump_status_pump_unreachable);
-        }
-    }
-
-
-    public void stopBolusDelivering() {
-
-        this.bolusDeliveryType = BolusDeliveryType.CancelDelivery;
-
-        // if (isLoggingEnabled())
-        // LOG.warn("MedtronicPumpPlugin::deliverBolus - Stop Bolus Delivery.");
-    }
-
-
-    private void incrementStatistics(String statsKey) {
-        long currentCount = sp.getLong(statsKey, 0L);
-        currentCount++;
-        sp.putLong(statsKey, currentCount);
-    }
-
-
-    // if enforceNew===true current temp basal is canceled and new TBR set (duration is prolonged),
-    // if false and the same rate is requested enacted=false and success=true is returned and TBR is not changed
-    @NonNull @Override
-    public PumpEnactResult setTempBasalAbsolute(double absoluteRate, int durationInMinutes, Profile profile, boolean enforceNew, @NonNull PumpSync.TemporaryBasalType tbrType) {
-
-        setRefreshButtonEnabled(false);
-
-        if (isPumpNotReachable()) {
-
-            setRefreshButtonEnabled(true);
-
-            return new PumpEnactResult(getInjector()) //
-                    .success(false) //
-                    .enacted(false) //
-                    .comment(R.string.medtronic_pump_status_pump_unreachable);
-        }
-
-        medtronicUtil.dismissNotification(MedtronicNotificationType.PumpUnreachable, rxBus);
-
-        aapsLogger.info(LTag.PUMP, getLogPrefix() + "setTempBasalAbsolute: rate: " + absoluteRate + ", duration=" + durationInMinutes);
-
-        // read current TBR
-        TempBasalPair tbrCurrent = readTBR();
-
-        if (tbrCurrent == null) {
-            aapsLogger.warn(LTag.PUMP, getLogPrefix() + "setTempBasalAbsolute - Could not read current TBR, canceling operation.");
-            finishAction("TBR");
-            return new PumpEnactResult(getInjector()).success(false).enacted(false)
-                    .comment(R.string.medtronic_cmd_cant_read_tbr);
-        } else {
-            aapsLogger.info(LTag.PUMP, getLogPrefix() + "setTempBasalAbsolute: Current Basal: duration: " + tbrCurrent.getDurationMinutes() + " min, rate=" + tbrCurrent.getInsulinRate());
-        }
-
-        if (!enforceNew) {
-
-            if (MedtronicUtil.isSame(tbrCurrent.getInsulinRate(), absoluteRate)) {
-
-                boolean sameRate = true;
-                if (MedtronicUtil.isSame(0.0d, absoluteRate) && durationInMinutes > 0) {
-                    // if rate is 0.0 and duration>0 then the rate is not the same
-                    sameRate = false;
-                }
-
-                if (sameRate) {
-                    aapsLogger.info(LTag.PUMP, getLogPrefix() + "setTempBasalAbsolute - No enforceNew and same rate. Exiting.");
-                    finishAction("TBR");
-                    return new PumpEnactResult(getInjector()).success(true).enacted(false);
-                }
-            }
-            // if not the same rate, we cancel and start new
-        }
-
-        // if TBR is running we will cancel it.
-        if (tbrCurrent.getInsulinRate() != 0.0f && tbrCurrent.getDurationMinutes() > 0) {
-            aapsLogger.info(LTag.PUMP, getLogPrefix() + "setTempBasalAbsolute - TBR running - so canceling it.");
-
-            // CANCEL
-
-            MedtronicUITask responseTask2 = rileyLinkMedtronicService.getMedtronicUIComm().executeCommand(MedtronicCommandType.CancelTBR);
-
-            Boolean response = (Boolean) responseTask2.returnData;
-
-            if (response) {
-                aapsLogger.info(LTag.PUMP, getLogPrefix() + "setTempBasalAbsolute - Current TBR cancelled.");
-            } else {
-                aapsLogger.error(getLogPrefix() + "setTempBasalAbsolute - Cancel TBR failed.");
-
-                finishAction("TBR");
-
-                return new PumpEnactResult(getInjector()).success(false).enacted(false)
-                        .comment(R.string.medtronic_cmd_cant_cancel_tbr_stop_op);
-            }
-        }
-
-        // now start new TBR
-        MedtronicUITask responseTask = rileyLinkMedtronicService.getMedtronicUIComm().executeCommand(MedtronicCommandType.SetTemporaryBasal,
-                absoluteRate, durationInMinutes);
-
-        Boolean response = (Boolean) responseTask.returnData;
-
-        aapsLogger.info(LTag.PUMP, getLogPrefix() + "setTempBasalAbsolute - setTBR. Response: " + response);
-
-        if (response) {
-            // FIXME put this into UIPostProcessor
-            medtronicPumpStatus.tempBasalStart = new Date();
-            medtronicPumpStatus.tempBasalAmount = absoluteRate;
-            medtronicPumpStatus.tempBasalLength = durationInMinutes;
-
-            TemporaryBasal tempStart = new TemporaryBasal(getInjector()) //
-                    .date(System.currentTimeMillis()) //
-                    .duration(durationInMinutes) //
-                    .absolute(absoluteRate) //
-                    .source(Source.USER);
-
-            activePlugin.getActiveTreatments().addToHistoryTempBasal(tempStart);
-
-            incrementStatistics(MedtronicConst.Statistics.TBRsSet);
-
-            finishAction("TBR");
-
-            return new PumpEnactResult(getInjector()).success(true).enacted(true) //
-                    .absolute(absoluteRate).duration(durationInMinutes);
-
-        } else {
-            finishAction("TBR");
-
-            return new PumpEnactResult(getInjector()).success(false).enacted(false) //
-                    .comment(R.string.medtronic_cmd_tbr_could_not_be_delivered);
-        }
-
-    }
-
-
-    @NonNull @Override
-    public PumpEnactResult setTempBasalPercent(int percent, int durationInMinutes, @NonNull Profile profile, boolean enforceNew, @NonNull PumpSync.TemporaryBasalType tbrType) {
-        if (percent == 0) {
-            return setTempBasalAbsolute(0.0d, durationInMinutes, profile, enforceNew, tbrType);
-        } else {
-            double absoluteValue = profile.getBasal() * (percent / 100.0d);
-            absoluteValue = pumpDescription.getPumpType().determineCorrectBasalSize(absoluteValue);
-            aapsLogger.warn(LTag.PUMP, "setTempBasalPercent [MedtronicPumpPlugin] - You are trying to use setTempBasalPercent with percent other then 0% (" + percent + "). This will start setTempBasalAbsolute, with calculated value (" + absoluteValue + "). Result might not be 100% correct.");
-            return setTempBasalAbsolute(absoluteValue, durationInMinutes, profile, enforceNew, tbrType);
-        }
-    }
-
-
-    private void finishAction(String overviewKey) {
-
-        if (overviewKey != null)
-            rxBus.send(new EventRefreshOverview(overviewKey, false));
-
-        triggerUIChange();
-
-        setRefreshButtonEnabled(true);
-    }
-
-
-    private void readPumpHistory() {
-
-//        if (isLoggingEnabled())
-//            LOG.error(getLogPrefix() + "readPumpHistory WIP.");
-
-        readPumpHistoryLogic();
-
-        scheduleNextRefresh(MedtronicStatusRefreshType.PumpHistory);
-
-        if (medtronicHistoryData.hasRelevantConfigurationChanged()) {
-            scheduleNextRefresh(MedtronicStatusRefreshType.Configuration, -1);
-        }
-
-        if (medtronicHistoryData.hasPumpTimeChanged()) {
-            scheduleNextRefresh(MedtronicStatusRefreshType.PumpTime, -1);
-        }
-
-        if (this.medtronicPumpStatus.basalProfileStatus != BasalProfileStatus.NotInitialized
-                && medtronicHistoryData.hasBasalProfileChanged()) {
-            medtronicHistoryData.processLastBasalProfileChange(pumpDescription.getPumpType(), medtronicPumpStatus);
-        }
-
-        PumpDriverState previousState = this.pumpState;
-
-        if (medtronicHistoryData.isPumpSuspended()) {
-            this.pumpState = PumpDriverState.Suspended;
-            aapsLogger.debug(LTag.PUMP, getLogPrefix() + "isPumpSuspended: true");
-        } else {
-            if (previousState == PumpDriverState.Suspended) {
-                this.pumpState = PumpDriverState.Ready;
-            }
-            aapsLogger.debug(LTag.PUMP, getLogPrefix() + "isPumpSuspended: false");
-        }
-
-        medtronicHistoryData.processNewHistoryData();
-
-        this.medtronicHistoryData.finalizeNewHistoryRecords();
-        // this.medtronicHistoryData.setLastHistoryRecordTime(this.lastPumpHistoryEntry.atechDateTime);
-
-    }
-
-
-    private void readPumpHistoryLogic() {
-
-        boolean debugHistory = false;
-
-        LocalDateTime targetDate = null;
-
-        if (lastPumpHistoryEntry == null) {
-
-            if (debugHistory)
-                aapsLogger.debug(LTag.PUMP, getLogPrefix() + "readPumpHistoryLogic(): lastPumpHistoryEntry: null");
-
-            Long lastPumpHistoryEntryTime = getLastPumpEntryTime();
-
-            LocalDateTime timeMinus36h = new LocalDateTime();
-            timeMinus36h = timeMinus36h.minusHours(36);
-            medtronicHistoryData.setIsInInit(true);
-
-            if (lastPumpHistoryEntryTime == 0L) {
-                if (debugHistory)
-                    aapsLogger.debug(LTag.PUMP, getLogPrefix() + "readPumpHistoryLogic(): lastPumpHistoryEntryTime: 0L - targetDate: "
-                            + targetDate);
-                targetDate = timeMinus36h;
-            } else {
-                // LocalDateTime lastHistoryRecordTime = DateTimeUtil.toLocalDateTime(lastPumpHistoryEntryTime);
-
-                if (debugHistory)
-                    aapsLogger.debug(LTag.PUMP, getLogPrefix() + "readPumpHistoryLogic(): lastPumpHistoryEntryTime: " + lastPumpHistoryEntryTime + " - targetDate: " + targetDate);
-
-                medtronicHistoryData.setLastHistoryRecordTime(lastPumpHistoryEntryTime);
-
-                LocalDateTime lastHistoryRecordTime = DateTimeUtil.toLocalDateTime(lastPumpHistoryEntryTime);
-
-                lastHistoryRecordTime = lastHistoryRecordTime.minusHours(12); // we get last 12 hours of history to
-                // determine pump state
-                // (we don't process that data), we process only
-
-                if (timeMinus36h.isAfter(lastHistoryRecordTime)) {
-                    targetDate = timeMinus36h;
-                }
-
-                targetDate = (timeMinus36h.isAfter(lastHistoryRecordTime) ? timeMinus36h : lastHistoryRecordTime);
-
-                if (debugHistory)
-                    aapsLogger.debug(LTag.PUMP, getLogPrefix() + "readPumpHistoryLogic(): targetDate: " + targetDate);
-            }
-        } else {
-            if (debugHistory)
-                aapsLogger.debug(LTag.PUMP, getLogPrefix() + "readPumpHistoryLogic(): lastPumpHistoryEntry: not null - " + medtronicUtil.gsonInstance.toJson(lastPumpHistoryEntry));
-            medtronicHistoryData.setIsInInit(false);
-            // medtronicHistoryData.setLastHistoryRecordTime(lastPumpHistoryEntry.atechDateTime);
-
-            // targetDate = lastPumpHistoryEntry.atechDateTime;
-        }
-
-        //aapsLogger.debug(LTag.PUMP, "HST: Target Date: " + targetDate);
-
-        MedtronicUITask responseTask2 = rileyLinkMedtronicService.getMedtronicUIComm().executeCommand(MedtronicCommandType.GetHistoryData,
-                lastPumpHistoryEntry, targetDate);
-
-        if (debugHistory)
-            aapsLogger.debug(LTag.PUMP, "HST: After task");
-
-        PumpHistoryResult historyResult = (PumpHistoryResult) responseTask2.returnData;
-
-        if (debugHistory)
-            aapsLogger.debug(LTag.PUMP, "HST: History Result: " + historyResult.toString());
-
-        PumpHistoryEntry latestEntry = historyResult.getLatestEntry();
-
-        if (debugHistory)
-            aapsLogger.debug(LTag.PUMP, getLogPrefix() + "Last entry: " + latestEntry);
-
-        if (latestEntry == null) // no new history to read
-            return;
-
-        this.lastPumpHistoryEntry = latestEntry;
-        sp.putLong(MedtronicConst.Statistics.LastPumpHistoryEntry, latestEntry.atechDateTime);
-
-        if (debugHistory)
-            aapsLogger.debug(LTag.PUMP, "HST: History: valid=" + historyResult.validEntries.size() + ", unprocessed=" + historyResult.unprocessedEntries.size());
-
-        this.medtronicHistoryData.addNewHistory(historyResult);
-        this.medtronicHistoryData.filterNewEntries();
-
-        // determine if first run, if yes detrmine how much of update do we need
-        // first run:
-        // get last hiostory entry, if not there download 1.5 days of data
-        // - there: check if last entry is older than 1.5 days
-        // - yes: download 1.5 days
-        // - no: download with last entry
-        // - not there: download 1.5 days
-        //
-        // upload all new entries to NightScout (TBR, Bolus)
-        // determine pump status
-        //
-        // save last entry
-        //
-        // not first run:
-        // update to last entry
-        // - save
-        // - determine pump status
-    }
-
-
-    private Long getLastPumpEntryTime() {
-        Long lastPumpEntryTime = sp.getLong(MedtronicConst.Statistics.LastPumpHistoryEntry, 0L);
-
-        try {
-            LocalDateTime localDateTime = DateTimeUtil.toLocalDateTime(lastPumpEntryTime);
-
-            if (localDateTime.getYear() != (new GregorianCalendar().get(Calendar.YEAR))) {
-                aapsLogger.warn(LTag.PUMP, "Saved LastPumpHistoryEntry was invalid. Year was not the same.");
-                return 0L;
-            }
-
-            return lastPumpEntryTime;
-
-        } catch (Exception ex) {
-            aapsLogger.warn(LTag.PUMP, "Saved LastPumpHistoryEntry was invalid.");
-            return 0L;
-        }
-
-    }
-
-
-    private void scheduleNextRefresh(MedtronicStatusRefreshType refreshType) {
-        scheduleNextRefresh(refreshType, 0);
-    }
-
-
-    private void scheduleNextRefresh(MedtronicStatusRefreshType refreshType, int additionalTimeInMinutes) {
-        switch (refreshType) {
-
-            case RemainingInsulin: {
-                double remaining = medtronicPumpStatus.reservoirRemainingUnits;
-                int min;
-                if (remaining > 50)
-                    min = 4 * 60;
-                else if (remaining > 20)
-                    min = 60;
-                else
-                    min = 15;
-
-                workWithStatusRefresh(StatusRefreshAction.Add, refreshType, getTimeInFutureFromMinutes(min));
-            }
-            break;
-
-            case PumpTime:
-            case Configuration:
-            case BatteryStatus:
-            case PumpHistory: {
-                workWithStatusRefresh(StatusRefreshAction.Add, refreshType,
-                        getTimeInFutureFromMinutes(refreshType.getRefreshTime() + additionalTimeInMinutes));
-            }
-            break;
-        }
-    }
-
-    private enum StatusRefreshAction {
-        Add, //
-        GetData
-    }
-
-
-    private synchronized Map<MedtronicStatusRefreshType, Long> workWithStatusRefresh(StatusRefreshAction action, //
-                                                                                     MedtronicStatusRefreshType statusRefreshType, //
-                                                                                     Long time) {
-
-        switch (action) {
-
-            case Add: {
-                statusRefreshMap.put(statusRefreshType, time);
-                return null;
-            }
-
-            case GetData: {
-                return new HashMap<>(statusRefreshMap);
-            }
-
-            default:
-                return null;
-
-        }
-
-    }
-
-
-    private long getTimeInFutureFromMinutes(int minutes) {
-        return System.currentTimeMillis() + getTimeInMs(minutes);
-    }
-
-
-    private long getTimeInMs(int minutes) {
-        return minutes * 60 * 1000L;
-    }
-
-
-    private TempBasalPair readTBR() {
-        MedtronicUITask responseTask = rileyLinkMedtronicService.getMedtronicUIComm().executeCommand(MedtronicCommandType.ReadTemporaryBasal);
-
-        if (responseTask.hasData()) {
-            TempBasalPair tbr = (TempBasalPair) responseTask.returnData;
-
-            // we sometimes get rate returned even if TBR is no longer running
-            if (tbr.getDurationMinutes() == 0) {
-                tbr.setInsulinRate(0.0d);
-            }
-
-            return tbr;
-        } else {
-            return null;
-        }
-    }
-
-
-    @NonNull @Override
-    public PumpEnactResult cancelTempBasal(boolean enforceNew) {
-
-        aapsLogger.info(LTag.PUMP, getLogPrefix() + "cancelTempBasal - started");
-
-        if (isPumpNotReachable()) {
-
-            setRefreshButtonEnabled(true);
-
-            return new PumpEnactResult(getInjector()) //
-                    .success(false) //
-                    .enacted(false) //
-                    .comment(R.string.medtronic_pump_status_pump_unreachable);
-        }
-
-        medtronicUtil.dismissNotification(MedtronicNotificationType.PumpUnreachable, rxBus);
-        setRefreshButtonEnabled(false);
-
-        TempBasalPair tbrCurrent = readTBR();
-
-        if (tbrCurrent != null) {
-            if (tbrCurrent.getInsulinRate() == 0.0f && tbrCurrent.getDurationMinutes() == 0) {
-                aapsLogger.info(LTag.PUMP, getLogPrefix() + "cancelTempBasal - TBR already canceled.");
-                finishAction("TBR");
-                return new PumpEnactResult(getInjector()).success(true).enacted(false);
-            }
-        } else {
-            aapsLogger.warn(LTag.PUMP, getLogPrefix() + "cancelTempBasal - Could not read currect TBR, canceling operation.");
-            finishAction("TBR");
-            return new PumpEnactResult(getInjector()).success(false).enacted(false)
-                    .comment(R.string.medtronic_cmd_cant_read_tbr);
-        }
-
-        MedtronicUITask responseTask2 = rileyLinkMedtronicService.getMedtronicUIComm().executeCommand(MedtronicCommandType.CancelTBR);
-
-        Boolean response = (Boolean) responseTask2.returnData;
-
-        finishAction("TBR");
-
-        if (response) {
-            aapsLogger.info(LTag.PUMP, getLogPrefix() + "cancelTempBasal - Cancel TBR successful.");
-
-            TemporaryBasal tempBasal = new TemporaryBasal(getInjector()) //
-                    .date(System.currentTimeMillis()) //
-                    .duration(0) //
-                    .source(Source.USER);
-
-            activePlugin.getActiveTreatments().addToHistoryTempBasal(tempBasal);
-
-            return new PumpEnactResult(getInjector()).success(true).enacted(true) //
-                    .isTempCancel(true);
-        } else {
-            aapsLogger.info(LTag.PUMP, getLogPrefix() + "cancelTempBasal - Cancel TBR failed.");
-
-            return new PumpEnactResult(getInjector()).success(response).enacted(response) //
-                    .comment(R.string.medtronic_cmd_cant_cancel_tbr);
-        }
-    }
-
-    @NonNull @Override
-    public ManufacturerType manufacturer() {
-        return pumpDescription.getPumpType().getManufacturer();
-    }
-
-    @NonNull @Override
-    public PumpType model() {
-        return pumpDescription.getPumpType();
-    }
-
-    @NonNull @Override
-    public String serialNumber() {
-        return medtronicPumpStatus.serialNumber;
-    }
-
-    @NonNull @Override
-    public PumpEnactResult setNewBasalProfile(@NonNull Profile profile) {
-        aapsLogger.info(LTag.PUMP, getLogPrefix() + "setNewBasalProfile");
-
-        // this shouldn't be needed, but let's do check if profile setting we are setting is same as current one
-        if (isProfileSame(profile)) {
-            return new PumpEnactResult(getInjector()) //
-                    .success(true) //
-                    .enacted(false) //
-                    .comment(R.string.medtronic_cmd_basal_profile_not_set_is_same);
-        }
-
-        setRefreshButtonEnabled(false);
-
-        if (isPumpNotReachable()) {
-
-            setRefreshButtonEnabled(true);
-
-            return new PumpEnactResult(getInjector()) //
-                    .success(false) //
-                    .enacted(false) //
-                    .comment(R.string.medtronic_pump_status_pump_unreachable);
-        }
-
-        medtronicUtil.dismissNotification(MedtronicNotificationType.PumpUnreachable, rxBus);
-
-        BasalProfile basalProfile = convertProfileToMedtronicProfile(profile);
-
-        String profileInvalid = isProfileValid(basalProfile);
-
-        if (profileInvalid != null) {
-            return new PumpEnactResult(getInjector()) //
-                    .success(false) //
-                    .enacted(false) //
-                    .comment(getResourceHelper().gs(R.string.medtronic_cmd_set_profile_pattern_overflow, profileInvalid));
-        }
-
-        MedtronicUITask responseTask = rileyLinkMedtronicService.getMedtronicUIComm().executeCommand(MedtronicCommandType.SetBasalProfileSTD,
-                basalProfile);
-
-        Boolean response = (Boolean) responseTask.returnData;
-
-        aapsLogger.info(LTag.PUMP, getLogPrefix() + "Basal Profile was set: " + response);
-
-        if (response) {
-            return new PumpEnactResult(getInjector()).success(true).enacted(true);
-        } else {
-            return new PumpEnactResult(getInjector()).success(response).enacted(response) //
-                    .comment(R.string.medtronic_cmd_basal_profile_could_not_be_set);
-        }
-    }
-
-
-    private String isProfileValid(BasalProfile basalProfile) {
-
-        StringBuilder stringBuilder = new StringBuilder();
-
-        if (medtronicPumpStatus.maxBasal == null)
-            return null;
-
-        for (BasalProfileEntry profileEntry : basalProfile.getEntries()) {
-
-            if (profileEntry.rate > medtronicPumpStatus.maxBasal) {
-                stringBuilder.append(profileEntry.startTime.toString("HH:mm"));
-                stringBuilder.append("=");
-                stringBuilder.append(profileEntry.rate);
-            }
-        }
-
-        return stringBuilder.length() == 0 ? null : stringBuilder.toString();
-    }
-
-
-    @NonNull
-    private BasalProfile convertProfileToMedtronicProfile(Profile profile) {
-
-        BasalProfile basalProfile = new BasalProfile(aapsLogger);
-
-        for (int i = 0; i < 24; i++) {
-            double rate = profile.getBasalTimeFromMidnight(i * 60 * 60);
-
-            double v = pumpDescription.getPumpType().determineCorrectBasalSize(rate);
-
-            BasalProfileEntry basalEntry = new BasalProfileEntry(v, i, 0);
-            basalProfile.addEntry(basalEntry);
-
-        }
-
-        basalProfile.generateRawDataFromEntries();
-
-        return basalProfile;
-    }
-
-    // OPERATIONS not supported by Pump or Plugin
-
-    private List<CustomAction> customActions = null;
-
-    private final CustomAction customActionWakeUpAndTune = new CustomAction(R.string.medtronic_custom_action_wake_and_tune,
-            MedtronicCustomActionType.WakeUpAndTune);
-
-    private final CustomAction customActionClearBolusBlock = new CustomAction(
-            R.string.medtronic_custom_action_clear_bolus_block, MedtronicCustomActionType.ClearBolusBlock, false);
-
-    private final CustomAction customActionResetRLConfig = new CustomAction(
-            R.string.medtronic_custom_action_reset_rileylink, MedtronicCustomActionType.ResetRileyLinkConfiguration, true);
-
-
-    @Override
-    public List<CustomAction> getCustomActions() {
-
-        if (customActions == null) {
-            this.customActions = Arrays.asList(customActionWakeUpAndTune, //
-                    customActionClearBolusBlock, //
-                    customActionResetRLConfig);
-        }
-
-        return this.customActions;
-    }
-
-
-    @Override
-    public void executeCustomAction(@NonNull CustomActionType customActionType) {
-
-        MedtronicCustomActionType mcat = (MedtronicCustomActionType) customActionType;
-
-        switch (mcat) {
-
-            case WakeUpAndTune: {
-                if (rileyLinkMedtronicService.verifyConfiguration()) {
-                    serviceTaskExecutor.startTask(new WakeAndTuneTask(getInjector()));
-                } else {
-                    ErrorHelperActivity.Companion.runAlarm(context, getResourceHelper().gs(R.string.medtronic_error_operation_not_possible_no_configuration), getResourceHelper().gs(R.string.medtronic_warning), R.raw.boluserror);
-                }
-            }
-            break;
-
-            case ClearBolusBlock: {
-                this.busyTimestamps.clear();
-                this.customActionClearBolusBlock.setEnabled(false);
-                refreshCustomActionsList();
-            }
-            break;
-
-            case ResetRileyLinkConfiguration: {
-                serviceTaskExecutor.startTask(new ResetRileyLinkConfigurationTask(getInjector()));
-            }
-            break;
-
-            default:
-                break;
-        }
-
-    }
-
-    @Override
-    public void timezoneOrDSTChanged(@NonNull TimeChangeType changeType) {
-
-        aapsLogger.warn(LTag.PUMP, getLogPrefix() + "Time or TimeZone changed. ");
-
-        this.hasTimeDateOrTimeZoneChanged = true;
-    }
-
-    @Override
-    public boolean setNeutralTempAtFullHour() {
-        return sp.getBoolean(R.string.key_set_neutral_temps, true);
-    }
-
-
-    @SuppressWarnings("SameParameterValue") private void setEnableCustomAction(MedtronicCustomActionType customAction, boolean isEnabled) {
-
-        if (customAction == MedtronicCustomActionType.ClearBolusBlock) {
-            this.customActionClearBolusBlock.setEnabled(isEnabled);
-        } else if (customAction == MedtronicCustomActionType.ResetRileyLinkConfiguration) {
-            this.customActionResetRLConfig.setEnabled(isEnabled);
-        }
-
-        refreshCustomActionsList();
-    }
-}
diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/MedtronicPumpPlugin.kt b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/MedtronicPumpPlugin.kt
new file mode 100644
index 0000000000..36b1c0f7dd
--- /dev/null
+++ b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/MedtronicPumpPlugin.kt
@@ -0,0 +1,1175 @@
+package info.nightscout.androidaps.plugins.pump.medtronic
+
+import android.content.ComponentName
+import android.content.Context
+import android.content.ServiceConnection
+import android.os.IBinder
+import android.os.SystemClock
+import androidx.preference.Preference
+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.EventRefreshOverview
+import info.nightscout.androidaps.interfaces.*
+import info.nightscout.androidaps.interfaces.PumpSync.TemporaryBasalType
+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.EventNewNotification
+import info.nightscout.androidaps.plugins.general.overview.notifications.Notification
+import info.nightscout.androidaps.plugins.pump.common.defs.PumpDriverState
+import info.nightscout.androidaps.plugins.pump.common.defs.PumpType
+import info.nightscout.androidaps.plugins.pump.common.events.EventRefreshButtonState
+import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkConst
+import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.defs.RileyLinkPumpDevice
+import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.defs.RileyLinkPumpInfo
+import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.defs.RileyLinkServiceState
+import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.service.RileyLinkServiceData
+import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.service.tasks.ResetRileyLinkConfigurationTask
+import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.service.tasks.ServiceTaskExecutor
+import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.service.tasks.WakeAndTuneTask
+import info.nightscout.androidaps.plugins.pump.common.utils.DateTimeUtil
+import info.nightscout.androidaps.plugins.pump.common.utils.ProfileUtil
+import info.nightscout.androidaps.plugins.pump.medtronic.comm.history.pump.PumpHistoryEntry
+import info.nightscout.androidaps.plugins.pump.medtronic.comm.history.pump.PumpHistoryResult
+import info.nightscout.androidaps.plugins.pump.medtronic.data.MedtronicHistoryData
+import info.nightscout.androidaps.plugins.pump.medtronic.data.dto.BasalProfile
+import info.nightscout.androidaps.plugins.pump.medtronic.data.dto.BasalProfile.Companion.getProfilesByHourToString
+import info.nightscout.androidaps.plugins.pump.medtronic.data.dto.BasalProfileEntry
+import info.nightscout.androidaps.plugins.pump.medtronic.data.dto.TempBasalPair
+import info.nightscout.androidaps.plugins.pump.medtronic.defs.*
+import info.nightscout.androidaps.plugins.pump.medtronic.defs.MedtronicCommandType.Companion.getSettings
+import info.nightscout.androidaps.plugins.pump.medtronic.driver.MedtronicPumpStatus
+import info.nightscout.androidaps.plugins.pump.medtronic.events.EventMedtronicPumpConfigurationChanged
+import info.nightscout.androidaps.plugins.pump.medtronic.events.EventMedtronicPumpValuesChanged
+import info.nightscout.androidaps.plugins.pump.medtronic.service.RileyLinkMedtronicService
+import info.nightscout.androidaps.plugins.pump.medtronic.util.MedtronicConst
+import info.nightscout.androidaps.plugins.pump.medtronic.util.MedtronicUtil
+import info.nightscout.androidaps.plugins.pump.medtronic.util.MedtronicUtil.Companion.isSame
+import info.nightscout.androidaps.utils.DateUtil
+import info.nightscout.androidaps.utils.FabricPrivacy
+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 org.joda.time.LocalDateTime
+import java.util.*
+import javax.inject.Inject
+import javax.inject.Singleton
+
+/**
+ * Created by andy on 23.04.18.
+ *
+ * @author Andy Rozman (andy.rozman@gmail.com)
+ */
+@Singleton
+class MedtronicPumpPlugin @Inject constructor(
+    injector: HasAndroidInjector,
+    aapsLogger: AAPSLogger,
+    rxBus: RxBusWrapper,
+    context: Context,
+    resourceHelper: ResourceHelper,
+    activePlugin: ActivePlugin,
+    sp: SP,
+    commandQueue: CommandQueueProvider,
+    fabricPrivacy: FabricPrivacy,
+    private val medtronicUtil: MedtronicUtil,
+    private val medtronicPumpStatus: MedtronicPumpStatus,
+    private val medtronicHistoryData: MedtronicHistoryData,
+    private val rileyLinkServiceData: RileyLinkServiceData,
+    private val serviceTaskExecutor: ServiceTaskExecutor,
+    dateUtil: DateUtil,
+    aapsSchedulers: AapsSchedulers,
+    pumpSync: PumpSync,
+    pumpSyncStorage: info.nightscout.androidaps.plugins.pump.common.sync.PumpSyncStorage
+) : info.nightscout.androidaps.plugins.pump.common.PumpPluginAbstract(PluginDescription() //
+    .mainType(PluginType.PUMP) //
+    .fragmentClass(MedtronicFragment::class.java.name) //
+    .pluginIcon(R.drawable.ic_veo_128)
+    .pluginName(R.string.medtronic_name) //
+    .shortName(R.string.medtronic_name_short) //
+    .preferencesId(R.xml.pref_medtronic)
+    .description(R.string.description_pump_medtronic),  //
+    PumpType.MEDTRONIC_522_722,  // we default to most basic model, correct model from config is loaded later
+    injector, resourceHelper, aapsLogger, commandQueue, rxBus, activePlugin, sp, context, fabricPrivacy, dateUtil, aapsSchedulers, pumpSync, pumpSyncStorage
+), Pump, RileyLinkPumpDevice, info.nightscout.androidaps.plugins.pump.common.sync.PumpSyncEntriesCreator {
+
+    private lateinit var rileyLinkMedtronicService: RileyLinkMedtronicService
+
+    // variables for handling statuses and history
+    private var firstRun = true
+    private var isRefresh = false
+    private val statusRefreshMap: MutableMap<MedtronicStatusRefreshType, Long> = mutableMapOf()
+    private var isInitialized = false
+    private var lastPumpHistoryEntry: PumpHistoryEntry? = null
+    private val busyTimestamps: MutableList<Long> = ArrayList()
+    private var hasTimeDateOrTimeZoneChanged = false
+    private var isBusy = false
+
+    override fun onStart() {
+        aapsLogger.debug(LTag.PUMP, deviceID() + " started.")
+        serviceConnection = object : ServiceConnection {
+            override fun onServiceDisconnected(name: ComponentName) {
+                aapsLogger.debug(LTag.PUMP, "RileyLinkMedtronicService is disconnected")
+                //rileyLinkMedtronicService = null
+            }
+
+            override fun onServiceConnected(name: ComponentName, service: IBinder) {
+                aapsLogger.debug(LTag.PUMP, "RileyLinkMedtronicService is connected")
+                val mLocalBinder = service as RileyLinkMedtronicService.LocalBinder
+                rileyLinkMedtronicService = mLocalBinder.serviceInstance
+                isServiceSet = true
+                rileyLinkMedtronicService.verifyConfiguration()
+                Thread(Runnable {
+                    for (i in 0..19) {
+                        SystemClock.sleep(5000)
+                        aapsLogger.debug(LTag.PUMP, "Starting Medtronic-RileyLink service")
+                        if (rileyLinkMedtronicService.setNotInPreInit()) {
+                            break
+                        }
+                    }
+                }).start()
+            }
+        }
+        super.onStart()
+    }
+
+    override fun updatePreferenceSummary(pref: Preference) {
+        super.updatePreferenceSummary(pref)
+        if (pref.key == resourceHelper.gs(R.string.key_rileylink_mac_address)) {
+            val value = sp.getStringOrNull(R.string.key_rileylink_mac_address, null)
+            pref.summary = value ?: resourceHelper.gs(R.string.not_set_short)
+        }
+    }
+
+    private val logPrefix: String
+        get() = "MedtronicPumpPlugin::"
+
+    override fun initPumpStatusData() {
+        medtronicPumpStatus.lastConnection = sp.getLong(RileyLinkConst.Prefs.LastGoodDeviceCommunicationTime, 0L)
+        medtronicPumpStatus.lastDataTime = medtronicPumpStatus.lastConnection
+        medtronicPumpStatus.previousConnection = medtronicPumpStatus.lastConnection
+
+        //if (rileyLinkMedtronicService != null) rileyLinkMedtronicService.verifyConfiguration();
+        aapsLogger.debug(LTag.PUMP, "initPumpStatusData: " + medtronicPumpStatus)
+
+        // this is only thing that can change, by being configured
+        pumpDescription.maxTempAbsolute = if (medtronicPumpStatus.maxBasal != null) medtronicPumpStatus.maxBasal!! else 35.0
+
+        // set first Medtronic Pump Start
+        if (!sp.contains(MedtronicConst.Statistics.FirstPumpStart)) {
+            sp.putLong(MedtronicConst.Statistics.FirstPumpStart, System.currentTimeMillis())
+        }
+        migrateSettings()
+
+        pumpSyncStorage.initStorage()
+
+        this.displayConnectionMessages = false
+    }
+
+    override fun triggerPumpConfigurationChangedEvent() {
+        rxBus.send(EventMedtronicPumpConfigurationChanged())
+    }
+
+    private fun migrateSettings() {
+        if ("US (916 MHz)" == sp.getString(MedtronicConst.Prefs.PumpFrequency, "US (916 MHz)")) {
+            sp.putString(MedtronicConst.Prefs.PumpFrequency, resourceHelper.gs(R.string.key_medtronic_pump_frequency_us_ca))
+        }
+        val encoding = sp.getString(MedtronicConst.Prefs.Encoding, "RileyLink 4b6b Encoding")
+        if ("RileyLink 4b6b Encoding" == encoding) {
+            sp.putString(MedtronicConst.Prefs.Encoding, resourceHelper.gs(R.string.key_medtronic_pump_encoding_4b6b_rileylink))
+        }
+        if ("Local 4b6b Encoding" == encoding) {
+            sp.putString(MedtronicConst.Prefs.Encoding, resourceHelper.gs(R.string.key_medtronic_pump_encoding_4b6b_local))
+        }
+    }
+
+    override fun onStartCustomActions() {
+
+        // check status every minute (if any status needs refresh we send readStatus command)
+        Thread(Runnable {
+            do {
+                SystemClock.sleep(60000)
+                if (this.isInitialized) {
+                    val statusRefresh = workWithStatusRefresh(
+                        StatusRefreshAction.GetData, null, null)!!
+                    if (doWeHaveAnyStatusNeededRefereshing(statusRefresh)) {
+                        if (!commandQueue.statusInQueue()) {
+                            commandQueue.readStatus("Scheduled Status Refresh", null)
+                        }
+                    }
+                    clearBusyQueue()
+                }
+            } while (serviceRunning)
+        }).start()
+    }
+
+    override val serviceClass: Class<*>
+        get() = RileyLinkMedtronicService::class.java
+
+    override val pumpStatusData: info.nightscout.androidaps.plugins.pump.common.data.PumpStatus
+        get() = medtronicPumpStatus
+
+    override fun deviceID(): String {
+        return "Medtronic"
+    }
+
+    override val isFakingTempsByExtendedBoluses: Boolean
+        get() = false
+
+    override fun canHandleDST(): Boolean {
+        return false
+    }
+
+    // Pump Plugin
+    private var isServiceSet: Boolean = false
+
+    override fun getRileyLinkService(): RileyLinkMedtronicService {
+        return rileyLinkMedtronicService
+    }
+
+    override fun getPumpInfo(): RileyLinkPumpInfo {
+        val frequency = resourceHelper.gs(if (medtronicPumpStatus.pumpFrequency == "medtronic_pump_frequency_us_ca") R.string.medtronic_pump_frequency_us_ca else R.string.medtronic_pump_frequency_worldwide)
+        val model = if (!medtronicUtil.isModelSet) "???" else "Medtronic " + medtronicPumpStatus.medtronicDeviceType.pumpModel
+        val serialNumber = medtronicPumpStatus.serialNumber
+        return RileyLinkPumpInfo(frequency, model, serialNumber)
+    }
+
+    override fun getLastConnectionTimeMillis(): Long {
+        return medtronicPumpStatus.lastConnection
+    }
+
+    override fun setLastCommunicationToNow() {
+        medtronicPumpStatus.setLastCommunicationToNow()
+    }
+
+    override fun isInitialized(): Boolean {
+        if (displayConnectionMessages) aapsLogger.debug(LTag.PUMP, "MedtronicPumpPlugin::isInitialized")
+        return isServiceSet && isInitialized
+    }
+
+    override fun setBusy(busy: Boolean) {
+        isBusy = busy
+    }
+
+    override fun isBusy(): Boolean {
+        if (displayConnectionMessages) aapsLogger.debug(LTag.PUMP, "MedtronicPumpPlugin::isBusy")
+        if (isServiceSet) {
+            if (isBusy) return true
+            if (busyTimestamps.size > 0) {
+                clearBusyQueue()
+                return busyTimestamps.size > 0
+            }
+        }
+        return false
+    }
+
+    @Synchronized
+    private fun clearBusyQueue() {
+        if (busyTimestamps.size == 0) {
+            return
+        }
+        val deleteFromQueue: MutableSet<Long> = HashSet()
+        for (busyTimestamp in busyTimestamps) {
+            if (System.currentTimeMillis() > busyTimestamp) {
+                deleteFromQueue.add(busyTimestamp)
+            }
+        }
+        if (deleteFromQueue.size == busyTimestamps.size) {
+            busyTimestamps.clear()
+            setEnableCustomAction(MedtronicCustomActionType.ClearBolusBlock, false)
+        }
+        if (deleteFromQueue.size > 0) {
+            busyTimestamps.removeAll(deleteFromQueue)
+        }
+    }
+
+    override fun isConnected(): Boolean {
+        if (displayConnectionMessages) aapsLogger.debug(LTag.PUMP, "MedtronicPumpPlugin::isConnected")
+        return isServiceSet && rileyLinkMedtronicService.isInitialized
+    }
+
+    override fun isConnecting(): Boolean {
+        if (displayConnectionMessages) aapsLogger.debug(LTag.PUMP, "MedtronicPumpPlugin::isConnecting")
+        return !isServiceSet || !rileyLinkMedtronicService.isInitialized
+    }
+
+    override fun getPumpStatus(reason: String) {
+        var needRefresh = true
+        if (firstRun) {
+            needRefresh = initializePump()  /*!isRefresh*/
+        } else {
+            refreshAnyStatusThatNeedsToBeRefreshed()
+        }
+        if (needRefresh) rxBus.send(EventMedtronicPumpValuesChanged())
+    }
+
+    fun resetStatusState() {
+        firstRun = true
+        isRefresh = true
+    }//
+
+    private val isPumpNotReachable: Boolean
+        get() {
+            val rileyLinkServiceState = rileyLinkServiceData.rileyLinkServiceState
+            if (rileyLinkServiceState == null) {
+                aapsLogger.debug(LTag.PUMP, "RileyLink unreachable. RileyLinkServiceState is null.")
+                return false
+            }
+            if (rileyLinkServiceState != RileyLinkServiceState.PumpConnectorReady //
+                && rileyLinkServiceState != RileyLinkServiceState.RileyLinkReady //
+                && rileyLinkServiceState != RileyLinkServiceState.TuneUpDevice) {
+                aapsLogger.debug(LTag.PUMP, "RileyLink unreachable.")
+                return false
+            }
+            return !rileyLinkMedtronicService.deviceCommunicationManager.isDeviceReachable
+        }
+
+    private fun refreshAnyStatusThatNeedsToBeRefreshed() {
+        val statusRefresh = workWithStatusRefresh(StatusRefreshAction.GetData, null,
+            null)!!
+        if (!doWeHaveAnyStatusNeededRefereshing(statusRefresh)) {
+            return
+        }
+        var resetTime = false
+        if (isPumpNotReachable) {
+            aapsLogger.error("Pump unreachable.")
+            medtronicUtil.sendNotification(MedtronicNotificationType.PumpUnreachable, resourceHelper, rxBus)
+            return
+        }
+        medtronicUtil.dismissNotification(MedtronicNotificationType.PumpUnreachable, rxBus)
+        if (hasTimeDateOrTimeZoneChanged) {
+            checkTimeAndOptionallySetTime()
+
+            // read time if changed, set new time
+            hasTimeDateOrTimeZoneChanged = false
+        }
+
+        // execute
+        val refreshTypesNeededToReschedule: MutableSet<MedtronicStatusRefreshType> = mutableSetOf()
+        for ((key, value) in statusRefresh) {
+            if (value > 0 && System.currentTimeMillis() > value) {
+                when (key) {
+                    MedtronicStatusRefreshType.PumpHistory                                                -> {
+                        readPumpHistory()
+                    }
+
+                    MedtronicStatusRefreshType.PumpTime                                                   -> {
+                        checkTimeAndOptionallySetTime()
+                        refreshTypesNeededToReschedule.add(key)
+                        resetTime = true
+                    }
+
+                    MedtronicStatusRefreshType.BatteryStatus, MedtronicStatusRefreshType.RemainingInsulin -> {
+                        rileyLinkMedtronicService.medtronicUIComm.executeCommand(key.getCommandType(medtronicUtil.medtronicPumpModel)!!)
+                        refreshTypesNeededToReschedule.add(key)
+                        resetTime = true
+                    }
+
+                    MedtronicStatusRefreshType.Configuration                                              -> {
+                        rileyLinkMedtronicService.medtronicUIComm.executeCommand(key.getCommandType(medtronicUtil.medtronicPumpModel)!!)
+                        resetTime = true
+                    }
+                }
+            }
+
+            // reschedule
+            for (refreshType2 in refreshTypesNeededToReschedule) {
+                scheduleNextRefresh(refreshType2)
+            }
+        }
+
+        if (resetTime) medtronicPumpStatus.setLastCommunicationToNow()
+    }
+
+    private fun doWeHaveAnyStatusNeededRefereshing(statusRefresh: Map<MedtronicStatusRefreshType, Long>): Boolean {
+        for ((_, value) in statusRefresh) {
+            if (value > 0 && System.currentTimeMillis() > value) {
+                return true
+            }
+        }
+        return hasTimeDateOrTimeZoneChanged
+    }
+
+    private fun setRefreshButtonEnabled(enabled: Boolean) {
+        rxBus.send(EventRefreshButtonState(enabled))
+    }
+
+    private fun initializePump(): Boolean {
+        if (!isServiceSet) return false
+        aapsLogger.info(LTag.PUMP, logPrefix + "initializePump - start")
+        rileyLinkMedtronicService.deviceCommunicationManager.setDoWakeUpBeforeCommand(false)
+        setRefreshButtonEnabled(false)
+        if (isRefresh) {
+            if (isPumpNotReachable) {
+                aapsLogger.error(logPrefix + "initializePump::Pump unreachable.")
+                medtronicUtil.sendNotification(MedtronicNotificationType.PumpUnreachable, resourceHelper, rxBus)
+                setRefreshButtonEnabled(true)
+                return true
+            }
+            medtronicUtil.dismissNotification(MedtronicNotificationType.PumpUnreachable, rxBus)
+        }
+
+        // model (once)
+        if (!medtronicUtil.isModelSet) {
+            rileyLinkMedtronicService.medtronicUIComm.executeCommand(MedtronicCommandType.PumpModel)
+        } else {
+            if (medtronicPumpStatus.medtronicDeviceType !== medtronicUtil.medtronicPumpModel) {
+                aapsLogger.warn(LTag.PUMP, logPrefix + "Configured pump is not the same as one detected.")
+                medtronicUtil.sendNotification(MedtronicNotificationType.PumpTypeNotSame, resourceHelper, rxBus)
+            }
+        }
+        pumpState = PumpDriverState.Connected
+
+        // time (1h)
+        checkTimeAndOptionallySetTime()
+        readPumpHistory()
+
+        // remaining insulin (>50 = 4h; 50-20 = 1h; 15m)
+        rileyLinkMedtronicService.medtronicUIComm.executeCommand(MedtronicCommandType.GetRemainingInsulin)
+        scheduleNextRefresh(MedtronicStatusRefreshType.RemainingInsulin, 10)
+
+        // remaining power (1h)
+        rileyLinkMedtronicService.medtronicUIComm.executeCommand(MedtronicCommandType.GetBatteryStatus)
+        scheduleNextRefresh(MedtronicStatusRefreshType.BatteryStatus, 20)
+
+        // configuration (once and then if history shows config changes)
+        rileyLinkMedtronicService.medtronicUIComm.executeCommand(getSettings(medtronicUtil.medtronicPumpModel))
+
+        // read profile (once, later its controlled by isThisProfileSet method)
+        basalProfiles
+        val errorCount = rileyLinkMedtronicService.medtronicUIComm.invalidResponsesCount
+        if (errorCount >= 5) {
+            aapsLogger.error("Number of error counts was 5 or more. Starting tunning.")
+            setRefreshButtonEnabled(true)
+            serviceTaskExecutor.startTask(WakeAndTuneTask(injector))
+            return true
+        }
+        medtronicPumpStatus.setLastCommunicationToNow()
+        setRefreshButtonEnabled(true)
+        if (!isRefresh) {
+            pumpState = PumpDriverState.Initialized
+        }
+        isInitialized = true
+        // this.pumpState = PumpDriverState.Initialized;
+        firstRun = false
+        return true
+    }
+
+    private val basalProfiles: Unit
+        get() {
+            val medtronicUITask = rileyLinkMedtronicService.medtronicUIComm.executeCommand(MedtronicCommandType.GetBasalProfileSTD)
+            if (medtronicUITask.responseType === MedtronicUIResponseType.Error) {
+                rileyLinkMedtronicService.medtronicUIComm.executeCommand(MedtronicCommandType.GetBasalProfileSTD)
+            }
+        }
+
+    override fun isThisProfileSet(profile: Profile): Boolean {
+        aapsLogger.debug(LTag.PUMP, "isThisProfileSet: basalInitalized=" + medtronicPumpStatus.basalProfileStatus)
+        if (!isInitialized) return true
+        if (medtronicPumpStatus.basalProfileStatus === BasalProfileStatus.NotInitialized) {
+            // this shouldn't happen, but if there was problem we try again
+            basalProfiles
+            return isProfileSame(profile)
+        } else if (medtronicPumpStatus.basalProfileStatus === BasalProfileStatus.ProfileChanged) {
+            return false
+        }
+        return medtronicPumpStatus.basalProfileStatus !== BasalProfileStatus.ProfileOK || isProfileSame(profile)
+    }
+
+    private fun isProfileSame(profile: Profile): Boolean {
+        var invalid = false
+        val basalsByHour: DoubleArray? = medtronicPumpStatus.basalsByHour
+        aapsLogger.debug(LTag.PUMP, "Current Basals (h):   "
+            + (basalsByHour?.let { getProfilesByHourToString(it) } ?: "null"))
+
+        // int index = 0;
+        if (basalsByHour == null) return true // we don't want to set profile again, unless we are sure
+        val stringBuilder = StringBuilder("Requested Basals (h): ")
+        stringBuilder.append(ProfileUtil.getBasalProfilesDisplayableAsStringOfArray(profile, this.pumpType))
+
+        for (basalValue in profile.getBasalValues()) {
+            val basalValueValue = pumpDescription.pumpType.determineCorrectBasalSize(basalValue.value)
+            val hour = basalValue.timeAsSeconds / (60 * 60)
+            if (!isSame(basalsByHour[hour], basalValueValue)) {
+                invalid = true
+            }
+            // stringBuilder.append(String.format(Locale.ENGLISH, "%.3f", basalValueValue))
+            // stringBuilder.append(" ")
+        }
+        aapsLogger.debug(LTag.PUMP, stringBuilder.toString())
+        if (!invalid) {
+            aapsLogger.debug(LTag.PUMP, "Basal profile is same as AAPS one.")
+        } else {
+            aapsLogger.debug(LTag.PUMP, "Basal profile on Pump is different than the AAPS one.")
+        }
+        return !invalid
+    }
+
+    override fun lastDataTime(): Long {
+        return if (medtronicPumpStatus.lastConnection > 0) {
+            medtronicPumpStatus.lastConnection
+        } else System.currentTimeMillis()
+    }
+
+    override val baseBasalRate: Double
+        get() = medtronicPumpStatus.basalProfileForHour
+
+    override val reservoirLevel: Double
+        get() = medtronicPumpStatus.reservoirRemainingUnits
+
+    override val batteryLevel: Int
+        get() = medtronicPumpStatus.batteryRemaining
+
+    override fun triggerUIChange() {
+        rxBus.send(EventMedtronicPumpValuesChanged())
+    }
+
+    override fun generateTempId(objectA: Any): Long {
+        val timestamp: Long = objectA as Long
+        return DateTimeUtil.toATechDate(timestamp)
+    }
+
+    private var bolusDeliveryType = BolusDeliveryType.Idle
+
+    private enum class BolusDeliveryType {
+        Idle,  //
+        DeliveryPrepared,  //
+        Delivering,  //
+        CancelDelivery
+    }
+
+    private fun checkTimeAndOptionallySetTime() {
+        aapsLogger.info(LTag.PUMP, "MedtronicPumpPlugin::checkTimeAndOptionallySetTime - Start")
+        setRefreshButtonEnabled(false)
+        if (isPumpNotReachable) {
+            aapsLogger.debug(LTag.PUMP, "MedtronicPumpPlugin::checkTimeAndOptionallySetTime - Pump Unreachable.")
+            setRefreshButtonEnabled(true)
+            return
+        }
+        medtronicUtil.dismissNotification(MedtronicNotificationType.PumpUnreachable, rxBus)
+        rileyLinkMedtronicService.medtronicUIComm.executeCommand(MedtronicCommandType.GetRealTimeClock)
+        var clock = medtronicUtil.pumpTime
+        if (clock == null) { // retry
+            rileyLinkMedtronicService.medtronicUIComm.executeCommand(MedtronicCommandType.GetRealTimeClock)
+            clock = medtronicUtil.pumpTime
+        }
+        if (clock == null) return
+        val timeDiff = Math.abs(clock.timeDifference)
+        if (timeDiff > 20) {
+            if (clock.localDeviceTime.year <= 2015 || timeDiff <= 24 * 60 * 60) {
+                aapsLogger.info(LTag.PUMP, String.format(Locale.ENGLISH, "MedtronicPumpPlugin::checkTimeAndOptionallySetTime - Time difference is %d s. Set time on pump.", timeDiff))
+                rileyLinkMedtronicService.medtronicUIComm.executeCommand(MedtronicCommandType.SetRealTimeClock)
+                if (clock.timeDifference == 0) {
+                    val notification = Notification(Notification.INSIGHT_DATE_TIME_UPDATED, resourceHelper.gs(R.string.pump_time_updated), Notification.INFO, 60)
+                    rxBus.send(EventNewNotification(notification))
+                }
+            } else {
+                if (clock.localDeviceTime.year > 2015) {
+                    aapsLogger.error(String.format(Locale.ENGLISH, "MedtronicPumpPlugin::checkTimeAndOptionallySetTime - Time difference over 24h requested [diff=%d s]. Doing nothing.", timeDiff))
+                    medtronicUtil.sendNotification(MedtronicNotificationType.TimeChangeOver24h, resourceHelper, rxBus)
+                }
+            }
+        } else {
+            aapsLogger.info(LTag.PUMP, String.format(Locale.ENGLISH, "MedtronicPumpPlugin::checkTimeAndOptionallySetTime - Time difference is %d s. Do nothing.", timeDiff))
+        }
+        scheduleNextRefresh(MedtronicStatusRefreshType.PumpTime, 0)
+    }
+
+    override fun deliverBolus(detailedBolusInfo: DetailedBolusInfo): PumpEnactResult {
+        aapsLogger.info(LTag.PUMP, "MedtronicPumpPlugin::deliverBolus - " + BolusDeliveryType.DeliveryPrepared)
+        setRefreshButtonEnabled(false)
+        if (detailedBolusInfo.insulin > medtronicPumpStatus.reservoirRemainingUnits) {
+            return PumpEnactResult(injector) //
+                .success(false) //
+                .enacted(false) //
+                .comment(resourceHelper.gs(R.string.medtronic_cmd_bolus_could_not_be_delivered_no_insulin,
+                    medtronicPumpStatus.reservoirRemainingUnits,
+                    detailedBolusInfo.insulin))
+        }
+        bolusDeliveryType = BolusDeliveryType.DeliveryPrepared
+        if (isPumpNotReachable) {
+            aapsLogger.debug(LTag.PUMP, "MedtronicPumpPlugin::deliverBolus - Pump Unreachable.")
+            return setNotReachable(true, false)
+        }
+        medtronicUtil.dismissNotification(MedtronicNotificationType.PumpUnreachable, rxBus)
+        if (bolusDeliveryType == BolusDeliveryType.CancelDelivery) {
+            // LOG.debug("MedtronicPumpPlugin::deliverBolus - Delivery Canceled.");
+            return setNotReachable(true, true)
+        }
+
+        // LOG.debug("MedtronicPumpPlugin::deliverBolus - Starting wait period.");
+        val sleepTime = sp.getInt(MedtronicConst.Prefs.BolusDelay, 10) * 1000
+        SystemClock.sleep(sleepTime.toLong())
+        return if (bolusDeliveryType == BolusDeliveryType.CancelDelivery) {
+            // LOG.debug("MedtronicPumpPlugin::deliverBolus - Delivery Canceled, before wait period.");
+            setNotReachable(true, true)
+        } else try {
+            bolusDeliveryType = BolusDeliveryType.Delivering
+
+            // LOG.debug("MedtronicPumpPlugin::deliverBolus - Start delivery");
+            val responseTask = rileyLinkMedtronicService.medtronicUIComm.executeCommand(MedtronicCommandType.SetBolus,
+                arrayListOf(detailedBolusInfo.insulin))
+            val response = responseTask.result as Boolean?
+            setRefreshButtonEnabled(true)
+
+            // LOG.debug("MedtronicPumpPlugin::deliverBolus - Response: {}", response);
+            return if (response == null || !response) {
+                PumpEnactResult(injector) //
+                    .success(bolusDeliveryType == BolusDeliveryType.CancelDelivery) //
+                    .enacted(false) //
+                    .comment(R.string.medtronic_cmd_bolus_could_not_be_delivered)
+            } else {
+                if (bolusDeliveryType == BolusDeliveryType.CancelDelivery) {
+                    // LOG.debug("MedtronicPumpPlugin::deliverBolus - Delivery Canceled after Bolus started.");
+                    Thread(Runnable {
+                        SystemClock.sleep(2000)
+                        runAlarm(context, resourceHelper.gs(R.string.medtronic_cmd_cancel_bolus_not_supported), resourceHelper.gs(R.string.medtronic_warning), R.raw.boluserror)
+                    }).start()
+                }
+                val now = System.currentTimeMillis()
+                detailedBolusInfo.timestamp = now
+                detailedBolusInfo.deliverAtTheLatest = now // not sure about that one
+
+                pumpSyncStorage.addBolusWithTempId(detailedBolusInfo, true, this)
+
+                // we subtract insulin, exact amount will be visible with next remainingInsulin update.
+                medtronicPumpStatus.reservoirRemainingUnits = medtronicPumpStatus.reservoirRemainingUnits - detailedBolusInfo.insulin
+                incrementStatistics(if (detailedBolusInfo.bolusType === DetailedBolusInfo.BolusType.SMB) MedtronicConst.Statistics.SMBBoluses else MedtronicConst.Statistics.StandardBoluses)
+
+                // calculate time for bolus and set driver to busy for that time
+                val bolusTime = (detailedBolusInfo.insulin * 42.0).toInt()
+                val time = now + bolusTime * 1000
+                busyTimestamps.add(time)
+                setEnableCustomAction(MedtronicCustomActionType.ClearBolusBlock, true)
+                PumpEnactResult(injector).success(true) //
+                    .enacted(true) //
+                    .bolusDelivered(detailedBolusInfo.insulin) //
+                    .carbsDelivered(detailedBolusInfo.carbs)
+            }
+        } finally {
+            finishAction("Bolus")
+            bolusDeliveryType = BolusDeliveryType.Idle
+        }
+
+        // LOG.debug("MedtronicPumpPlugin::deliverBolus - End wait period. Start delivery");
+    }
+
+    private fun setNotReachable(isBolus: Boolean, success: Boolean): PumpEnactResult {
+        setRefreshButtonEnabled(true)
+        if (isBolus) {
+            bolusDeliveryType = BolusDeliveryType.Idle
+        }
+        return if (success) {
+            PumpEnactResult(injector) //
+                .success(true) //
+                .enacted(false)
+        } else {
+            PumpEnactResult(injector) //
+                .success(false) //
+                .enacted(false) //
+                .comment(R.string.medtronic_pump_status_pump_unreachable)
+        }
+    }
+
+    override fun stopBolusDelivering() {
+        bolusDeliveryType = BolusDeliveryType.CancelDelivery
+
+        // if (isLoggingEnabled())
+        // LOG.warn("MedtronicPumpPlugin::deliverBolus - Stop Bolus Delivery.");
+    }
+
+    private fun incrementStatistics(statsKey: String) {
+        var currentCount = sp.getLong(statsKey, 0L)
+        currentCount++
+        sp.putLong(statsKey, currentCount)
+    }
+
+    // if enforceNew===true current temp basal is canceled and new TBR set (duration is prolonged),
+    // if false and the same rate is requested enacted=false and success=true is returned and TBR is not changed
+    override fun setTempBasalAbsolute(absoluteRate: Double, durationInMinutes: Int, profile: Profile, enforceNew: Boolean, tbrType: TemporaryBasalType): PumpEnactResult {
+        setRefreshButtonEnabled(false)
+        if (isPumpNotReachable) {
+            setRefreshButtonEnabled(true)
+            return PumpEnactResult(injector) //
+                .success(false) //
+                .enacted(false) //
+                .comment(R.string.medtronic_pump_status_pump_unreachable)
+        }
+        medtronicUtil.dismissNotification(MedtronicNotificationType.PumpUnreachable, rxBus)
+        aapsLogger.info(LTag.PUMP, logPrefix + "setTempBasalAbsolute: rate: " + absoluteRate + ", duration=" + durationInMinutes)
+
+        // read current TBR
+        val tbrCurrent = readTBR()
+        if (tbrCurrent == null) {
+            aapsLogger.warn(LTag.PUMP, logPrefix + "setTempBasalAbsolute - Could not read current TBR, canceling operation.")
+            finishAction("TBR")
+            return PumpEnactResult(injector).success(false).enacted(false)
+                .comment(R.string.medtronic_cmd_cant_read_tbr)
+        } else {
+            aapsLogger.info(LTag.PUMP, logPrefix + "setTempBasalAbsolute: Current Basal: duration: " + tbrCurrent.durationMinutes + " min, rate=" + tbrCurrent.insulinRate)
+        }
+        if (!enforceNew) {
+            if (isSame(tbrCurrent.insulinRate, absoluteRate)) {
+                var sameRate = true
+                if (isSame(0.0, absoluteRate) && durationInMinutes > 0) {
+                    // if rate is 0.0 and duration>0 then the rate is not the same
+                    sameRate = false
+                }
+                if (sameRate) {
+                    aapsLogger.info(LTag.PUMP, logPrefix + "setTempBasalAbsolute - No enforceNew and same rate. Exiting.")
+                    finishAction("TBR")
+                    return PumpEnactResult(injector).success(true).enacted(false)
+                }
+            }
+            // if not the same rate, we cancel and start new
+        }
+
+        // if TBR is running we will cancel it.
+        if (tbrCurrent.insulinRate > 0.0 && tbrCurrent.durationMinutes > 0) {
+            aapsLogger.info(LTag.PUMP, logPrefix + "setTempBasalAbsolute - TBR running - so canceling it.")
+
+            // CANCEL
+            val responseTask2 = rileyLinkMedtronicService.medtronicUIComm.executeCommand(MedtronicCommandType.CancelTBR)
+            val response = responseTask2.result as Boolean?
+            if (response == null || !response) {
+                aapsLogger.error(logPrefix + "setTempBasalAbsolute - Cancel TBR failed.")
+                finishAction("TBR")
+                return PumpEnactResult(injector).success(false).enacted(false)
+                    .comment(R.string.medtronic_cmd_cant_cancel_tbr_stop_op)
+            } else {
+                aapsLogger.info(LTag.PUMP, logPrefix + "setTempBasalAbsolute - Current TBR cancelled.")
+            }
+        }
+
+        // now start new TBR
+        val responseTask = rileyLinkMedtronicService.medtronicUIComm.executeCommand(MedtronicCommandType.SetTemporaryBasal,
+            arrayListOf(absoluteRate, durationInMinutes))
+        val response = responseTask.result as Boolean?
+        aapsLogger.info(LTag.PUMP, logPrefix + "setTempBasalAbsolute - setTBR. Response: " + response)
+        return if (response == null || !response) {
+            finishAction("TBR")
+            PumpEnactResult(injector).success(false).enacted(false) //
+                .comment(R.string.medtronic_cmd_tbr_could_not_be_delivered)
+        } else {
+            medtronicPumpStatus.tempBasalStart = Date()
+            medtronicPumpStatus.tempBasalAmount = absoluteRate
+            medtronicPumpStatus.tempBasalLength = durationInMinutes
+
+            val tempData = info.nightscout.androidaps.plugins.pump.common.sync.PumpDbEntryTBR(absoluteRate, true, durationInMinutes, tbrType)
+
+            pumpSyncStorage.addTemporaryBasalRateWithTempId(tempData, true, this)
+
+            incrementStatistics(MedtronicConst.Statistics.TBRsSet)
+            finishAction("TBR")
+            PumpEnactResult(injector).success(true).enacted(true) //
+                .absolute(absoluteRate).duration(durationInMinutes)
+        }
+    }
+
+    override fun setTempBasalPercent(percent: Int, durationInMinutes: Int, profile: Profile, enforceNew: Boolean, tbrType: TemporaryBasalType): PumpEnactResult {
+        return if (percent == 0) {
+            setTempBasalAbsolute(0.0, durationInMinutes, profile, enforceNew, tbrType)
+        } else {
+            var absoluteValue = profile.getBasal() * (percent / 100.0)
+            absoluteValue = pumpDescription.pumpType.determineCorrectBasalSize(absoluteValue)
+            aapsLogger.warn(LTag.PUMP, "setTempBasalPercent [MedtronicPumpPlugin] - You are trying to use setTempBasalPercent with percent other then 0% ($percent). This will start setTempBasalAbsolute, with calculated value ($absoluteValue). Result might not be 100% correct.")
+            setTempBasalAbsolute(absoluteValue, durationInMinutes, profile, enforceNew, tbrType)
+        }
+    }
+
+    private fun finishAction(overviewKey: String?) {
+        if (overviewKey != null) rxBus.send(EventRefreshOverview(overviewKey, false))
+        triggerUIChange()
+        setRefreshButtonEnabled(true)
+    }
+
+    private fun readPumpHistory() {
+
+//        if (isLoggingEnabled())
+//            LOG.error(getLogPrefix() + "readPumpHistory WIP.");
+        readPumpHistoryLogic()
+        scheduleNextRefresh(MedtronicStatusRefreshType.PumpHistory)
+        if (medtronicHistoryData.hasRelevantConfigurationChanged()) {
+            scheduleNextRefresh(MedtronicStatusRefreshType.Configuration, -1)
+        }
+        if (medtronicHistoryData.hasPumpTimeChanged()) {
+            scheduleNextRefresh(MedtronicStatusRefreshType.PumpTime, -1)
+        }
+        if (medtronicPumpStatus.basalProfileStatus !== BasalProfileStatus.NotInitialized
+            && medtronicHistoryData.hasBasalProfileChanged()) {
+            medtronicHistoryData.processLastBasalProfileChange(pumpDescription.pumpType, medtronicPumpStatus)
+        }
+        val previousState = pumpState
+        if (medtronicHistoryData.isPumpSuspended()) {
+            pumpState = PumpDriverState.Suspended
+            aapsLogger.debug(LTag.PUMP, logPrefix + "isPumpSuspended: true")
+        } else {
+            if (previousState === PumpDriverState.Suspended) {
+                pumpState = PumpDriverState.Ready
+            }
+            aapsLogger.debug(LTag.PUMP, logPrefix + "isPumpSuspended: false")
+        }
+        medtronicHistoryData.processNewHistoryData()
+        medtronicHistoryData.finalizeNewHistoryRecords()
+    }
+
+    private fun readPumpHistoryLogic() {
+
+        val debugHistory = false
+        var targetDate: LocalDateTime? = null
+        if (lastPumpHistoryEntry == null) {  // first read
+            if (debugHistory) aapsLogger.debug(LTag.PUMP, logPrefix + "readPumpHistoryLogic(): lastPumpHistoryEntry: null")
+            val lastPumpHistoryEntryTime = lastPumpEntryTime
+            var timeMinus36h = LocalDateTime()
+            timeMinus36h = timeMinus36h.minusHours(36)
+            medtronicHistoryData.setIsInInit(true)
+            if (lastPumpHistoryEntryTime == 0L) {
+                if (debugHistory) aapsLogger.debug(LTag.PUMP, logPrefix + "readPumpHistoryLogic(): lastPumpHistoryEntryTime: 0L - targetDate: "
+                    + targetDate)
+                targetDate = timeMinus36h
+            } else {
+                // LocalDateTime lastHistoryRecordTime = DateTimeUtil.toLocalDateTime(lastPumpHistoryEntryTime);
+                if (debugHistory) aapsLogger.debug(LTag.PUMP, logPrefix + "readPumpHistoryLogic(): lastPumpHistoryEntryTime: " + lastPumpHistoryEntryTime + " - targetDate: " + targetDate)
+                //medtronicHistoryData.setLastHistoryRecordTime(lastPumpHistoryEntryTime)
+                var lastHistoryRecordTime = DateTimeUtil.toLocalDateTime(lastPumpHistoryEntryTime)
+                lastHistoryRecordTime = lastHistoryRecordTime.minusHours(12) // we get last 12 hours of history to
+                // determine pump state
+                // (we don't process that data), we process only
+                targetDate = if (timeMinus36h.isAfter(lastHistoryRecordTime)) timeMinus36h else lastHistoryRecordTime
+                if (debugHistory) aapsLogger.debug(LTag.PUMP, logPrefix + "readPumpHistoryLogic(): targetDate: " + targetDate)
+            }
+        } else { // all other reads
+            if (debugHistory) aapsLogger.debug(LTag.PUMP, logPrefix + "readPumpHistoryLogic(): lastPumpHistoryEntry: not null - " + medtronicUtil.gsonInstance.toJson(lastPumpHistoryEntry))
+            medtronicHistoryData.setIsInInit(false)
+            // we need to read 35 minutes in the past so that we can repair any TBR or Bolus values if neeeded
+            targetDate = LocalDateTime(DateTimeUtil.getMillisFromATDWithAddedMinutes(lastPumpHistoryEntry!!.atechDateTime, -35))
+        }
+
+        //aapsLogger.debug(LTag.PUMP, "HST: Target Date: " + targetDate);
+        @Suppress("UNCHECKED_CAST")
+        val responseTask2 = rileyLinkMedtronicService.medtronicUIComm.executeCommand(MedtronicCommandType.GetHistoryData,
+            arrayListOf(/*lastPumpHistoryEntry*/ null, targetDate) as? ArrayList<Any>?)
+        if (debugHistory) aapsLogger.debug(LTag.PUMP, "HST: After task")
+        val historyResult = responseTask2.result as PumpHistoryResult?
+        if (debugHistory) aapsLogger.debug(LTag.PUMP, "HST: History Result: " + historyResult.toString())
+        val latestEntry = historyResult!!.latestEntry
+        if (debugHistory) aapsLogger.debug(LTag.PUMP, logPrefix + "Last entry: " + latestEntry)
+        if (latestEntry == null) // no new history to read
+            return
+        lastPumpHistoryEntry = latestEntry
+        sp.putLong(MedtronicConst.Statistics.LastPumpHistoryEntry, latestEntry.atechDateTime)
+        if (debugHistory) aapsLogger.debug(LTag.PUMP, "HST: History: valid=" + historyResult.validEntries.size + ", unprocessed=" + historyResult.unprocessedEntries.size)
+        medtronicHistoryData.addNewHistory(historyResult)
+        medtronicHistoryData.filterNewEntries()
+
+        // determine if first run, if yes detrmine how much of update do we need
+        // - first run:
+        //   - get last history entry
+        //      - if not there download 1.5 days of data
+        //      - there: check if last entry is older than 1.5 days
+        //          - yes: download 1.5 days
+        //          - no: download with last entry  TODO 5min
+        //   - not there: download 1.5 days
+        //
+        //    upload all new entries to NightScout (TBR, Bolus)
+        //    determine pump status
+        //    save last entry
+        //
+        // - not first run:
+        //    - update to last entry TODO 5min
+        //        - save
+        //        - determine pump status
+    }
+
+    private val lastPumpEntryTime: Long
+        get() {
+            val lastPumpEntryTime = sp.getLong(MedtronicConst.Statistics.LastPumpHistoryEntry, 0L)
+            return try {
+                val localDateTime = DateTimeUtil.toLocalDateTime(lastPumpEntryTime)
+                if (localDateTime.year != GregorianCalendar()[Calendar.YEAR]) {
+                    aapsLogger.warn(LTag.PUMP, "Saved LastPumpHistoryEntry was invalid. Year was not the same.")
+                    return 0L
+                }
+                lastPumpEntryTime
+            } catch (ex: Exception) {
+                aapsLogger.warn(LTag.PUMP, "Saved LastPumpHistoryEntry was invalid.")
+                0L
+            }
+        }
+
+    private fun scheduleNextRefresh(refreshType: MedtronicStatusRefreshType?, additionalTimeInMinutes: Int = 0) {
+        when (refreshType) {
+            MedtronicStatusRefreshType.RemainingInsulin                                                                                                                     -> {
+                val remaining = medtronicPumpStatus.reservoirRemainingUnits
+                val min: Int
+                min = if (remaining > 50) 4 * 60 else if (remaining > 20) 60 else 15
+                workWithStatusRefresh(StatusRefreshAction.Add, refreshType, getTimeInFutureFromMinutes(min))
+            }
+
+            MedtronicStatusRefreshType.PumpTime, MedtronicStatusRefreshType.Configuration, MedtronicStatusRefreshType.BatteryStatus, MedtronicStatusRefreshType.PumpHistory -> {
+                workWithStatusRefresh(StatusRefreshAction.Add, refreshType,
+                    getTimeInFutureFromMinutes(refreshType.refreshTime + additionalTimeInMinutes))
+            }
+        }
+    }
+
+    private enum class StatusRefreshAction {
+        Add,  //
+        GetData
+    }
+
+    @Synchronized
+    private fun workWithStatusRefresh(action: StatusRefreshAction,  //
+                                      statusRefreshType: MedtronicStatusRefreshType?,  //
+                                      time: Long?): Map<MedtronicStatusRefreshType, Long>? {
+        return when (action) {
+            StatusRefreshAction.Add     -> {
+                statusRefreshMap[statusRefreshType!!] = time!!
+                null
+            }
+
+            StatusRefreshAction.GetData -> {
+                HashMap(statusRefreshMap)
+            }
+
+        }
+    }
+
+    private fun getTimeInFutureFromMinutes(minutes: Int): Long {
+        return System.currentTimeMillis() + getTimeInMs(minutes)
+    }
+
+    private fun getTimeInMs(minutes: Int): Long {
+        return minutes * 60 * 1000L
+    }
+
+    private fun readTBR(): TempBasalPair? {
+        val responseTask = rileyLinkMedtronicService.medtronicUIComm.executeCommand(MedtronicCommandType.ReadTemporaryBasal)
+        return if (responseTask.hasData()) {
+            val tbr = responseTask.result as TempBasalPair?
+
+            // we sometimes get rate returned even if TBR is no longer running
+            if (tbr != null) {
+                if (tbr.durationMinutes == 0) {
+                    tbr.insulinRate = 0.0
+                }
+                tbr
+            } else
+                null
+        } else {
+            null
+        }
+    }
+
+    override fun cancelTempBasal(enforceNew: Boolean): PumpEnactResult {
+        aapsLogger.info(LTag.PUMP, logPrefix + "cancelTempBasal - started")
+        if (isPumpNotReachable) {
+            setRefreshButtonEnabled(true)
+            return PumpEnactResult(injector) //
+                .success(false) //
+                .enacted(false) //
+                .comment(R.string.medtronic_pump_status_pump_unreachable)
+        }
+        medtronicUtil.dismissNotification(MedtronicNotificationType.PumpUnreachable, rxBus)
+        setRefreshButtonEnabled(false)
+        val tbrCurrent = readTBR()
+        if (tbrCurrent != null) {
+            if (tbrCurrent.insulinRate > 0.0f && tbrCurrent.durationMinutes == 0) {
+                aapsLogger.info(LTag.PUMP, logPrefix + "cancelTempBasal - TBR already canceled.")
+                finishAction("TBR")
+                return PumpEnactResult(injector).success(true).enacted(false)
+            }
+        } else {
+            aapsLogger.warn(LTag.PUMP, logPrefix + "cancelTempBasal - Could not read currect TBR, canceling operation.")
+            finishAction("TBR")
+            return PumpEnactResult(injector).success(false).enacted(false)
+                .comment(R.string.medtronic_cmd_cant_read_tbr)
+        }
+        val responseTask2 = rileyLinkMedtronicService.medtronicUIComm.executeCommand(MedtronicCommandType.CancelTBR)
+        val response = responseTask2.result as Boolean?
+        finishAction("TBR")
+        return if (response == null || !response) {
+            aapsLogger.info(LTag.PUMP, logPrefix + "cancelTempBasal - Cancel TBR failed.")
+            PumpEnactResult(injector).success(false).enacted(false) //
+                .comment(R.string.medtronic_cmd_cant_cancel_tbr)
+        } else {
+            aapsLogger.info(LTag.PUMP, logPrefix + "cancelTempBasal - Cancel TBR successful.")
+
+            val runningTBR = medtronicPumpStatus.runningTBR
+
+            if (runningTBR != null) {
+                if (medtronicHistoryData.isTBRActive(runningTBR)) {
+
+                    val differenceTime = System.currentTimeMillis() - runningTBR.date
+                    val tbrData = runningTBR.tbrData!!
+
+                    val result = pumpSync.syncTemporaryBasalWithPumpId(
+                        runningTBR.date,
+                        tbrData.rate,
+                        differenceTime,
+                        tbrData.isAbsolute,
+                        tbrData.tbrType,
+                        runningTBR.pumpId!!,
+                        runningTBR.pumpType,
+                        runningTBR.serialNumber)
+
+                    val differenceTimeMin = Math.floor(differenceTime / (60.0 * 1000.0))
+
+                    aapsLogger.debug(LTag.PUMP, String.format(Locale.ENGLISH, "canceling running TBR - syncTemporaryBasalWithPumpId [date=%d, pumpId=%d, rate=%.2f U, duration=%d, pumpSerial=%s] - Result: %b",
+                        runningTBR.date, runningTBR.pumpId,
+                        tbrData.rate, differenceTimeMin.toInt(),
+                        medtronicPumpStatus.serialNumber, result))
+                }
+            }
+
+            PumpEnactResult(injector).success(true).enacted(true) //
+                .isTempCancel(true)
+        }
+    }
+
+    override fun manufacturer(): ManufacturerType {
+        return ManufacturerType.Medtronic
+    }
+
+    override fun model(): PumpType {
+        return pumpDescription.pumpType
+    }
+
+    override fun serialNumber(): String {
+        return medtronicPumpStatus.serialNumber
+    }
+
+    override fun setNewBasalProfile(profile: Profile): PumpEnactResult {
+        aapsLogger.info(LTag.PUMP, logPrefix + "setNewBasalProfile")
+
+        // this shouldn't be needed, but let's do check if profile setting we are setting is same as current one
+        if (isProfileSame(profile)) {
+            return PumpEnactResult(injector) //
+                .success(true) //
+                .enacted(false) //
+                .comment(R.string.medtronic_cmd_basal_profile_not_set_is_same)
+        }
+        setRefreshButtonEnabled(false)
+        if (isPumpNotReachable) {
+            setRefreshButtonEnabled(true)
+            return PumpEnactResult(injector) //
+                .success(false) //
+                .enacted(false) //
+                .comment(R.string.medtronic_pump_status_pump_unreachable)
+        }
+        medtronicUtil.dismissNotification(MedtronicNotificationType.PumpUnreachable, rxBus)
+        val basalProfile = convertProfileToMedtronicProfile(profile)
+        aapsLogger.debug("Basal Profile: $basalProfile")
+        val profileInvalid = isProfileValid(basalProfile)
+        if (profileInvalid != null) {
+            return PumpEnactResult(injector) //
+                .success(false) //
+                .enacted(false) //
+                .comment(resourceHelper.gs(R.string.medtronic_cmd_set_profile_pattern_overflow, profileInvalid))
+        }
+        val responseTask = rileyLinkMedtronicService.medtronicUIComm.executeCommand(MedtronicCommandType.SetBasalProfileSTD,
+            arrayListOf(basalProfile))
+        val response = responseTask.result as Boolean?
+        aapsLogger.info(LTag.PUMP, logPrefix + "Basal Profile was set: " + response)
+        return if (response == null || !response) {
+            PumpEnactResult(injector).success(false).enacted(false) //
+                .comment(R.string.medtronic_cmd_basal_profile_could_not_be_set)
+        } else {
+            PumpEnactResult(injector).success(true).enacted(true)
+        }
+    }
+
+    private fun isProfileValid(basalProfile: BasalProfile): String? {
+        val stringBuilder = StringBuilder()
+        if (medtronicPumpStatus.maxBasal == null) return null
+        for (profileEntry in basalProfile.getEntries()) {
+            if (profileEntry.rate > medtronicPumpStatus.maxBasal!!) {
+                stringBuilder.append(profileEntry.startTime!!.toString("HH:mm"))
+                stringBuilder.append("=")
+                stringBuilder.append(profileEntry.rate)
+            }
+        }
+        return if (stringBuilder.length == 0) null else stringBuilder.toString()
+    }
+
+    private fun convertProfileToMedtronicProfile(profile: Profile): BasalProfile {
+        val basalProfile = BasalProfile(aapsLogger)
+        for (i in 0..23) {
+            val rate = profile.getBasalTimeFromMidnight(i * 60 * 60)
+            val v = pumpType.determineCorrectBasalSize(rate)
+            val basalEntry = BasalProfileEntry(v, i, 0)
+            basalProfile.addEntry(basalEntry)
+        }
+        basalProfile.generateRawDataFromEntries()
+        return basalProfile
+    }
+
+    // OPERATIONS not supported by Pump or Plugin
+    private var customActions: List<CustomAction>? = null
+    private val customActionWakeUpAndTune = CustomAction(R.string.medtronic_custom_action_wake_and_tune,
+        MedtronicCustomActionType.WakeUpAndTune)
+    private val customActionClearBolusBlock = CustomAction(
+        R.string.medtronic_custom_action_clear_bolus_block, MedtronicCustomActionType.ClearBolusBlock, false)
+    private val customActionResetRLConfig = CustomAction(
+        R.string.medtronic_custom_action_reset_rileylink, MedtronicCustomActionType.ResetRileyLinkConfiguration, true)
+
+    override fun getCustomActions(): List<CustomAction>? {
+        if (customActions == null) {
+            customActions = Arrays.asList(customActionWakeUpAndTune,  //
+                customActionClearBolusBlock,  //
+                customActionResetRLConfig)
+        }
+        return customActions
+    }
+
+    override fun executeCustomAction(customActionType: CustomActionType) {
+        val mcat = customActionType as? MedtronicCustomActionType
+        when (mcat) {
+            MedtronicCustomActionType.WakeUpAndTune               -> {
+                if (rileyLinkMedtronicService.verifyConfiguration()) {
+                    serviceTaskExecutor.startTask(WakeAndTuneTask(injector))
+                } else {
+                    runAlarm(context, resourceHelper.gs(R.string.medtronic_error_operation_not_possible_no_configuration), resourceHelper.gs(R.string.medtronic_warning), R.raw.boluserror)
+                }
+            }
+
+            MedtronicCustomActionType.ClearBolusBlock             -> {
+                busyTimestamps.clear()
+                customActionClearBolusBlock.isEnabled = false
+                refreshCustomActionsList()
+            }
+
+            MedtronicCustomActionType.ResetRileyLinkConfiguration -> {
+                serviceTaskExecutor.startTask(ResetRileyLinkConfigurationTask(injector))
+            }
+
+            null                                                  -> {
+
+            }
+        }
+    }
+
+    override fun timezoneOrDSTChanged(timeChangeType: TimeChangeType) {
+        aapsLogger.warn(LTag.PUMP, logPrefix + "Time or TimeZone changed. ")
+        hasTimeDateOrTimeZoneChanged = true
+    }
+
+    override fun setNeutralTempAtFullHour(): Boolean {
+        return sp.getBoolean(R.string.key_set_neutral_temps, true)
+    }
+
+    private fun setEnableCustomAction(customAction: MedtronicCustomActionType, isEnabled: Boolean) {
+        if (customAction === MedtronicCustomActionType.ClearBolusBlock) {
+            customActionClearBolusBlock.isEnabled = isEnabled
+        } else if (customAction === MedtronicCustomActionType.ResetRileyLinkConfiguration) {
+            customActionResetRLConfig.isEnabled = isEnabled
+        }
+        refreshCustomActionsList()
+    }
+
+}
\ No newline at end of file
diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/MedtronicCommunicationManager.java b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/MedtronicCommunicationManager.java
deleted file mode 100644
index 32963e8d9a..0000000000
--- a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/MedtronicCommunicationManager.java
+++ /dev/null
@@ -1,919 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.medtronic.comm;
-
-import android.os.SystemClock;
-
-import org.joda.time.LocalDateTime;
-
-import java.util.Calendar;
-import java.util.GregorianCalendar;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
-import info.nightscout.androidaps.logging.LTag;
-import info.nightscout.androidaps.plugins.pump.common.defs.PumpDeviceState;
-import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkCommunicationManager;
-import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkConst;
-import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.RileyLinkCommunicationException;
-import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.data.RFSpyResponse;
-import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.data.RadioPacket;
-import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.data.RadioResponse;
-import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.defs.RLMessageType;
-import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.service.tasks.WakeAndTuneTask;
-import info.nightscout.androidaps.plugins.pump.common.utils.ByteUtil;
-import info.nightscout.androidaps.plugins.pump.common.utils.DateTimeUtil;
-import info.nightscout.androidaps.plugins.pump.medtronic.MedtronicPumpPlugin;
-import info.nightscout.androidaps.plugins.pump.medtronic.comm.history.RawHistoryPage;
-import info.nightscout.androidaps.plugins.pump.medtronic.comm.history.pump.MedtronicPumpHistoryDecoder;
-import info.nightscout.androidaps.plugins.pump.medtronic.comm.history.pump.PumpHistoryEntry;
-import info.nightscout.androidaps.plugins.pump.medtronic.comm.history.pump.PumpHistoryResult;
-import info.nightscout.androidaps.plugins.pump.medtronic.comm.message.CarelinkLongMessageBody;
-import info.nightscout.androidaps.plugins.pump.medtronic.comm.message.CarelinkShortMessageBody;
-import info.nightscout.androidaps.plugins.pump.medtronic.comm.message.GetHistoryPageCarelinkMessageBody;
-import info.nightscout.androidaps.plugins.pump.medtronic.comm.message.MessageBody;
-import info.nightscout.androidaps.plugins.pump.medtronic.comm.message.PacketType;
-import info.nightscout.androidaps.plugins.pump.medtronic.comm.message.PumpAckMessageBody;
-import info.nightscout.androidaps.plugins.pump.medtronic.comm.message.PumpMessage;
-import info.nightscout.androidaps.plugins.pump.medtronic.data.dto.BasalProfile;
-import info.nightscout.androidaps.plugins.pump.medtronic.data.dto.BatteryStatusDTO;
-import info.nightscout.androidaps.plugins.pump.medtronic.data.dto.ClockDTO;
-import info.nightscout.androidaps.plugins.pump.medtronic.data.dto.PumpSettingDTO;
-import info.nightscout.androidaps.plugins.pump.medtronic.data.dto.TempBasalPair;
-import info.nightscout.androidaps.plugins.pump.medtronic.defs.MedtronicCommandType;
-import info.nightscout.androidaps.plugins.pump.medtronic.defs.MedtronicDeviceType;
-import info.nightscout.androidaps.plugins.pump.medtronic.driver.MedtronicPumpStatus;
-import info.nightscout.androidaps.plugins.pump.medtronic.util.MedtronicUtil;
-
-/**
- * Original file created by geoff on 5/30/16.
- * <p>
- * Split into 2 implementations, so that we can split it by target device. - Andy
- * This was mostly rewritten from Original version, and lots of commands and
- * functionality added.
- */
-@Singleton
-public class MedtronicCommunicationManager extends RileyLinkCommunicationManager<PumpMessage> {
-
-    @Inject MedtronicPumpStatus medtronicPumpStatus;
-    @Inject MedtronicPumpPlugin medtronicPumpPlugin;
-    @Inject MedtronicConverter medtronicConverter;
-    @Inject MedtronicUtil medtronicUtil;
-    @Inject MedtronicPumpHistoryDecoder medtronicPumpHistoryDecoder;
-
-    private final int MAX_COMMAND_TRIES = 3;
-    private final int DEFAULT_TIMEOUT = 2000;
-    private final long RILEYLINK_TIMEOUT = 15 * 60 * 1000; // 15 min
-
-    private String errorMessage;
-    private final boolean debugSetCommands = false;
-
-    private boolean doWakeUpBeforeCommand = true;
-
-    // This empty constructor must be kept, otherwise dagger injection might break!
-    @Inject
-    public MedtronicCommunicationManager() {
-    }
-
-    @Inject
-    public void onInit() {
-        // we can't do this in the constructor, as sp only gets injected after the constructor has returned
-        medtronicPumpStatus.previousConnection = sp.getLong(
-                RileyLinkConst.Prefs.LastGoodDeviceCommunicationTime, 0L);
-    }
-
-    @Override
-    public PumpMessage createResponseMessage(byte[] payload) {
-        return new PumpMessage(aapsLogger, payload);
-    }
-
-    @Override
-    public void setPumpDeviceState(PumpDeviceState pumpDeviceState) {
-        this.medtronicPumpStatus.setPumpDeviceState(pumpDeviceState);
-    }
-
-    public void setDoWakeUpBeforeCommand(boolean doWakeUp) {
-        this.doWakeUpBeforeCommand = doWakeUp;
-    }
-
-
-    @Override
-    public boolean isDeviceReachable() {
-        return isDeviceReachable(false);
-    }
-
-
-    /**
-     * We do actual wakeUp and compare PumpModel with currently selected one. If returned model is
-     * not Unknown, pump is reachable.
-     *
-     * @return
-     */
-    public boolean isDeviceReachable(boolean canPreventTuneUp) {
-
-        PumpDeviceState state = medtronicPumpStatus.getPumpDeviceState();
-
-        if (state != PumpDeviceState.PumpUnreachable)
-            medtronicPumpStatus.setPumpDeviceState(PumpDeviceState.WakingUp);
-
-        for (int retry = 0; retry < 5; retry++) {
-
-            aapsLogger.debug(LTag.PUMPCOMM, "isDeviceReachable. Waking pump... " + (retry != 0 ? " (retry " + retry + ")" : ""));
-
-            boolean connected = connectToDevice();
-
-            if (connected)
-                return true;
-
-            SystemClock.sleep(1000);
-
-        }
-
-        if (state != PumpDeviceState.PumpUnreachable)
-            medtronicPumpStatus.setPumpDeviceState(PumpDeviceState.PumpUnreachable);
-
-        if (!canPreventTuneUp) {
-
-            long diff = System.currentTimeMillis() - medtronicPumpStatus.lastConnection;
-
-            if (diff > RILEYLINK_TIMEOUT) {
-                serviceTaskExecutor.startTask(new WakeAndTuneTask(injector));
-            }
-        }
-
-        return false;
-    }
-
-
-    private boolean connectToDevice() {
-
-        PumpDeviceState state = medtronicPumpStatus.getPumpDeviceState();
-
-        // check connection
-
-        byte[] pumpMsgContent = createPumpMessageContent(RLMessageType.ReadSimpleData); // simple
-        RFSpyResponse rfSpyResponse = rfspy.transmitThenReceive(new RadioPacket(injector, pumpMsgContent), (byte) 0, (byte) 200,
-                (byte) 0, (byte) 0, 25000, (byte) 0);
-        aapsLogger.info(LTag.PUMPCOMM, "wakeup: raw response is " + ByteUtil.shortHexString(rfSpyResponse.getRaw()));
-
-        if (rfSpyResponse.wasTimeout()) {
-            aapsLogger.error(LTag.PUMPCOMM, "isDeviceReachable. Failed to find pump (timeout).");
-        } else if (rfSpyResponse.looksLikeRadioPacket()) {
-            RadioResponse radioResponse = new RadioResponse(injector);
-
-            try {
-
-                radioResponse.init(rfSpyResponse.getRaw());
-
-                if (radioResponse.isValid()) {
-
-                    PumpMessage pumpResponse = createResponseMessage(radioResponse.getPayload());
-
-                    if (!pumpResponse.isValid()) {
-                        aapsLogger.warn(LTag.PUMPCOMM, String.format(Locale.ENGLISH, "Response is invalid ! [interrupted=%b, timeout=%b]", rfSpyResponse.wasInterrupted(),
-                                rfSpyResponse.wasTimeout()));
-                    } else {
-
-                        // radioResponse.rssi;
-                        Object dataResponse = medtronicConverter.convertResponse(medtronicPumpPlugin.getPumpDescription().getPumpType(), MedtronicCommandType.PumpModel,
-                                pumpResponse.getRawContent());
-
-                        MedtronicDeviceType pumpModel = (MedtronicDeviceType) dataResponse;
-                        boolean valid = (pumpModel != MedtronicDeviceType.Unknown_Device);
-
-                        if (medtronicUtil.getMedtronicPumpModel() == null && valid) {
-                            medtronicUtil.setMedtronicPumpModel(pumpModel);
-                        }
-
-                        aapsLogger.debug(LTag.PUMPCOMM, String.format(Locale.ENGLISH, "isDeviceReachable. PumpModel is %s - Valid: %b (rssi=%d)", pumpModel.name(), valid,
-                                radioResponse.rssi));
-
-                        if (valid) {
-                            if (state == PumpDeviceState.PumpUnreachable)
-                                medtronicPumpStatus.setPumpDeviceState(PumpDeviceState.WakingUp);
-                            else
-                                medtronicPumpStatus.setPumpDeviceState(PumpDeviceState.Sleeping);
-
-                            rememberLastGoodDeviceCommunicationTime();
-
-                            return true;
-
-                        } else {
-                            if (state != PumpDeviceState.PumpUnreachable)
-                                medtronicPumpStatus.setPumpDeviceState(PumpDeviceState.PumpUnreachable);
-                        }
-
-                    }
-
-                } else {
-                    aapsLogger.warn(LTag.PUMPCOMM, "isDeviceReachable. Failed to parse radio response: "
-                            + ByteUtil.shortHexString(rfSpyResponse.getRaw()));
-                }
-
-            } catch (RileyLinkCommunicationException e) {
-                aapsLogger.warn(LTag.PUMPCOMM, "isDeviceReachable. Failed to decode radio response: "
-                        + ByteUtil.shortHexString(rfSpyResponse.getRaw()));
-            }
-
-        } else {
-            aapsLogger.warn(LTag.PUMPCOMM, "isDeviceReachable. Unknown response: " + ByteUtil.shortHexString(rfSpyResponse.getRaw()));
-        }
-
-        return false;
-    }
-
-
-    @Override
-    public boolean tryToConnectToDevice() {
-        return isDeviceReachable(true);
-    }
-
-
-    private PumpMessage runCommandWithArgs(PumpMessage msg) throws RileyLinkCommunicationException {
-
-        if (debugSetCommands)
-            aapsLogger.debug(LTag.PUMPCOMM, "Run command with Args: ");
-
-        PumpMessage rval;
-        PumpMessage shortMessage = makePumpMessage(msg.commandType, new CarelinkShortMessageBody(new byte[]{0}));
-        // look for ack from short message
-        PumpMessage shortResponse = sendAndListen(shortMessage);
-        if (shortResponse.commandType == MedtronicCommandType.CommandACK) {
-            if (debugSetCommands)
-                aapsLogger.debug(LTag.PUMPCOMM, "Run command with Args: Got ACK response");
-
-            rval = sendAndListen(msg);
-            if (debugSetCommands)
-                aapsLogger.debug(LTag.PUMPCOMM, "2nd Response: " + rval);
-
-            return rval;
-        } else {
-            aapsLogger.error(LTag.PUMPCOMM, "runCommandWithArgs: Pump did not ack Attention packet");
-            return new PumpMessage(aapsLogger, "No ACK after Attention packet.");
-        }
-    }
-
-
-    private PumpMessage runCommandWithFrames(MedtronicCommandType commandType, List<List<Byte>> frames)
-            throws RileyLinkCommunicationException {
-
-        aapsLogger.debug(LTag.PUMPCOMM, "Run command with Frames: " + commandType.name());
-
-        PumpMessage rval = null;
-        PumpMessage shortMessage = makePumpMessage(commandType, new CarelinkShortMessageBody(new byte[]{0}));
-        // look for ack from short message
-        PumpMessage shortResponse = sendAndListen(shortMessage);
-
-        if (shortResponse.commandType != MedtronicCommandType.CommandACK) {
-            aapsLogger.error(LTag.PUMPCOMM, "runCommandWithFrames: Pump did not ack Attention packet");
-
-            return new PumpMessage(aapsLogger, "No ACK after start message.");
-        } else {
-            aapsLogger.debug(LTag.PUMPCOMM, "Run command with Frames: Got ACK response for Attention packet");
-        }
-
-        int frameNr = 1;
-
-        for (List<Byte> frame : frames) {
-
-            byte[] frameData = MedtronicUtil.createByteArray(frame);
-
-            // aapsLogger.debug(LTag.PUMPCOMM,"Frame {} data:\n{}", frameNr, ByteUtil.getCompactString(frameData));
-
-            PumpMessage msg = makePumpMessage(commandType, new CarelinkLongMessageBody(frameData));
-
-            rval = sendAndListen(msg);
-
-            // aapsLogger.debug(LTag.PUMPCOMM,"PumpResponse: " + rval);
-
-            if (rval.commandType != MedtronicCommandType.CommandACK) {
-                aapsLogger.error(LTag.PUMPCOMM, "runCommandWithFrames: Pump did not ACK frame #" + frameNr);
-
-                aapsLogger.error(LTag.PUMPCOMM, String.format(Locale.ENGLISH, "Run command with Frames FAILED (command=%s, response=%s)", commandType.name(),
-                        rval.toString()));
-
-                return new PumpMessage(aapsLogger, "No ACK after frame #" + frameNr);
-            } else {
-                aapsLogger.debug(LTag.PUMPCOMM, "Run command with Frames: Got ACK response for frame #" + frameNr);
-            }
-
-            frameNr++;
-        }
-
-        return rval;
-
-    }
-
-
-    public PumpHistoryResult getPumpHistory(PumpHistoryEntry lastEntry, LocalDateTime targetDate) {
-
-        PumpHistoryResult pumpTotalResult = new PumpHistoryResult(aapsLogger, lastEntry, targetDate == null ? null
-                : DateTimeUtil.toATechDate(targetDate));
-
-        if (doWakeUpBeforeCommand)
-            wakeUp(receiverDeviceAwakeForMinutes, false);
-
-        aapsLogger.debug(LTag.PUMPCOMM, "Current command: " + medtronicUtil.getCurrentCommand());
-
-        medtronicPumpStatus.setPumpDeviceState(PumpDeviceState.Active);
-        boolean doneWithError = false;
-
-        for (int pageNumber = 0; pageNumber < 5; pageNumber++) {
-
-            RawHistoryPage rawHistoryPage = new RawHistoryPage(aapsLogger);
-            // wakeUp(receiverDeviceAwakeForMinutes, false);
-            PumpMessage getHistoryMsg = makePumpMessage(MedtronicCommandType.GetHistoryData,
-                    new GetHistoryPageCarelinkMessageBody(pageNumber));
-
-            aapsLogger.info(LTag.PUMPCOMM, "getPumpHistory: Page " + pageNumber);
-            // aapsLogger.info(LTag.PUMPCOMM,"getPumpHistoryPage("+pageNumber+"): "+ByteUtil.shortHexString(getHistoryMsg.getTxData()));
-            // Ask the pump to transfer history (we get first frame?)
-
-            PumpMessage firstResponse = null;
-            boolean failed = false;
-
-            medtronicUtil.setCurrentCommand(MedtronicCommandType.GetHistoryData, pageNumber, null);
-
-            for (int retries = 0; retries < MAX_COMMAND_TRIES; retries++) {
-
-                try {
-                    firstResponse = runCommandWithArgs(getHistoryMsg);
-                    failed = false;
-                    break;
-                } catch (RileyLinkCommunicationException e) {
-                    aapsLogger.error(LTag.PUMPCOMM, String.format(Locale.ENGLISH, "First call for PumpHistory failed (retry=%d)", retries));
-                    failed = true;
-                }
-            }
-
-            if (failed) {
-                medtronicPumpStatus.setPumpDeviceState(PumpDeviceState.Sleeping);
-                return pumpTotalResult;
-            }
-
-            // aapsLogger.info(LTag.PUMPCOMM,"getPumpHistoryPage("+pageNumber+"): " + ByteUtil.shortHexString(firstResponse.getContents()));
-
-            PumpMessage ackMsg = makePumpMessage(MedtronicCommandType.CommandACK, new PumpAckMessageBody());
-            GetHistoryPageCarelinkMessageBody currentResponse = new GetHistoryPageCarelinkMessageBody(firstResponse
-                    .getMessageBody().getTxData());
-            int expectedFrameNum = 1;
-            boolean done = false;
-            // while (expectedFrameNum == currentResponse.getFrameNumber()) {
-
-            int failures = 0;
-            while (!done) {
-                // examine current response for problems.
-                byte[] frameData = currentResponse.getFrameData();
-                if ((frameData != null) && (frameData.length > 0)
-                        && currentResponse.getFrameNumber() == expectedFrameNum) {
-                    // success! got a frame.
-                    if (frameData.length != 64) {
-                        aapsLogger.warn(LTag.PUMPCOMM, "Expected frame of length 64, got frame of length " + frameData.length);
-                        // but append it anyway?
-                    }
-                    // handle successful frame data
-                    rawHistoryPage.appendData(currentResponse.getFrameData());
-                    // RileyLinkMedtronicService.getInstance().announceProgress(((100 / 16) *
-                    // currentResponse.getFrameNumber() + 1));
-                    medtronicUtil.setCurrentCommand(MedtronicCommandType.GetHistoryData, pageNumber,
-                            currentResponse.getFrameNumber());
-
-                    aapsLogger.info(LTag.PUMPCOMM, String.format(Locale.ENGLISH, "getPumpHistory: Got frame %d of Page %d", currentResponse.getFrameNumber(), pageNumber));
-                    // Do we need to ask for the next frame?
-                    if (expectedFrameNum < 16) { // This number may not be correct for pumps other than 522/722
-                        expectedFrameNum++;
-                    } else {
-                        done = true; // successful completion
-                    }
-                } else {
-                    if (frameData == null) {
-                        aapsLogger.error(LTag.PUMPCOMM, "null frame data, retrying");
-                    } else if (currentResponse.getFrameNumber() != expectedFrameNum) {
-                        aapsLogger.warn(LTag.PUMPCOMM, String.format(Locale.ENGLISH, "Expected frame number %d, received %d (retrying)", expectedFrameNum,
-                                currentResponse.getFrameNumber()));
-                    } else if (frameData.length == 0) {
-                        aapsLogger.warn(LTag.PUMPCOMM, "Frame has zero length, retrying");
-                    }
-                    failures++;
-                    if (failures == 6) {
-                        aapsLogger.error(LTag.PUMPCOMM,
-                                String.format(Locale.ENGLISH, "getPumpHistory: 6 failures in attempting to download frame %d of page %d, giving up.",
-                                        expectedFrameNum, pageNumber));
-                        done = true; // failure completion.
-                        doneWithError = true;
-                    }
-                }
-
-                if (!done) {
-                    // ask for next frame
-                    PumpMessage nextMsg = null;
-
-                    for (int retries = 0; retries < MAX_COMMAND_TRIES; retries++) {
-
-                        try {
-                            nextMsg = sendAndListen(ackMsg);
-                            break;
-                        } catch (RileyLinkCommunicationException e) {
-                            aapsLogger.error(LTag.PUMPCOMM, String.format(Locale.ENGLISH, "Problem acknowledging frame response. (retry=%d)", retries));
-                        }
-                    }
-
-                    if (nextMsg != null)
-                        currentResponse = new GetHistoryPageCarelinkMessageBody(nextMsg.getMessageBody().getTxData());
-                    else {
-                        aapsLogger.error(LTag.PUMPCOMM, "We couldn't acknowledge frame from pump, aborting operation.");
-                    }
-                }
-            }
-
-            if (rawHistoryPage.getLength() != 1024) {
-                aapsLogger.warn(LTag.PUMPCOMM, "getPumpHistory: short page.  Expected length of 1024, found length of "
-                        + rawHistoryPage.getLength());
-                doneWithError = true;
-            }
-
-            if (!rawHistoryPage.isChecksumOK()) {
-                aapsLogger.error(LTag.PUMPCOMM, "getPumpHistory: checksum is wrong");
-                doneWithError = true;
-            }
-
-            if (doneWithError) {
-                medtronicPumpStatus.setPumpDeviceState(PumpDeviceState.Sleeping);
-                return pumpTotalResult;
-            }
-
-            rawHistoryPage.dumpToDebug();
-
-            List<PumpHistoryEntry> medtronicHistoryEntries = medtronicPumpHistoryDecoder.processPageAndCreateRecords(rawHistoryPage);
-
-            aapsLogger.debug(LTag.PUMPCOMM, String.format(Locale.ENGLISH, "getPumpHistory: Found %d history entries.", medtronicHistoryEntries.size()));
-
-            pumpTotalResult.addHistoryEntries(medtronicHistoryEntries, pageNumber);
-
-            aapsLogger.debug(LTag.PUMPCOMM, String.format(Locale.ENGLISH, "getPumpHistory: Search status: Search finished: %b", pumpTotalResult.isSearchFinished()));
-
-            if (pumpTotalResult.isSearchFinished()) {
-                medtronicPumpStatus.setPumpDeviceState(PumpDeviceState.Sleeping);
-
-                return pumpTotalResult;
-            }
-        }
-
-        medtronicPumpStatus.setPumpDeviceState(PumpDeviceState.Sleeping);
-
-        return pumpTotalResult;
-
-    }
-
-
-    public String getErrorResponse() {
-        return this.errorMessage;
-    }
-
-
-    @Override
-    public byte[] createPumpMessageContent(RLMessageType type) {
-        switch (type) {
-            case PowerOn:
-                return medtronicUtil.buildCommandPayload(rileyLinkServiceData, MedtronicCommandType.RFPowerOn, //
-                        new byte[]{2, 1, (byte) receiverDeviceAwakeForMinutes}); // maybe this is better FIXME
-
-            case ReadSimpleData:
-                return medtronicUtil.buildCommandPayload(rileyLinkServiceData, MedtronicCommandType.PumpModel, null);
-        }
-        return new byte[0];
-    }
-
-
-    private PumpMessage makePumpMessage(MedtronicCommandType messageType, byte[] body) {
-        return makePumpMessage(messageType, body == null ? new CarelinkShortMessageBody()
-                : new CarelinkShortMessageBody(body));
-    }
-
-
-    private PumpMessage makePumpMessage(MedtronicCommandType messageType) {
-        return makePumpMessage(messageType, (byte[]) null);
-    }
-
-
-    private PumpMessage makePumpMessage(MedtronicCommandType messageType, MessageBody messageBody) {
-        PumpMessage msg = new PumpMessage(aapsLogger);
-        msg.init(PacketType.Carelink, rileyLinkServiceData.pumpIDBytes, messageType, messageBody);
-        return msg;
-    }
-
-
-    private PumpMessage sendAndGetResponse(MedtronicCommandType commandType) throws RileyLinkCommunicationException {
-
-        return sendAndGetResponse(commandType, null, DEFAULT_TIMEOUT);
-    }
-
-
-    /**
-     * Main wrapper method for sending data - (for getting responses)
-     *
-     * @param commandType
-     * @param bodyData
-     * @param timeoutMs
-     * @return
-     */
-    private PumpMessage sendAndGetResponse(MedtronicCommandType commandType, byte[] bodyData, int timeoutMs)
-            throws RileyLinkCommunicationException {
-        // wakeUp
-        if (doWakeUpBeforeCommand)
-            wakeUp(receiverDeviceAwakeForMinutes, false);
-
-        medtronicPumpStatus.setPumpDeviceState(PumpDeviceState.Active);
-
-        // create message
-        PumpMessage msg;
-
-        if (bodyData == null)
-            msg = makePumpMessage(commandType);
-        else
-            msg = makePumpMessage(commandType, bodyData);
-
-        // send and wait for response
-        PumpMessage response = sendAndListen(msg, timeoutMs);
-
-        medtronicPumpStatus.setPumpDeviceState(PumpDeviceState.Sleeping);
-
-        return response;
-    }
-
-
-    private PumpMessage sendAndListen(PumpMessage msg) throws RileyLinkCommunicationException {
-        return sendAndListen(msg, 4000); // 2000
-    }
-
-
-    // All pump communications go through this function.
-    @Override
-    protected PumpMessage sendAndListen(PumpMessage msg, int timeout_ms) throws RileyLinkCommunicationException {
-        return super.sendAndListen(msg, timeout_ms);
-    }
-
-
-    private Object sendAndGetResponseWithCheck(MedtronicCommandType commandType) {
-
-        return sendAndGetResponseWithCheck(commandType, null);
-    }
-
-
-    private Object sendAndGetResponseWithCheck(MedtronicCommandType commandType, byte[] bodyData) {
-
-        aapsLogger.debug(LTag.PUMPCOMM, "getDataFromPump: " + commandType);
-
-        for (int retries = 0; retries < MAX_COMMAND_TRIES; retries++) {
-
-            try {
-                PumpMessage response = sendAndGetResponse(commandType, bodyData, DEFAULT_TIMEOUT + (DEFAULT_TIMEOUT * retries));
-
-                String check = checkResponseContent(response, commandType.commandDescription, commandType.expectedLength);
-
-                if (check == null) {
-
-                    Object dataResponse = medtronicConverter.convertResponse(medtronicPumpPlugin.getPumpDescription().getPumpType(), commandType, response.getRawContent());
-
-                    if (dataResponse != null) {
-                        this.errorMessage = null;
-                        aapsLogger.debug(LTag.PUMPCOMM, String.format(Locale.ENGLISH, "Converted response for %s is %s.", commandType.name(), dataResponse));
-
-                        return dataResponse;
-                    } else {
-                        this.errorMessage = "Error decoding response.";
-                    }
-                } else {
-                    this.errorMessage = check;
-                    // return null;
-                }
-
-            } catch (RileyLinkCommunicationException e) {
-                aapsLogger.warn(LTag.PUMPCOMM, String.format(Locale.ENGLISH, "Error getting response from RileyLink (error=%s, retry=%d)", e.getMessage(), retries + 1));
-            }
-
-        }
-
-        return null;
-    }
-
-
-    private String checkResponseContent(PumpMessage response, String method, int expectedLength) {
-
-        if (!response.isValid()) {
-            String responseData = String.format("%s: Invalid response.", method);
-            aapsLogger.warn(LTag.PUMPCOMM, responseData);
-            return responseData;
-        }
-
-        byte[] contents = response.getRawContent();
-
-        if (contents != null) {
-            if (contents.length >= expectedLength) {
-                aapsLogger.debug(LTag.PUMPCOMM, String.format(Locale.ENGLISH, "%s: Content: %s", method, ByteUtil.shortHexString(contents)));
-                return null;
-
-            } else {
-                String responseData = String.format(
-                        "%s: Cannot return data. Data is too short [expected=%s, received=%s].", method, ""
-                                + expectedLength, "" + contents.length);
-
-                aapsLogger.warn(LTag.PUMPCOMM, responseData);
-                return responseData;
-            }
-        } else {
-            String responseData = String.format("%s: Cannot return data. Null response.", method);
-            aapsLogger.warn(LTag.PUMPCOMM, responseData);
-            return responseData;
-        }
-    }
-
-
-    // PUMP SPECIFIC COMMANDS
-
-    public Float getRemainingInsulin() {
-
-        Object responseObject = sendAndGetResponseWithCheck(MedtronicCommandType.GetRemainingInsulin);
-
-        return responseObject == null ? null : (Float) responseObject;
-    }
-
-
-    public MedtronicDeviceType getPumpModel() {
-
-        Object responseObject = sendAndGetResponseWithCheck(MedtronicCommandType.PumpModel);
-
-        return responseObject == null ? null : (MedtronicDeviceType) responseObject;
-    }
-
-
-    public BasalProfile getBasalProfile() {
-
-        // wakeUp
-        if (doWakeUpBeforeCommand)
-            wakeUp(receiverDeviceAwakeForMinutes, false);
-
-        MedtronicCommandType commandType = MedtronicCommandType.GetBasalProfileSTD;
-
-        aapsLogger.debug(LTag.PUMPCOMM, "getDataFromPump: " + commandType);
-
-        medtronicUtil.setCurrentCommand(commandType);
-
-        medtronicPumpStatus.setPumpDeviceState(PumpDeviceState.Active);
-
-        for (int retries = 0; retries <= MAX_COMMAND_TRIES; retries++) {
-
-            try {
-                // create message
-                PumpMessage msg;
-
-                msg = makePumpMessage(commandType);
-
-                // send and wait for response
-
-                PumpMessage response = sendAndListen(msg, DEFAULT_TIMEOUT + (DEFAULT_TIMEOUT * retries));
-
-//                aapsLogger.debug(LTag.PUMPCOMM,"1st Response: " + HexDump.toHexStringDisplayable(response.getRawContent()));
-//                aapsLogger.debug(LTag.PUMPCOMM,"1st Response: " + HexDump.toHexStringDisplayable(response.getMessageBody().getTxData()));
-
-                String check = checkResponseContent(response, commandType.commandDescription, 1);
-
-                byte[] data = null;
-
-                if (check == null) {
-
-                    data = response.getRawContentOfFrame();
-
-                    PumpMessage ackMsg = makePumpMessage(MedtronicCommandType.CommandACK, new PumpAckMessageBody());
-
-                    while (checkIfWeHaveMoreData(commandType, response, data)) {
-
-                        response = sendAndListen(ackMsg, DEFAULT_TIMEOUT + (DEFAULT_TIMEOUT * retries));
-
-//                        aapsLogger.debug(LTag.PUMPCOMM,"{} Response: {}", runs, HexDump.toHexStringDisplayable(response2.getRawContent()));
-//                        aapsLogger.debug(LTag.PUMPCOMM,"{} Response: {}", runs,
-//                            HexDump.toHexStringDisplayable(response2.getMessageBody().getTxData()));
-
-                        String check2 = checkResponseContent(response, commandType.commandDescription, 1);
-
-                        if (check2 == null) {
-
-                            data = ByteUtil.concat(data, response.getRawContentOfFrame());
-
-                        } else {
-                            this.errorMessage = check2;
-                            aapsLogger.error(LTag.PUMPCOMM, "Error with response got GetProfile: " + check2);
-                        }
-                    }
-
-                } else {
-                    errorMessage = check;
-                }
-
-                BasalProfile basalProfile = (BasalProfile) medtronicConverter.convertResponse(medtronicPumpPlugin.getPumpDescription().getPumpType(), commandType, data);
-
-                if (basalProfile != null) {
-                    aapsLogger.debug(LTag.PUMPCOMM, String.format(Locale.ENGLISH, "Converted response for %s is %s.", commandType.name(), basalProfile));
-
-                    medtronicUtil.setCurrentCommand(null);
-                    medtronicPumpStatus.setPumpDeviceState(PumpDeviceState.Sleeping);
-
-                    return basalProfile;
-                }
-
-            } catch (RileyLinkCommunicationException e) {
-                aapsLogger.error(LTag.PUMPCOMM, String.format(Locale.ENGLISH, "Error getting response from RileyLink (error=%s, retry=%d)", e.getMessage(), retries + 1));
-            }
-        }
-
-        aapsLogger.warn(LTag.PUMPCOMM, "Error reading profile in max retries.");
-        medtronicUtil.setCurrentCommand(null);
-        medtronicPumpStatus.setPumpDeviceState(PumpDeviceState.Sleeping);
-
-        return null;
-
-    }
-
-
-    private boolean checkIfWeHaveMoreData(MedtronicCommandType commandType, PumpMessage response, byte[] data) {
-
-        if (commandType == MedtronicCommandType.GetBasalProfileSTD || //
-                commandType == MedtronicCommandType.GetBasalProfileA || //
-                commandType == MedtronicCommandType.GetBasalProfileB) {
-            byte[] responseRaw = response.getRawContentOfFrame();
-
-            int last = responseRaw.length - 1;
-
-            aapsLogger.debug(LTag.PUMPCOMM, "Length: " + data.length);
-
-            if (data.length >= BasalProfile.MAX_RAW_DATA_SIZE) {
-                return false;
-            }
-
-            if (responseRaw.length < 2) {
-                return false;
-            }
-
-            return !(responseRaw[last] == 0x00 && responseRaw[last - 1] == 0x00 && responseRaw[last - 2] == 0x00);
-        }
-
-        return false;
-    }
-
-
-    public ClockDTO getPumpTime() {
-
-        ClockDTO clockDTO = new ClockDTO();
-        clockDTO.localDeviceTime = new LocalDateTime();
-
-        Object responseObject = sendAndGetResponseWithCheck(MedtronicCommandType.GetRealTimeClock);
-
-        if (responseObject != null) {
-            clockDTO.pumpTime = (LocalDateTime) responseObject;
-            return clockDTO;
-        }
-
-        return null;
-    }
-
-
-    public TempBasalPair getTemporaryBasal() {
-
-        Object responseObject = sendAndGetResponseWithCheck(MedtronicCommandType.ReadTemporaryBasal);
-
-        return responseObject == null ? null : (TempBasalPair) responseObject;
-    }
-
-
-    public Map<String, PumpSettingDTO> getPumpSettings() {
-
-        Object responseObject = sendAndGetResponseWithCheck(MedtronicCommandType.getSettings(medtronicUtil
-                .getMedtronicPumpModel()));
-
-        return responseObject == null ? null : (Map<String, PumpSettingDTO>) responseObject;
-    }
-
-
-    public Boolean setBolus(double units) {
-
-        aapsLogger.info(LTag.PUMPCOMM, "setBolus: " + units);
-
-        return setCommand(MedtronicCommandType.SetBolus, medtronicUtil.getBolusStrokes(units));
-
-    }
-
-
-    public boolean setTBR(TempBasalPair tbr) {
-
-        aapsLogger.info(LTag.PUMPCOMM, "setTBR: " + tbr.getDescription());
-
-        return setCommand(MedtronicCommandType.SetTemporaryBasal, tbr.getAsRawData());
-    }
-
-
-    public Boolean setPumpTime() {
-
-        GregorianCalendar gc = new GregorianCalendar();
-        gc.add(Calendar.SECOND, 5);
-
-        aapsLogger.info(LTag.PUMPCOMM, "setPumpTime: " + DateTimeUtil.toString(gc));
-
-        int i = 1;
-        byte[] data = new byte[8];
-        data[0] = 7;
-        data[i] = (byte) gc.get(Calendar.HOUR_OF_DAY);
-        data[i + 1] = (byte) gc.get(Calendar.MINUTE);
-        data[i + 2] = (byte) gc.get(Calendar.SECOND);
-
-        byte[] yearByte = MedtronicUtil.getByteArrayFromUnsignedShort(gc.get(Calendar.YEAR), true);
-
-        data[i + 3] = yearByte[0];
-        data[i + 4] = yearByte[1];
-
-        data[i + 5] = (byte) (gc.get(Calendar.MONTH) + 1);
-        data[i + 6] = (byte) gc.get(Calendar.DAY_OF_MONTH);
-
-        //aapsLogger.info(LTag.PUMPCOMM,"setPumpTime: Body:  " + ByteUtil.getHex(data));
-
-        return setCommand(MedtronicCommandType.SetRealTimeClock, data);
-
-    }
-
-
-    private boolean setCommand(MedtronicCommandType commandType, byte[] body) {
-
-        for (int retries = 0; retries <= MAX_COMMAND_TRIES; retries++) {
-
-            try {
-                if (this.doWakeUpBeforeCommand)
-                    wakeUp(false);
-
-                if (debugSetCommands)
-                    aapsLogger.debug(LTag.PUMPCOMM, String.format(Locale.ENGLISH, "%s: Body - %s", commandType.getCommandDescription(),
-                            ByteUtil.getHex(body)));
-
-                PumpMessage msg = makePumpMessage(commandType, new CarelinkLongMessageBody(body));
-
-                PumpMessage pumpMessage = runCommandWithArgs(msg);
-
-                if (debugSetCommands)
-                    aapsLogger.debug(LTag.PUMPCOMM, String.format(Locale.ENGLISH, "%s: %s", commandType.getCommandDescription(), pumpMessage.getResponseContent()));
-
-                if (pumpMessage.commandType == MedtronicCommandType.CommandACK) {
-                    return true;
-                } else {
-                    aapsLogger.warn(LTag.PUMPCOMM, "We received non-ACK response from pump: " + pumpMessage.getResponseContent());
-                }
-
-            } catch (RileyLinkCommunicationException e) {
-                aapsLogger.warn(LTag.PUMPCOMM, String.format(Locale.ENGLISH, "Error getting response from RileyLink (error=%s, retry=%d)", e.getMessage(), retries + 1));
-            }
-        }
-
-        return false;
-    }
-
-
-    public boolean cancelTBR() {
-        return setTBR(new TempBasalPair(0.0d, false, 0));
-    }
-
-
-    public BatteryStatusDTO getRemainingBattery() {
-
-        Object responseObject = sendAndGetResponseWithCheck(MedtronicCommandType.GetBatteryStatus);
-
-        return responseObject == null ? null : (BatteryStatusDTO) responseObject;
-    }
-
-
-    public Boolean setBasalProfile(BasalProfile basalProfile) {
-
-        List<List<Byte>> basalProfileFrames = medtronicUtil.getBasalProfileFrames(basalProfile.getRawData());
-
-        for (int retries = 0; retries <= MAX_COMMAND_TRIES; retries++) {
-
-            PumpMessage responseMessage = null;
-            try {
-                responseMessage = runCommandWithFrames(MedtronicCommandType.SetBasalProfileSTD,
-                        basalProfileFrames);
-
-                if (responseMessage.commandType == MedtronicCommandType.CommandACK)
-                    return true;
-
-            } catch (RileyLinkCommunicationException e) {
-                aapsLogger.warn(LTag.PUMPCOMM, String.format(Locale.ENGLISH, "Error getting response from RileyLink (error=%s, retry=%d)", e.getMessage(), retries + 1));
-            }
-
-            if (responseMessage != null)
-                aapsLogger.warn(LTag.PUMPCOMM, String.format(Locale.ENGLISH, "Set Basal Profile: Invalid response: commandType=%s,rawData=%s", responseMessage.commandType, ByteUtil.shortHexString(responseMessage.getRawContent())));
-            else
-                aapsLogger.warn(LTag.PUMPCOMM, "Set Basal Profile: Null response.");
-        }
-
-        return false;
-
-    }
-}
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
new file mode 100644
index 0000000000..3478cfce7c
--- /dev/null
+++ b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/MedtronicCommunicationManager.kt
@@ -0,0 +1,680 @@
+package info.nightscout.androidaps.plugins.pump.medtronic.comm
+
+import android.os.SystemClock
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.pump.common.defs.PumpDeviceState
+import info.nightscout.androidaps.plugins.pump.common.defs.PumpType
+import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkCommunicationManager
+import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkConst
+import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.RileyLinkCommunicationException
+import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.data.RadioPacket
+import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.data.RadioResponse
+import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.defs.RLMessageType
+import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.service.tasks.WakeAndTuneTask
+import info.nightscout.androidaps.plugins.pump.common.utils.ByteUtil
+import info.nightscout.androidaps.plugins.pump.common.utils.DateTimeUtil
+import info.nightscout.androidaps.plugins.pump.medtronic.MedtronicPumpPlugin
+import info.nightscout.androidaps.plugins.pump.medtronic.comm.history.RawHistoryPage
+import info.nightscout.androidaps.plugins.pump.medtronic.comm.history.pump.MedtronicPumpHistoryDecoder
+import info.nightscout.androidaps.plugins.pump.medtronic.comm.history.pump.PumpHistoryEntry
+import info.nightscout.androidaps.plugins.pump.medtronic.comm.history.pump.PumpHistoryResult
+import info.nightscout.androidaps.plugins.pump.medtronic.comm.message.*
+import info.nightscout.androidaps.plugins.pump.medtronic.data.dto.BasalProfile
+import info.nightscout.androidaps.plugins.pump.medtronic.data.dto.BatteryStatusDTO
+import info.nightscout.androidaps.plugins.pump.medtronic.data.dto.ClockDTO
+import info.nightscout.androidaps.plugins.pump.medtronic.data.dto.PumpSettingDTO
+import info.nightscout.androidaps.plugins.pump.medtronic.data.dto.TempBasalPair
+import info.nightscout.androidaps.plugins.pump.medtronic.defs.MedtronicCommandType
+import info.nightscout.androidaps.plugins.pump.medtronic.defs.MedtronicCommandType.Companion.getSettings
+import info.nightscout.androidaps.plugins.pump.medtronic.defs.MedtronicDeviceType
+import info.nightscout.androidaps.plugins.pump.medtronic.driver.MedtronicPumpStatus
+import info.nightscout.androidaps.plugins.pump.medtronic.util.MedtronicUtil
+import info.nightscout.androidaps.plugins.pump.medtronic.util.MedtronicUtil.Companion.createByteArray
+import info.nightscout.androidaps.plugins.pump.medtronic.util.MedtronicUtil.Companion.getByteArrayFromUnsignedShort
+import org.joda.time.LocalDateTime
+import java.util.*
+import javax.inject.Inject
+import javax.inject.Singleton
+
+/**
+ * Original file created by geoff on 5/30/16.
+ *
+ *
+ * Split into 2 implementations, so that we can split it by target device. - Andy
+ * This was mostly rewritten from Original version, and lots of commands and
+ * functionality added.
+ */
+@Singleton
+class MedtronicCommunicationManager  // This empty constructor must be kept, otherwise dagger injection might break!
+@Inject constructor() : RileyLinkCommunicationManager<PumpMessage?>() {
+
+    @Inject lateinit var medtronicPumpStatus: MedtronicPumpStatus
+    @Inject lateinit var medtronicPumpPlugin: MedtronicPumpPlugin
+    @Inject lateinit var medtronicConverter: MedtronicConverter
+    @Inject lateinit var medtronicUtil: MedtronicUtil
+    @Inject lateinit var medtronicPumpHistoryDecoder: MedtronicPumpHistoryDecoder
+
+    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
+    private val debugSetCommands = false
+    private var doWakeUpBeforeCommand = true
+
+    @Inject
+    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)
+    }
+
+    override fun createResponseMessage(payload: ByteArray): PumpMessage {
+        return PumpMessage(aapsLogger, payload)
+    }
+
+    override fun setPumpDeviceState(pumpDeviceState: PumpDeviceState) {
+        medtronicPumpStatus.pumpDeviceState = pumpDeviceState
+    }
+
+    fun setDoWakeUpBeforeCommand(doWakeUp: Boolean) {
+        doWakeUpBeforeCommand = doWakeUp
+    }
+
+    override fun isDeviceReachable(): Boolean {
+        return isDeviceReachable(false)
+    }
+
+    /**
+     * We do actual wakeUp and compare PumpModel with currently selected one. If returned model is
+     * not Unknown, pump is reachable.
+     *
+     * @return
+     */
+    private fun isDeviceReachable(canPreventTuneUp: Boolean): Boolean {
+        val state = medtronicPumpStatus.pumpDeviceState
+        if (state !== PumpDeviceState.PumpUnreachable) medtronicPumpStatus.pumpDeviceState = PumpDeviceState.WakingUp
+        for (retry in 0..4) {
+            aapsLogger.debug(LTag.PUMPCOMM, "isDeviceReachable. Waking pump... " + if (retry != 0) " (retry $retry)" else "")
+            val connected = connectToDevice()
+            if (connected) return true
+            SystemClock.sleep(1000)
+        }
+        if (state !== PumpDeviceState.PumpUnreachable) medtronicPumpStatus.pumpDeviceState = PumpDeviceState.PumpUnreachable
+        if (!canPreventTuneUp) {
+            val diff = System.currentTimeMillis() - medtronicPumpStatus.lastConnection
+            if (diff > RILEYLINK_TIMEOUT) {
+                serviceTaskExecutor.startTask(WakeAndTuneTask(injector))
+            }
+        }
+        return false
+    }
+
+    private fun connectToDevice(): Boolean {
+        val state = medtronicPumpStatus.pumpDeviceState
+
+        // check connection
+        val pumpMsgContent = createPumpMessageContent(RLMessageType.ReadSimpleData) // simple
+        val rfSpyResponse = rfspy.transmitThenReceive(RadioPacket(injector, pumpMsgContent), 0.toByte(), 200.toByte(),
+            0.toByte(), 0.toByte(), 25000, 0.toByte())
+        aapsLogger.info(LTag.PUMPCOMM, "wakeup: raw response is " + ByteUtil.shortHexString(rfSpyResponse.raw))
+        if (rfSpyResponse.wasTimeout()) {
+            aapsLogger.error(LTag.PUMPCOMM, "isDeviceReachable. Failed to find pump (timeout).")
+        } else if (rfSpyResponse.looksLikeRadioPacket()) {
+            val radioResponse = RadioResponse(injector)
+            try {
+                radioResponse.init(rfSpyResponse.raw)
+                if (radioResponse.isValid) {
+                    val pumpResponse = createResponseMessage(radioResponse.payload)
+                    if (!pumpResponse.isValid) {
+                        aapsLogger.warn(LTag.PUMPCOMM, String.format(Locale.ENGLISH, "Response is invalid ! [interrupted=%b, timeout=%b]", rfSpyResponse.wasInterrupted(),
+                            rfSpyResponse.wasTimeout()))
+                    } else {
+
+                        // radioResponse.rssi;
+                        val dataResponse = medtronicConverter.decodeModel(pumpResponse.rawContent)
+                        val pumpModel = dataResponse as MedtronicDeviceType?
+                        val valid = pumpModel !== MedtronicDeviceType.Unknown_Device
+                        if (!medtronicUtil.isModelSet && valid) {
+                            medtronicUtil.medtronicPumpModel = pumpModel!!
+                            medtronicUtil.isModelSet = true
+                        }
+                        aapsLogger.debug(LTag.PUMPCOMM, String.format(Locale.ENGLISH, "isDeviceReachable. PumpModel is %s - Valid: %b (rssi=%d)", medtronicUtil.medtronicPumpModel, valid,
+                            radioResponse.rssi))
+                        if (valid) {
+                            if (state === PumpDeviceState.PumpUnreachable)
+                                medtronicPumpStatus.pumpDeviceState = PumpDeviceState.WakingUp
+                            else
+                                medtronicPumpStatus.pumpDeviceState = PumpDeviceState.Sleeping
+                            rememberLastGoodDeviceCommunicationTime()
+                            return true
+                        } else {
+                            if (state !== PumpDeviceState.PumpUnreachable) medtronicPumpStatus.pumpDeviceState = PumpDeviceState.PumpUnreachable
+                        }
+                    }
+                } else {
+                    aapsLogger.warn(LTag.PUMPCOMM, "isDeviceReachable. Failed to parse radio response: "
+                        + ByteUtil.shortHexString(rfSpyResponse.raw))
+                }
+            } catch (e: RileyLinkCommunicationException) {
+                aapsLogger.warn(LTag.PUMPCOMM, "isDeviceReachable. Failed to decode radio response: "
+                    + ByteUtil.shortHexString(rfSpyResponse.raw))
+            }
+        } else {
+            aapsLogger.warn(LTag.PUMPCOMM, "isDeviceReachable. Unknown response: " + ByteUtil.shortHexString(rfSpyResponse.raw))
+        }
+        return false
+    }
+
+    override fun tryToConnectToDevice(): Boolean {
+        return isDeviceReachable(true)
+    }
+
+    @Throws(RileyLinkCommunicationException::class)
+    private fun runCommandWithArgs(msg: PumpMessage): PumpMessage {
+        if (debugSetCommands) aapsLogger.debug(LTag.PUMPCOMM, "Run command with Args: ")
+        val rval: PumpMessage
+        val shortMessage = makePumpMessage(msg.commandType, CarelinkShortMessageBody(byteArrayOf(0)))
+        // look for ack from short message
+        val shortResponse = sendAndListen(shortMessage)
+        return if (shortResponse.commandType === MedtronicCommandType.CommandACK) {
+            if (debugSetCommands) aapsLogger.debug(LTag.PUMPCOMM, "Run command with Args: Got ACK response")
+            rval = sendAndListen(msg)
+            if (debugSetCommands) aapsLogger.debug(LTag.PUMPCOMM, "2nd Response: $rval")
+            rval
+        } else {
+            aapsLogger.error(LTag.PUMPCOMM, "runCommandWithArgs: Pump did not ack Attention packet")
+            PumpMessage(aapsLogger, "No ACK after Attention packet.")
+        }
+    }
+
+    @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)
+        var rval: PumpMessage? = null
+        val shortMessage = makePumpMessage(commandType, CarelinkShortMessageBody(byteArrayOf(0)))
+        // look for ack from short message
+        val shortResponse = sendAndListen(shortMessage)
+        if (shortResponse.commandType !== MedtronicCommandType.CommandACK) {
+            aapsLogger.error(LTag.PUMPCOMM, "runCommandWithFrames: Pump did not ack Attention packet")
+            return PumpMessage(aapsLogger, "No ACK after start message.")
+        } else {
+            aapsLogger.debug(LTag.PUMPCOMM, "Run command with Frames: Got ACK response for Attention packet")
+        }
+        var frameNr = 1
+        for (frame in frames) {
+            val frameData = createByteArray(frame)
+
+            // aapsLogger.debug(LTag.PUMPCOMM,"Frame {} data:\n{}", frameNr, ByteUtil.getCompactString(frameData));
+            val msg = makePumpMessage(commandType, CarelinkLongMessageBody(frameData))
+            rval = sendAndListen(msg)
+
+            // aapsLogger.debug(LTag.PUMPCOMM,"PumpResponse: " + rval);
+            if (rval.commandType !== MedtronicCommandType.CommandACK) {
+                aapsLogger.error(LTag.PUMPCOMM, "runCommandWithFrames: Pump did not ACK frame #$frameNr")
+                aapsLogger.error(LTag.PUMPCOMM, String.format(Locale.ENGLISH, "Run command with Frames FAILED (command=%s, response=%s)", commandType.name,
+                    rval.toString()))
+                return PumpMessage(aapsLogger, "No ACK after frame #$frameNr")
+            } else {
+                aapsLogger.debug(LTag.PUMPCOMM, "Run command with Frames: Got ACK response for frame #$frameNr")
+            }
+            frameNr++
+        }
+        return rval
+    }
+
+    fun getPumpHistory(lastEntry: PumpHistoryEntry?, targetDate: LocalDateTime?): PumpHistoryResult {
+        val pumpTotalResult = PumpHistoryResult(aapsLogger, lastEntry, if (targetDate == null) null else DateTimeUtil.toATechDate(targetDate))
+        if (doWakeUpBeforeCommand) wakeUp(receiverDeviceAwakeForMinutes, false)
+        aapsLogger.debug(LTag.PUMPCOMM, "Current command: " + medtronicUtil.getCurrentCommand())
+        medtronicPumpStatus.pumpDeviceState = PumpDeviceState.Active
+        var doneWithError = false
+        for (pageNumber in 0..4) {
+            val rawHistoryPage = RawHistoryPage(aapsLogger)
+            // wakeUp(receiverDeviceAwakeForMinutes, false);
+            val getHistoryMsg = makePumpMessage(MedtronicCommandType.GetHistoryData,
+                GetHistoryPageCarelinkMessageBody(pageNumber))
+            aapsLogger.info(LTag.PUMPCOMM, "getPumpHistory: Page $pageNumber")
+            // aapsLogger.info(LTag.PUMPCOMM,"getPumpHistoryPage("+pageNumber+"): "+ByteUtil.shortHexString(getHistoryMsg.getTxData()));
+            // Ask the pump to transfer history (we get first frame?)
+            var firstResponse: PumpMessage? = null
+            var failed = false
+            medtronicUtil.setCurrentCommand(MedtronicCommandType.GetHistoryData, pageNumber, null)
+            for (retries in 0 until MAX_COMMAND_TRIES) {
+                try {
+                    firstResponse = runCommandWithArgs(getHistoryMsg)
+                    failed = false
+                    break
+                } catch (e: RileyLinkCommunicationException) {
+                    aapsLogger.error(LTag.PUMPCOMM, String.format(Locale.ENGLISH, "First call for PumpHistory failed (retry=%d)", retries))
+                    failed = true
+                }
+            }
+            if (failed) {
+                medtronicPumpStatus.pumpDeviceState = PumpDeviceState.Sleeping
+                return pumpTotalResult
+            }
+
+            // aapsLogger.info(LTag.PUMPCOMM,"getPumpHistoryPage("+pageNumber+"): " + ByteUtil.shortHexString(firstResponse.getContents()));
+            val ackMsg = makePumpMessage(MedtronicCommandType.CommandACK, PumpAckMessageBody())
+            var currentResponse = GetHistoryPageCarelinkMessageBody(firstResponse!!.messageBody!!.txData)
+            var expectedFrameNum = 1
+            var done = false
+            // while (expectedFrameNum == currentResponse.getFrameNumber()) {
+            var failures = 0
+            while (!done) {
+                // examine current response for problems.
+                val frameData = currentResponse.frameData
+                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)
+                        // but append it anyway?
+                    }
+                    // handle successful frame data
+                    rawHistoryPage.appendData(currentResponse.frameData)
+                    // RileyLinkMedtronicService.getInstance().announceProgress(((100 / 16) *
+                    // currentResponse.getFrameNumber() + 1));
+                    medtronicUtil.setCurrentCommand(MedtronicCommandType.GetHistoryData, pageNumber,
+                        currentResponse.frameNumber)
+                    aapsLogger.info(LTag.PUMPCOMM, String.format(Locale.ENGLISH, "getPumpHistory: Got frame %d of Page %d", currentResponse.frameNumber, pageNumber))
+                    // Do we need to ask for the next frame?
+                    if (expectedFrameNum < 16) { // This number may not be correct for pumps other than 522/722
+                        expectedFrameNum++
+                    } else {
+                        done = true // successful completion
+                    }
+                } else {
+                    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.isEmpty()) {
+                        aapsLogger.warn(LTag.PUMPCOMM, "Frame has zero length, retrying")
+                    }
+                    failures++
+                    if (failures == 6) {
+                        aapsLogger.error(LTag.PUMPCOMM, String.format(Locale.ENGLISH, "getPumpHistory: 6 failures in attempting to download frame %d of page %d, giving up.",
+                            expectedFrameNum, pageNumber))
+                        done = true // failure completion.
+                        doneWithError = true
+                    }
+                }
+                if (!done) {
+                    // ask for next frame
+                    var nextMsg: PumpMessage? = null
+                    for (retries in 0 until MAX_COMMAND_TRIES) {
+                        try {
+                            nextMsg = sendAndListen(ackMsg)
+                            break
+                        } catch (e: RileyLinkCommunicationException) {
+                            aapsLogger.error(LTag.PUMPCOMM, String.format(Locale.ENGLISH, "Problem acknowledging frame response. (retry=%d)", retries))
+                        }
+                    }
+                    if (nextMsg != null)
+                        currentResponse = GetHistoryPageCarelinkMessageBody(nextMsg.messageBody!!.txData)
+                    else {
+                        aapsLogger.error(LTag.PUMPCOMM, "We couldn't acknowledge frame from pump, aborting operation.")
+                    }
+                }
+            }
+            if (rawHistoryPage.length != 1024) {
+                aapsLogger.warn(LTag.PUMPCOMM, "getPumpHistory: short page.  Expected length of 1024, found length of "
+                    + rawHistoryPage.length)
+                doneWithError = true
+            }
+            if (!rawHistoryPage.isChecksumOK) {
+                aapsLogger.error(LTag.PUMPCOMM, "getPumpHistory: checksum is wrong")
+                doneWithError = true
+            }
+            if (doneWithError) {
+                medtronicPumpStatus.pumpDeviceState = PumpDeviceState.Sleeping
+                return pumpTotalResult
+            }
+            rawHistoryPage.dumpToDebug()
+            val medtronicHistoryEntries = medtronicPumpHistoryDecoder.processPageAndCreateRecords(rawHistoryPage)
+            aapsLogger.debug(LTag.PUMPCOMM, String.format(Locale.ENGLISH, "getPumpHistory: Found %d history entries.", medtronicHistoryEntries.size))
+            pumpTotalResult.addHistoryEntries(medtronicHistoryEntries) //, pageNumber)
+            aapsLogger.debug(LTag.PUMPCOMM, String.format(Locale.ENGLISH, "getPumpHistory: Search status: Search finished: %b", pumpTotalResult.isSearchFinished))
+            if (pumpTotalResult.isSearchFinished) {
+                medtronicPumpStatus.pumpDeviceState = PumpDeviceState.Sleeping
+                return pumpTotalResult
+            }
+        }
+        medtronicPumpStatus.pumpDeviceState = PumpDeviceState.Sleeping
+        return pumpTotalResult
+    }
+
+    override fun createPumpMessageContent(type: RLMessageType): ByteArray {
+        return when (type) {
+            RLMessageType.PowerOn        -> medtronicUtil.buildCommandPayload(rileyLinkServiceData, MedtronicCommandType.RFPowerOn, byteArrayOf(2, 1, receiverDeviceAwakeForMinutes.toByte()))
+            RLMessageType.ReadSimpleData -> medtronicUtil.buildCommandPayload(rileyLinkServiceData, MedtronicCommandType.PumpModel, null)
+            else                         -> ByteArray(0)
+        }
+    }
+
+    private fun makePumpMessage(messageType: MedtronicCommandType, body: ByteArray? = null): PumpMessage {
+        return makePumpMessage(messageType, body?.let { CarelinkShortMessageBody(it) }
+            ?: CarelinkShortMessageBody())
+    }
+
+    private fun makePumpMessage(messageType: MedtronicCommandType?, messageBody: MessageBody): PumpMessage {
+        val msg = PumpMessage(aapsLogger)
+        msg.init(PacketType.Carelink, rileyLinkServiceData.pumpIDBytes, messageType, messageBody)
+        return msg
+    }
+
+    /**
+     * Main wrapper method for sending data - (for getting responses)
+     *
+     * @param commandType
+     * @param bodyData
+     * @param timeoutMs
+     * @return
+     */
+    @Throws(RileyLinkCommunicationException::class)
+    private fun sendAndGetResponse(commandType: MedtronicCommandType, bodyData: ByteArray? = null, timeoutMs: Int = DEFAULT_TIMEOUT): PumpMessage {
+        // wakeUp
+        if (doWakeUpBeforeCommand) wakeUp(receiverDeviceAwakeForMinutes, false)
+        medtronicPumpStatus.pumpDeviceState = PumpDeviceState.Active
+
+        // create message
+        val msg: PumpMessage = bodyData?.let { makePumpMessage(commandType, it) } ?: makePumpMessage(commandType)
+
+        // send and wait for response
+        val response = sendAndListen(msg, timeoutMs)
+        medtronicPumpStatus.pumpDeviceState = PumpDeviceState.Sleeping
+        return response
+    }
+
+    @Throws(RileyLinkCommunicationException::class)
+    private fun sendAndListen(msg: PumpMessage): PumpMessage {
+        return sendAndListen(msg, 4000) // 2000
+    }
+
+    // All pump communications go through this function.
+    @Throws(RileyLinkCommunicationException::class) private /*override*/ fun sendAndListen(msg: PumpMessage, timeout_ms: Int): PumpMessage {
+        return super.sendAndListen(msg, timeout_ms)!!
+    }
+
+    private inline fun <reified T> sendAndGetResponseWithCheck(
+        commandType: MedtronicCommandType,
+        bodyData: ByteArray? = null,
+        decode: (pumpType: PumpType, commandType: MedtronicCommandType, rawContent: ByteArray) -> T
+    ): T? {
+        aapsLogger.debug(LTag.PUMPCOMM, "getDataFromPump: $commandType")
+        for (retries in 0 until MAX_COMMAND_TRIES) {
+            try {
+                val response = sendAndGetResponse(commandType, bodyData, DEFAULT_TIMEOUT + DEFAULT_TIMEOUT * retries)
+                val check = checkResponseContent(response, commandType.commandDescription, commandType.expectedLength)
+                if (check == null) {
+
+                    checkResponseRawContent(response.rawContent, commandType) { return@sendAndGetResponseWithCheck null }
+
+                    val dataResponse = decode(medtronicPumpStatus.pumpType, commandType, response.rawContent)
+                    if (dataResponse != null) {
+                        errorResponse = null
+                        aapsLogger.debug(LTag.PUMPCOMM, String.format(Locale.ENGLISH, "Converted response for %s is %s.", commandType.name, dataResponse))
+                        return dataResponse
+                    } else {
+                        errorResponse = "Error decoding response."
+                    }
+                } else {
+                    errorResponse = check
+                    // return null;
+                }
+            } catch (e: RileyLinkCommunicationException) {
+                aapsLogger.warn(LTag.PUMPCOMM, String.format(Locale.ENGLISH, "Error getting response from RileyLink (error=%s, retry=%d)", e.message, retries + 1))
+            }
+        }
+        return null
+    }
+
+    private inline fun checkResponseRawContent(rawContent: ByteArray?, commandType: MedtronicCommandType, errorCase: () -> Unit) {
+        if (rawContent?.isEmpty() != false && commandType != MedtronicCommandType.PumpModel) {
+            aapsLogger.warn(LTag.PUMPCOMM, String.format(Locale.ENGLISH, "Content is empty or too short, no data to convert (type=%s,isNull=%b,length=%s)",
+                commandType.name, rawContent == null, rawContent?.size ?: "-"))
+            errorCase.invoke()
+        } else {
+            aapsLogger.debug(LTag.PUMPCOMM, "Raw response before convert: " + ByteUtil.shortHexString(rawContent))
+        }
+    }
+
+    private fun checkResponseContent(response: PumpMessage, method: String, expectedLength: Int): String? {
+        if (!response.isValid) {
+            val responseData = String.format("%s: Invalid response.", method)
+            aapsLogger.warn(LTag.PUMPCOMM, responseData)
+            return responseData
+        }
+        val contents = response.rawContent
+        return if (contents.isNotEmpty()) {
+            if (contents.size >= expectedLength) {
+                aapsLogger.debug(LTag.PUMPCOMM, String.format(Locale.ENGLISH, "%s: Content: %s", method, ByteUtil.shortHexString(contents)))
+                null
+            } else {
+                val responseData = String.format(
+                    "%s: Cannot return data. Data is too short [expected=%s, received=%s].", method, ""
+                    + expectedLength, "" + contents.size)
+                aapsLogger.warn(LTag.PUMPCOMM, responseData)
+                responseData
+            }
+        } else {
+            val responseData = String.format("%s: Cannot return data. Zero length response.", method)
+            aapsLogger.warn(LTag.PUMPCOMM, responseData)
+            responseData
+        }
+    }
+
+    // PUMP SPECIFIC COMMANDS
+    fun getRemainingInsulin(): Double? {
+        return sendAndGetResponseWithCheck(MedtronicCommandType.GetRemainingInsulin) { _, _, rawContent ->
+            medtronicConverter.decodeRemainingInsulin(rawContent)
+        }
+    }
+
+    fun getPumpModel(): MedtronicDeviceType? {
+        return sendAndGetResponseWithCheck(MedtronicCommandType.PumpModel) { _, _, rawContent ->
+            medtronicConverter.decodeModel(rawContent)
+        }
+    }
+
+    fun getBasalProfile(): BasalProfile? {
+
+        // wakeUp
+        if (doWakeUpBeforeCommand) wakeUp(receiverDeviceAwakeForMinutes, false)
+        val commandType = MedtronicCommandType.GetBasalProfileSTD
+        aapsLogger.debug(LTag.PUMPCOMM, "getDataFromPump: $commandType")
+        medtronicUtil.setCurrentCommand(commandType)
+        medtronicPumpStatus.pumpDeviceState = PumpDeviceState.Active
+        for (retries in 0..MAX_COMMAND_TRIES) {
+            try {
+                // create message
+                val msg: PumpMessage = makePumpMessage(commandType)
+
+                // send and wait for response
+                var response = sendAndListen(msg, DEFAULT_TIMEOUT + DEFAULT_TIMEOUT * retries)
+
+//                aapsLogger.debug(LTag.PUMPCOMM,"1st Response: " + HexDump.toHexStringDisplayable(response.getRawContent()));
+//                aapsLogger.debug(LTag.PUMPCOMM,"1st Response: " + HexDump.toHexStringDisplayable(response.getMessageBody().getTxData()));
+                val check = checkResponseContent(response, commandType.commandDescription, 1)
+                var data: ByteArray = byteArrayOf()
+                if (check == null) {
+                    data = response.rawContentOfFrame
+                    val ackMsg = makePumpMessage(MedtronicCommandType.CommandACK, PumpAckMessageBody())
+                    while (checkIfWeHaveMoreData(commandType, response, data)) {
+                        response = sendAndListen(ackMsg, DEFAULT_TIMEOUT + DEFAULT_TIMEOUT * retries)
+
+//                        aapsLogger.debug(LTag.PUMPCOMM,"{} Response: {}", runs, HexDump.toHexStringDisplayable(response2.getRawContent()));
+//                        aapsLogger.debug(LTag.PUMPCOMM,"{} Response: {}", runs,
+//                            HexDump.toHexStringDisplayable(response2.getMessageBody().getTxData()));
+                        val check2 = checkResponseContent(response, commandType.commandDescription, 1)
+                        if (check2 == null) {
+                            data = ByteUtil.concat(data, response.rawContentOfFrame)
+                        } else {
+                            errorResponse = check2
+                            aapsLogger.error(LTag.PUMPCOMM, "Error with response got GetProfile: $check2")
+                        }
+                    }
+                } else {
+                    errorResponse = check
+                }
+
+
+                aapsLogger.debug(LTag.PUMPCOMM, "End Response: {}", ByteUtil.getHex(data))
+
+                val basalProfile: BasalProfile? = medtronicConverter.decodeBasalProfile(medtronicPumpPlugin.pumpDescription.pumpType, data)
+                // checkResponseRawContent(data, commandType) {
+                //     basalProfile = medtronicConverter.decodeBasalProfile(medtronicPumpPlugin.pumpDescription.pumpType, data)
+                // }
+
+                if (basalProfile != null) {
+                    aapsLogger.debug(LTag.PUMPCOMM, String.format(Locale.ENGLISH, "Converted response for %s is %s.", commandType.name, basalProfile))
+                    medtronicUtil.setCurrentCommand(null)
+                    medtronicPumpStatus.pumpDeviceState = PumpDeviceState.Sleeping
+                    return basalProfile
+                }
+            } catch (e: RileyLinkCommunicationException) {
+                aapsLogger.error(LTag.PUMPCOMM, String.format(Locale.ENGLISH, "Error getting response from RileyLink (error=%s, retry=%d)", e.message, retries + 1))
+            }
+        }
+        aapsLogger.warn(LTag.PUMPCOMM, "Error reading profile in max retries.")
+        medtronicUtil.setCurrentCommand(null)
+        medtronicPumpStatus.pumpDeviceState = PumpDeviceState.Sleeping
+        return null
+    }
+
+    private fun checkIfWeHaveMoreData(commandType: MedtronicCommandType, response: PumpMessage, data: ByteArray): Boolean {
+        if (commandType === MedtronicCommandType.GetBasalProfileSTD || //
+            commandType === MedtronicCommandType.GetBasalProfileA || //
+            commandType === MedtronicCommandType.GetBasalProfileB) {
+            val responseRaw = response.rawContentOfFrame
+            val last = responseRaw.size - 1
+            aapsLogger.debug(LTag.PUMPCOMM, "Length: " + data.size)
+            if (data.size >= BasalProfile.MAX_RAW_DATA_SIZE) {
+                return false
+            }
+            return if (responseRaw.size < 2) {
+                false
+            } else !(responseRaw[last] == 0x00.toByte() && responseRaw[last - 1] == 0x00.toByte() && responseRaw[last - 2] == 0x00.toByte())
+        }
+        return false
+    }
+
+    fun getPumpTime(): ClockDTO? {
+        val localTime = LocalDateTime()
+        val responseObject = sendAndGetResponseWithCheck(MedtronicCommandType.GetRealTimeClock) { _, _, rawContent ->
+            medtronicConverter.decodeTime(rawContent)
+        }
+        if (responseObject != null) {
+            return ClockDTO(localDeviceTime = localTime, pumpTime = responseObject)
+        }
+        return null
+    }
+
+    fun getTemporaryBasal(): TempBasalPair? {
+        return sendAndGetResponseWithCheck(MedtronicCommandType.ReadTemporaryBasal) { _, _, rawContent ->
+            TempBasalPair(aapsLogger, rawContent)
+        }
+    }
+
+    fun getPumpSettings(): Map<String, PumpSettingDTO>? {
+        return sendAndGetResponseWithCheck(getSettings(medtronicUtil.medtronicPumpModel)) { _, _, rawContent ->
+            medtronicConverter.decodeSettingsLoop(rawContent)
+        }
+    }
+
+    fun setBolus(units: Double): Boolean {
+        aapsLogger.info(LTag.PUMPCOMM, "setBolus: $units")
+        return setCommand(MedtronicCommandType.SetBolus, medtronicUtil.getBolusStrokes(units))
+    }
+
+    fun setTemporaryBasal(tbr: TempBasalPair): Boolean {
+        aapsLogger.info(LTag.PUMPCOMM, "setTBR: " + tbr.description)
+        return setCommand(MedtronicCommandType.SetTemporaryBasal, tbr.asRawData)
+    }
+
+    fun setPumpTime(): Boolean {
+        val gc = GregorianCalendar()
+        gc.add(Calendar.SECOND, 5)
+        aapsLogger.info(LTag.PUMPCOMM, "setPumpTime: " + DateTimeUtil.toString(gc))
+        val yearByte = getByteArrayFromUnsignedShort(gc[Calendar.YEAR], true)
+        // val i = 1
+        // val data = ByteArray(8)
+        // data[0] = 7
+        // data[i] = gc[Calendar.HOUR_OF_DAY].toByte()
+        // data[i + 1] = gc[Calendar.MINUTE].toByte()
+        // data[i + 2] = gc[Calendar.SECOND].toByte()
+        // val yearByte = getByteArrayFromUnsignedShort(gc[Calendar.YEAR], true)
+        // data[i + 3] = yearByte[0]
+        // data[i + 4] = yearByte[1]
+        // data[i + 5] = (gc[Calendar.MONTH] + 1).toByte()
+        // data[i + 6] = gc[Calendar.DAY_OF_MONTH].toByte()
+
+        val timeData = byteArrayOf(
+            7,
+            gc[Calendar.HOUR_OF_DAY].toByte(),
+            gc[Calendar.MINUTE].toByte(),
+            gc[Calendar.SECOND].toByte(),
+            yearByte[0],
+            yearByte[1],
+            (gc[Calendar.MONTH] + 1).toByte(),
+            gc[Calendar.DAY_OF_MONTH].toByte()
+        )
+
+        //aapsLogger.info(LTag.PUMPCOMM,"setPumpTime: Body:  " + ByteUtil.getHex(data));
+        return setCommand(MedtronicCommandType.SetRealTimeClock, timeData)
+    }
+
+    private fun setCommand(commandType: MedtronicCommandType, body: ByteArray): Boolean {
+        for (retries in 0..MAX_COMMAND_TRIES) {
+            try {
+                if (doWakeUpBeforeCommand) wakeUp(false)
+                if (debugSetCommands) aapsLogger.debug(LTag.PUMPCOMM, String.format(Locale.ENGLISH, "%s: Body - %s", commandType.commandDescription,
+                    ByteUtil.getHex(body)))
+                val msg = makePumpMessage(commandType, CarelinkLongMessageBody(body))
+                val pumpMessage = runCommandWithArgs(msg)
+                if (debugSetCommands) aapsLogger.debug(LTag.PUMPCOMM, String.format(Locale.ENGLISH, "%s: %s", commandType.commandDescription, pumpMessage.responseContent))
+                if (pumpMessage.commandType === MedtronicCommandType.CommandACK) {
+                    return true
+                } else {
+                    aapsLogger.warn(LTag.PUMPCOMM, "We received non-ACK response from pump: " + pumpMessage.responseContent)
+                }
+            } catch (e: RileyLinkCommunicationException) {
+                aapsLogger.warn(LTag.PUMPCOMM, String.format(Locale.ENGLISH, "Error getting response from RileyLink (error=%s, retry=%d)", e.message, retries + 1))
+            }
+        }
+        return false
+    }
+
+    fun cancelTBR(): Boolean {
+        return setTemporaryBasal(TempBasalPair(0.0, false, 0))
+    }
+
+    fun getRemainingBattery(): BatteryStatusDTO? {
+        return sendAndGetResponseWithCheck(MedtronicCommandType.GetBatteryStatus) { _, _, rawContent ->
+            medtronicConverter.decodeBatteryStatus(rawContent)
+        }
+    }
+
+    fun setBasalProfile(basalProfile: BasalProfile): Boolean {
+        val basalProfileFrames = medtronicUtil.getBasalProfileFrames(basalProfile.rawData)
+        for (retries in 0..MAX_COMMAND_TRIES) {
+            var responseMessage: PumpMessage? = null
+            try {
+                responseMessage = runCommandWithFrames(MedtronicCommandType.SetBasalProfileSTD,
+                    basalProfileFrames)
+                if (responseMessage!!.commandType === MedtronicCommandType.CommandACK) return true
+            } catch (e: RileyLinkCommunicationException) {
+                aapsLogger.warn(LTag.PUMPCOMM, String.format(Locale.ENGLISH, "Error getting response from RileyLink (error=%s, retry=%d)", e.message, retries + 1))
+            }
+            if (responseMessage != null) aapsLogger.warn(LTag.PUMPCOMM, String.format(Locale.ENGLISH, "Set Basal Profile: Invalid response: commandType=%s,rawData=%s", responseMessage.commandType, ByteUtil.shortHexString(responseMessage.rawContent))) else aapsLogger.warn(LTag.PUMPCOMM, "Set Basal Profile: Null response.")
+        }
+        return false
+    }
+}
\ No newline at end of file
diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/MedtronicConverter.java b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/MedtronicConverter.java
deleted file mode 100644
index f9ad49b723..0000000000
--- a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/MedtronicConverter.java
+++ /dev/null
@@ -1,444 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.medtronic.comm;
-
-import org.joda.time.IllegalFieldValueException;
-import org.joda.time.LocalDateTime;
-
-import java.util.HashMap;
-import java.util.Locale;
-import java.util.Map;
-
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
-import info.nightscout.androidaps.logging.AAPSLogger;
-import info.nightscout.androidaps.logging.LTag;
-import info.nightscout.androidaps.plugins.pump.common.defs.PumpType;
-import info.nightscout.androidaps.plugins.pump.common.utils.ByteUtil;
-import info.nightscout.androidaps.plugins.pump.common.utils.StringUtil;
-import info.nightscout.androidaps.plugins.pump.medtronic.data.dto.BasalProfile;
-import info.nightscout.androidaps.plugins.pump.medtronic.data.dto.BatteryStatusDTO;
-import info.nightscout.androidaps.plugins.pump.medtronic.data.dto.PumpSettingDTO;
-import info.nightscout.androidaps.plugins.pump.medtronic.data.dto.TempBasalPair;
-import info.nightscout.androidaps.plugins.pump.medtronic.defs.MedtronicCommandType;
-import info.nightscout.androidaps.plugins.pump.medtronic.defs.MedtronicDeviceType;
-import info.nightscout.androidaps.plugins.pump.medtronic.defs.PumpConfigurationGroup;
-import info.nightscout.androidaps.plugins.pump.medtronic.util.MedtronicUtil;
-
-/**
- * Created by andy on 5/9/18.
- * High level decoder for data returned through MedtroniUIComm
- */
-
-@Singleton
-public class MedtronicConverter {
-
-    private final AAPSLogger aapsLogger;
-    private final MedtronicUtil medtronicUtil;
-
-    @Inject
-    public MedtronicConverter(
-            AAPSLogger aapsLogger,
-            MedtronicUtil medtronicUtil
-    ) {
-        this.aapsLogger = aapsLogger;
-        this.medtronicUtil = medtronicUtil;
-    }
-
-    Object convertResponse(PumpType pumpType, MedtronicCommandType commandType, byte[] rawContent) {
-
-        if ((rawContent == null || rawContent.length < 1) && commandType != MedtronicCommandType.PumpModel) {
-            aapsLogger.warn(LTag.PUMPCOMM, String.format(Locale.ENGLISH, "Content is empty or too short, no data to convert (type=%s,isNull=%b,length=%s)",
-                    commandType.name(), rawContent == null, rawContent == null ? "-" : rawContent.length));
-            return null;
-        }
-
-        aapsLogger.debug(LTag.PUMPCOMM, "Raw response before convert: " + ByteUtil.shortHexString(rawContent));
-
-        switch (commandType) {
-
-            case PumpModel: {
-                return decodeModel(rawContent);
-            }
-
-            case GetRealTimeClock: {
-                return decodeTime(rawContent);
-            }
-
-            case GetRemainingInsulin: {
-                return decodeRemainingInsulin(rawContent);
-            }
-
-            case GetBatteryStatus: {
-                return decodeBatteryStatus(rawContent); // 1
-            }
-
-            case GetBasalProfileSTD:
-            case GetBasalProfileA:
-            case GetBasalProfileB: {
-                return decodeBasalProfile(pumpType, rawContent);
-
-            }
-
-            case ReadTemporaryBasal: {
-                return new TempBasalPair(aapsLogger, rawContent); // 5
-            }
-
-            case Settings_512: {
-                return decodeSettingsLoop(rawContent);
-            }
-
-            case Settings: {
-                return decodeSettingsLoop(rawContent);
-            }
-
-            case SetBolus: {
-                return rawContent; // 1
-            }
-
-            default: {
-                throw new RuntimeException("Unsupported command Type: " + commandType);
-            }
-
-        }
-
-    }
-
-
-    private BasalProfile decodeBasalProfile(PumpType pumpType, byte[] rawContent) {
-
-        BasalProfile basalProfile = new BasalProfile(aapsLogger, rawContent);
-
-        return basalProfile.verify(pumpType) ? basalProfile : null;
-    }
-
-
-    private MedtronicDeviceType decodeModel(byte[] rawContent) {
-
-        if ((rawContent == null || rawContent.length < 4)) {
-            aapsLogger.warn(LTag.PUMPCOMM, "Error reading PumpModel, returning Unknown_Device");
-            return MedtronicDeviceType.Unknown_Device;
-        }
-
-        String rawModel = StringUtil.fromBytes(ByteUtil.substring(rawContent, 1, 3));
-        MedtronicDeviceType pumpModel = MedtronicDeviceType.getByDescription(rawModel);
-        aapsLogger.debug(LTag.PUMPCOMM, String.format(Locale.ENGLISH, "PumpModel: [raw=%s, resolved=%s]", rawModel, pumpModel.name()));
-
-        if (pumpModel != MedtronicDeviceType.Unknown_Device) {
-            if (!medtronicUtil.isModelSet()) {
-                medtronicUtil.setMedtronicPumpModel(pumpModel);
-            }
-        }
-
-        return pumpModel;
-    }
-
-
-    private BatteryStatusDTO decodeBatteryStatus(byte[] rawData) {
-        // 00 7C 00 00
-
-        BatteryStatusDTO batteryStatus = new BatteryStatusDTO();
-
-        int status = rawData[0];
-
-        if (status == 0) {
-            batteryStatus.batteryStatusType = BatteryStatusDTO.BatteryStatusType.Normal;
-        } else if (status == 1) {
-            batteryStatus.batteryStatusType = BatteryStatusDTO.BatteryStatusType.Low;
-        } else if (status == 2) {
-            batteryStatus.batteryStatusType = BatteryStatusDTO.BatteryStatusType.Unknown;
-        }
-
-        if (rawData.length > 1) {
-
-            Double d = null;
-
-            // if response in 3 bytes then we add additional information
-            if (rawData.length == 2) {
-                d = (rawData[1] * 1.0d) / 100.0d;
-            } else {
-                d = (ByteUtil.toInt(rawData[1], rawData[2]) * 1.0d) / 100.0d;
-            }
-
-            batteryStatus.voltage = d;
-            batteryStatus.extendedDataReceived = true;
-        }
-
-        return batteryStatus;
-    }
-
-
-    private Float decodeRemainingInsulin(byte[] rawData) {
-        int startIdx = 0;
-
-        MedtronicDeviceType pumpModel = medtronicUtil.getMedtronicPumpModel();
-
-        int strokes = pumpModel == null ? 10 : pumpModel.getBolusStrokes();
-
-        if (strokes == 40) {
-            startIdx = 2;
-        }
-
-        int reqLength = startIdx + 1;
-        float value = 0;
-
-        if (reqLength >= rawData.length) {
-            value = rawData[startIdx] / (1.0f * strokes);
-        } else {
-            value = ByteUtil.toInt(rawData[startIdx], rawData[startIdx + 1]) / (1.0f * strokes);
-        }
-
-        aapsLogger.debug(LTag.PUMPCOMM, "Remaining insulin: " + value);
-        return value;
-    }
-
-
-    private LocalDateTime decodeTime(byte[] rawContent) {
-
-        int hours = ByteUtil.asUINT8(rawContent[0]);
-        int minutes = ByteUtil.asUINT8(rawContent[1]);
-        int seconds = ByteUtil.asUINT8(rawContent[2]);
-        int year = (ByteUtil.asUINT8(rawContent[4]) & 0x3f) + 1984;
-        int month = ByteUtil.asUINT8(rawContent[5]);
-        int day = ByteUtil.asUINT8(rawContent[6]);
-        try {
-            LocalDateTime pumpTime = new LocalDateTime(year, month, day, hours, minutes, seconds);
-            return pumpTime;
-        } catch (IllegalFieldValueException e) {
-            aapsLogger.error(LTag.PUMPCOMM,
-                    String.format(Locale.ENGLISH, "decodeTime: Failed to parse pump time value: year=%d, month=%d, hours=%d, minutes=%d, seconds=%d",
-                            year, month, day, hours, minutes, seconds));
-            return null;
-        }
-
-    }
-
-
-    private Map<String, PumpSettingDTO> decodeSettingsLoop(byte[] rd) {
-
-        Map<String, PumpSettingDTO> map = new HashMap<>();
-
-        addSettingToMap("PCFG_MAX_BOLUS", "" + decodeMaxBolus(rd), PumpConfigurationGroup.Bolus, map);
-        addSettingToMap(
-                "PCFG_MAX_BASAL",
-                ""
-                        + decodeBasalInsulin(ByteUtil.makeUnsignedShort(rd[getSettingIndexMaxBasal()],
-                        rd[getSettingIndexMaxBasal() + 1])), PumpConfigurationGroup.Basal, map);
-        addSettingToMap("CFG_BASE_CLOCK_MODE", rd[getSettingIndexTimeDisplayFormat()] == 0 ? "12h" : "24h",
-                PumpConfigurationGroup.General, map);
-
-        addSettingToMap("PCFG_BASAL_PROFILES_ENABLED", parseResultEnable(rd[10]), PumpConfigurationGroup.Basal, map);
-
-        if (rd[10] == 1) {
-            String patt;
-            switch (rd[11]) {
-                case 0:
-                    patt = "STD";
-                    break;
-
-                case 1:
-                    patt = "A";
-                    break;
-
-                case 2:
-                    patt = "B";
-                    break;
-
-                default:
-                    patt = "???";
-                    break;
-            }
-
-            addSettingToMap("PCFG_ACTIVE_BASAL_PROFILE", patt, PumpConfigurationGroup.Basal, map);
-
-        } else {
-            addSettingToMap("PCFG_ACTIVE_BASAL_PROFILE", "STD", PumpConfigurationGroup.Basal, map);
-        }
-
-        addSettingToMap("PCFG_TEMP_BASAL_TYPE", rd[14] != 0 ? "Percent" : "Units", PumpConfigurationGroup.Basal, map);
-
-        return map;
-    }
-
-
-    private Map<String, PumpSettingDTO> decodeSettings512(byte[] rd) {
-
-        Map<String, PumpSettingDTO> map = new HashMap<>();
-
-        addSettingToMap("PCFG_AUTOOFF_TIMEOUT", "" + rd[0], PumpConfigurationGroup.General, map);
-
-        if (rd[1] == 4) {
-            addSettingToMap("PCFG_ALARM_MODE", "Silent", PumpConfigurationGroup.Sound, map);
-        } else {
-            addSettingToMap("PCFG_ALARM_MODE", "Normal", PumpConfigurationGroup.Sound, map);
-            addSettingToMap("PCFG_ALARM_BEEP_VOLUME", "" + rd[1], PumpConfigurationGroup.Sound, map);
-        }
-
-        addSettingToMap("PCFG_AUDIO_BOLUS_ENABLED", parseResultEnable(rd[2]), PumpConfigurationGroup.Bolus, map);
-
-        if (rd[2] == 1) {
-            addSettingToMap("PCFG_AUDIO_BOLUS_STEP_SIZE", "" + decodeBolusInsulin(ByteUtil.asUINT8(rd[3])),
-                    PumpConfigurationGroup.Bolus, map);
-        }
-
-        addSettingToMap("PCFG_VARIABLE_BOLUS_ENABLED", parseResultEnable(rd[4]), PumpConfigurationGroup.Bolus, map);
-        addSettingToMap("PCFG_MAX_BOLUS", "" + decodeMaxBolus(rd), PumpConfigurationGroup.Bolus, map);
-        addSettingToMap(
-                "PCFG_MAX_BASAL",
-                ""
-                        + decodeBasalInsulin(ByteUtil.makeUnsignedShort(rd[getSettingIndexMaxBasal()],
-                        rd[getSettingIndexMaxBasal() + 1])), PumpConfigurationGroup.Basal, map);
-        addSettingToMap("CFG_BASE_CLOCK_MODE", rd[getSettingIndexTimeDisplayFormat()] == 0 ? "12h" : "24h",
-                PumpConfigurationGroup.General, map);
-
-        if (MedtronicDeviceType.isSameDevice(medtronicUtil.getMedtronicPumpModel(), MedtronicDeviceType.Medtronic_523andHigher)) {
-            addSettingToMap("PCFG_INSULIN_CONCENTRATION", "" + (rd[9] == 0 ? 50 : 100), PumpConfigurationGroup.Insulin,
-                    map);
-//            LOG.debug("Insulin concentration: " + rd[9]);
-        } else {
-            addSettingToMap("PCFG_INSULIN_CONCENTRATION", "" + (rd[9] != 0 ? 50 : 100), PumpConfigurationGroup.Insulin,
-                    map);
-//            LOG.debug("Insulin concentration: " + rd[9]);
-        }
-        addSettingToMap("PCFG_BASAL_PROFILES_ENABLED", parseResultEnable(rd[10]), PumpConfigurationGroup.Basal, map);
-
-        if (rd[10] == 1) {
-            String patt;
-            switch (rd[11]) {
-                case 0:
-                    patt = "STD";
-                    break;
-
-                case 1:
-                    patt = "A";
-                    break;
-
-                case 2:
-                    patt = "B";
-                    break;
-
-                default:
-                    patt = "???";
-                    break;
-            }
-
-            addSettingToMap("PCFG_ACTIVE_BASAL_PROFILE", patt, PumpConfigurationGroup.Basal, map);
-
-        }
-
-        addSettingToMap("CFG_MM_RF_ENABLED", parseResultEnable(rd[12]), PumpConfigurationGroup.General, map);
-        addSettingToMap("CFG_MM_BLOCK_ENABLED", parseResultEnable(rd[13]), PumpConfigurationGroup.General, map);
-
-        addSettingToMap("PCFG_TEMP_BASAL_TYPE", rd[14] != 0 ? "Percent" : "Units", PumpConfigurationGroup.Basal, map);
-
-        if (rd[14] == 1) {
-            addSettingToMap("PCFG_TEMP_BASAL_PERCENT", "" + rd[15], PumpConfigurationGroup.Basal, map);
-        }
-
-        addSettingToMap("CFG_PARADIGM_LINK_ENABLE", parseResultEnable(rd[16]), PumpConfigurationGroup.General, map);
-
-        decodeInsulinActionSetting(rd, map);
-
-        return map;
-    }
-
-
-    private void addSettingToMap(String key, String value, PumpConfigurationGroup group, Map<String, PumpSettingDTO> map) {
-        map.put(key, new PumpSettingDTO(key, value, group));
-    }
-
-
-    public Map<String, PumpSettingDTO> decodeSettings(byte[] rd) {
-        Map<String, PumpSettingDTO> map = decodeSettings512(rd);
-
-        addSettingToMap("PCFG_MM_RESERVOIR_WARNING_TYPE_TIME", rd[18] != 0 ? "PCFG_MM_RESERVOIR_WARNING_TYPE_TIME"
-                : "PCFG_MM_RESERVOIR_WARNING_TYPE_UNITS", PumpConfigurationGroup.Other, map);
-
-        addSettingToMap("PCFG_MM_SRESERVOIR_WARNING_POINT", "" + ByteUtil.asUINT8(rd[19]),
-                PumpConfigurationGroup.Other, map);
-
-        addSettingToMap("CFG_MM_KEYPAD_LOCKED", parseResultEnable(rd[20]), PumpConfigurationGroup.Other, map);
-
-        if (MedtronicDeviceType.isSameDevice(medtronicUtil.getMedtronicPumpModel(), MedtronicDeviceType.Medtronic_523andHigher)) {
-
-            addSettingToMap("PCFG_BOLUS_SCROLL_STEP_SIZE", "" + rd[21], PumpConfigurationGroup.Bolus, map);
-            addSettingToMap("PCFG_CAPTURE_EVENT_ENABLE", parseResultEnable(rd[22]), PumpConfigurationGroup.Other, map);
-            addSettingToMap("PCFG_OTHER_DEVICE_ENABLE", parseResultEnable(rd[23]), PumpConfigurationGroup.Other, map);
-            addSettingToMap("PCFG_OTHER_DEVICE_PAIRED_STATE", parseResultEnable(rd[24]), PumpConfigurationGroup.Other,
-                    map);
-        }
-
-        return map;
-    }
-
-
-    private String parseResultEnable(int i) {
-        switch (i) {
-            case 0:
-                return "No";
-            case 1:
-                return "Yes";
-            default:
-                return "???";
-        }
-    }
-
-
-    private float getStrokesPerUnit(boolean isBasal) {
-        return isBasal ? 40.0f : 10; // pumpModel.getBolusStrokes();
-    }
-
-
-    // 512
-    private void decodeInsulinActionSetting(byte[] ai, Map<String, PumpSettingDTO> map) {
-        if (MedtronicDeviceType.isSameDevice(medtronicUtil.getMedtronicPumpModel(), MedtronicDeviceType.Medtronic_512_712)) {
-            addSettingToMap("PCFG_INSULIN_ACTION_TYPE", (ai[17] != 0 ? "Regular" : "Fast"),
-                    PumpConfigurationGroup.Insulin, map);
-        } else {
-            int i = ai[17];
-            String s;
-
-            if ((i == 0) || (i == 1)) {
-                s = ai[17] != 0 ? "Regular" : "Fast";
-            } else {
-                if (i == 15)
-                    s = "Unset";
-                else
-                    s = "Curve: " + i;
-            }
-
-            addSettingToMap("PCFG_INSULIN_ACTION_TYPE", s, PumpConfigurationGroup.Insulin, map);
-        }
-    }
-
-
-    private double decodeBasalInsulin(int i) {
-        return (double) i / (double) getStrokesPerUnit(true);
-    }
-
-
-    private double decodeBolusInsulin(int i) {
-
-        return (double) i / (double) getStrokesPerUnit(false);
-    }
-
-
-    private int getSettingIndexMaxBasal() {
-        return is523orHigher() ? 7 : 6;
-    }
-
-
-    private int getSettingIndexTimeDisplayFormat() {
-        return is523orHigher() ? 9 : 8;
-    }
-
-
-    private double decodeMaxBolus(byte[] ai) {
-        return is523orHigher() ? decodeBolusInsulin(ByteUtil.toInt(ai[5], ai[6])) : decodeBolusInsulin(ByteUtil
-                .asUINT8(ai[5]));
-    }
-
-
-    private boolean is523orHigher() {
-        return (MedtronicDeviceType.isSameDevice(medtronicUtil.getMedtronicPumpModel(), MedtronicDeviceType.Medtronic_523andHigher));
-    }
-}
diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/MedtronicConverter.kt b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/MedtronicConverter.kt
new file mode 100644
index 0000000000..86c04e3e90
--- /dev/null
+++ b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/MedtronicConverter.kt
@@ -0,0 +1,265 @@
+package info.nightscout.androidaps.plugins.pump.medtronic.comm
+
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.pump.common.defs.PumpType
+import info.nightscout.androidaps.plugins.pump.common.utils.ByteUtil
+import info.nightscout.androidaps.plugins.pump.common.utils.StringUtil
+import info.nightscout.androidaps.plugins.pump.medtronic.data.dto.BasalProfile
+import info.nightscout.androidaps.plugins.pump.medtronic.data.dto.BatteryStatusDTO
+import info.nightscout.androidaps.plugins.pump.medtronic.data.dto.PumpSettingDTO
+import info.nightscout.androidaps.plugins.pump.medtronic.defs.MedtronicDeviceType
+import info.nightscout.androidaps.plugins.pump.medtronic.defs.PumpConfigurationGroup
+import info.nightscout.androidaps.plugins.pump.medtronic.util.MedtronicUtil
+import org.joda.time.IllegalFieldValueException
+import org.joda.time.LocalDateTime
+import java.util.*
+import javax.inject.Inject
+import javax.inject.Singleton
+
+/**
+ * Created by andy on 5/9/18.
+ * High level decoder for data returned through MedtroniUIComm
+ */
+@Singleton
+class MedtronicConverter @Inject constructor(
+    private val aapsLogger: AAPSLogger,
+    private val medtronicUtil: MedtronicUtil
+) {
+
+    fun decodeBasalProfile(pumpType: PumpType, rawContent: ByteArray): BasalProfile? {
+        val basalProfile = BasalProfile(aapsLogger, rawContent)
+        return if (basalProfile.verify(pumpType)) basalProfile else null
+    }
+
+    fun decodeModel(rawContent: ByteArray): MedtronicDeviceType {
+        if (rawContent.size < 4) {
+            aapsLogger.warn(LTag.PUMPCOMM, "Error reading PumpModel, returning Unknown_Device")
+            return MedtronicDeviceType.Unknown_Device
+        }
+        val rawModel = StringUtil.fromBytes(ByteUtil.substring(rawContent, 1, 3))
+        val pumpModel = MedtronicDeviceType.getByDescription(rawModel)
+        aapsLogger.debug(LTag.PUMPCOMM, String.format(Locale.ENGLISH, "PumpModel: [raw=%s, resolved=%s]", rawModel, pumpModel.name))
+        if (pumpModel != MedtronicDeviceType.Unknown_Device) {
+            if (!medtronicUtil.isModelSet) {
+                medtronicUtil.medtronicPumpModel = pumpModel
+                medtronicUtil.isModelSet = true
+            }
+        }
+        return pumpModel
+    }
+
+    fun decodeBatteryStatus(rawData: ByteArray): BatteryStatusDTO {
+        // 00 7C 00 00
+        val batteryStatus = BatteryStatusDTO()
+        val status = rawData[0].toInt()
+        if (status == 0) {
+            batteryStatus.batteryStatusType = BatteryStatusDTO.BatteryStatusType.Normal
+        } else if (status == 1) {
+            batteryStatus.batteryStatusType = BatteryStatusDTO.BatteryStatusType.Low
+        } else if (status == 2) {
+            batteryStatus.batteryStatusType = BatteryStatusDTO.BatteryStatusType.Unknown
+        }
+        if (rawData.size > 1) {
+            var d: Double? //= null
+
+            // if response in 3 bytes then we add additional information
+            d = if (rawData.size == 2) {
+                rawData[1] * 1.0 / 100.0
+            } else {
+                ByteUtil.toInt(rawData[1], rawData[2]) * 1.0 / 100.0
+            }
+            batteryStatus.voltage = d
+            batteryStatus.extendedDataReceived = true
+        }
+        return batteryStatus
+    }
+
+    fun decodeRemainingInsulin(rawData: ByteArray): Double {
+        var startIdx = 0
+        val pumpModel = medtronicUtil.medtronicPumpModel
+        val strokes = pumpModel.bolusStrokes //?: 10
+        if (strokes == 40) {
+            startIdx = 2
+        }
+        val reqLength = startIdx + 1
+        val value: Double
+        value = if (reqLength >= rawData.size) {
+            rawData[startIdx] / (1.0 * strokes)
+        } else {
+            ByteUtil.toInt(rawData[startIdx], rawData[startIdx + 1]) / (1.0 * strokes)
+        }
+        aapsLogger.debug(LTag.PUMPCOMM, "Remaining insulin: $value")
+        return value
+    }
+
+    fun decodeTime(rawContent: ByteArray): LocalDateTime? {
+        val hours = ByteUtil.asUINT8(rawContent[0])
+        val minutes = ByteUtil.asUINT8(rawContent[1])
+        val seconds = ByteUtil.asUINT8(rawContent[2])
+        val year = (ByteUtil.asUINT8(rawContent[4]) and 0x3f) + 1984
+        val month = ByteUtil.asUINT8(rawContent[5])
+        val day = ByteUtil.asUINT8(rawContent[6])
+        return try {
+            LocalDateTime(year, month, day, hours, minutes, seconds)
+        } catch (e: IllegalFieldValueException) {
+            aapsLogger.error(LTag.PUMPCOMM, String.format(Locale.ENGLISH, "decodeTime: Failed to parse pump time value: year=%d, month=%d, hours=%d, minutes=%d, seconds=%d",
+                year, month, day, hours, minutes, seconds))
+            null
+        }
+    }
+
+    fun decodeSettingsLoop(rd: ByteArray): Map<String, PumpSettingDTO> {
+        val map: MutableMap<String, PumpSettingDTO> = HashMap()
+        addSettingToMap("PCFG_MAX_BOLUS", "" + decodeMaxBolus(rd), PumpConfigurationGroup.Bolus, map)
+        addSettingToMap(
+            "PCFG_MAX_BASAL", ""
+            + decodeBasalInsulin(ByteUtil.makeUnsignedShort(rd[settingIndexMaxBasal].toInt(),
+            rd[settingIndexMaxBasal + 1].toInt())), PumpConfigurationGroup.Basal, map)
+        addSettingToMap("CFG_BASE_CLOCK_MODE", if (rd[settingIndexTimeDisplayFormat].toInt() == 0) "12h" else "24h",
+            PumpConfigurationGroup.General, map)
+        addSettingToMap("PCFG_BASAL_PROFILES_ENABLED", parseResultEnable(rd[10].toInt()), PumpConfigurationGroup.Basal, map)
+        if (rd[10].toInt() == 1) {
+            val patt: String
+            patt = when (rd[11].toInt()) {
+                0    -> "STD"
+                1    -> "A"
+                2    -> "B"
+                else -> "???"
+            }
+            addSettingToMap("PCFG_ACTIVE_BASAL_PROFILE", patt, PumpConfigurationGroup.Basal, map)
+        } else {
+            addSettingToMap("PCFG_ACTIVE_BASAL_PROFILE", "STD", PumpConfigurationGroup.Basal, map)
+        }
+        addSettingToMap("PCFG_TEMP_BASAL_TYPE", if (rd[14].toInt() != 0) "Percent" else "Units", PumpConfigurationGroup.Basal, map)
+        return map
+    }
+
+    private fun decodeSettings512(rd: ByteArray): MutableMap<String, PumpSettingDTO> {
+        val map: MutableMap<String, PumpSettingDTO> = HashMap()
+        addSettingToMap("PCFG_AUTOOFF_TIMEOUT", "" + rd[0], PumpConfigurationGroup.General, map)
+        if (rd[1].toInt() == 4) {
+            addSettingToMap("PCFG_ALARM_MODE", "Silent", PumpConfigurationGroup.Sound, map)
+        } else {
+            addSettingToMap("PCFG_ALARM_MODE", "Normal", PumpConfigurationGroup.Sound, map)
+            addSettingToMap("PCFG_ALARM_BEEP_VOLUME", "" + rd[1], PumpConfigurationGroup.Sound, map)
+        }
+        addSettingToMap("PCFG_AUDIO_BOLUS_ENABLED", parseResultEnable(rd[2].toInt()), PumpConfigurationGroup.Bolus, map)
+        if (rd[2].toInt() == 1) {
+            addSettingToMap("PCFG_AUDIO_BOLUS_STEP_SIZE", "" + decodeBolusInsulin(ByteUtil.asUINT8(rd[3])),
+                PumpConfigurationGroup.Bolus, map)
+        }
+        addSettingToMap("PCFG_VARIABLE_BOLUS_ENABLED", parseResultEnable(rd[4].toInt()), PumpConfigurationGroup.Bolus, map)
+        addSettingToMap("PCFG_MAX_BOLUS", "" + decodeMaxBolus(rd), PumpConfigurationGroup.Bolus, map)
+        addSettingToMap(
+            "PCFG_MAX_BASAL", ""
+            + decodeBasalInsulin(ByteUtil.makeUnsignedShort(rd[settingIndexMaxBasal].toInt(),
+            rd[settingIndexMaxBasal + 1].toInt())), PumpConfigurationGroup.Basal, map)
+        addSettingToMap("CFG_BASE_CLOCK_MODE", if (rd[settingIndexTimeDisplayFormat].toInt() == 0) "12h" else "24h",
+            PumpConfigurationGroup.General, map)
+        if (MedtronicDeviceType.isSameDevice(medtronicUtil.medtronicPumpModel, MedtronicDeviceType.Medtronic_523andHigher)) {
+            addSettingToMap("PCFG_INSULIN_CONCENTRATION", "" + if (rd[9].toInt() == 0) 50 else 100, PumpConfigurationGroup.Insulin,
+                map)
+            //            LOG.debug("Insulin concentration: " + rd[9]);
+        } else {
+            addSettingToMap("PCFG_INSULIN_CONCENTRATION", "" + if (rd[9].toInt() != 0) 50 else 100, PumpConfigurationGroup.Insulin,
+                map)
+            //            LOG.debug("Insulin concentration: " + rd[9]);
+        }
+        addSettingToMap("PCFG_BASAL_PROFILES_ENABLED", parseResultEnable(rd[10].toInt()), PumpConfigurationGroup.Basal, map)
+        if (rd[10].toInt() == 1) {
+            val patt: String
+            patt = when (rd[11].toInt()) {
+                0    -> "STD"
+                1    -> "A"
+                2    -> "B"
+                else -> "???"
+            }
+            addSettingToMap("PCFG_ACTIVE_BASAL_PROFILE", patt, PumpConfigurationGroup.Basal, map)
+        }
+        addSettingToMap("CFG_MM_RF_ENABLED", parseResultEnable(rd[12].toInt()), PumpConfigurationGroup.General, map)
+        addSettingToMap("CFG_MM_BLOCK_ENABLED", parseResultEnable(rd[13].toInt()), PumpConfigurationGroup.General, map)
+        addSettingToMap("PCFG_TEMP_BASAL_TYPE", if (rd[14].toInt() != 0) "Percent" else "Units", PumpConfigurationGroup.Basal, map)
+        if (rd[14].toInt() == 1) {
+            addSettingToMap("PCFG_TEMP_BASAL_PERCENT", "" + rd[15], PumpConfigurationGroup.Basal, map)
+        }
+        addSettingToMap("CFG_PARADIGM_LINK_ENABLE", parseResultEnable(rd[16].toInt()), PumpConfigurationGroup.General, map)
+        decodeInsulinActionSetting(rd, map)
+        return map
+    }
+
+    private fun addSettingToMap(key: String, value: String, group: PumpConfigurationGroup, map: MutableMap<String, PumpSettingDTO>) {
+        map[key] = PumpSettingDTO(key, value, group)
+    }
+
+    fun decodeSettings(rd: ByteArray): Map<String, PumpSettingDTO> {
+        val map = decodeSettings512(rd)
+        addSettingToMap("PCFG_MM_RESERVOIR_WARNING_TYPE_TIME", if (rd[18].toInt() != 0) "PCFG_MM_RESERVOIR_WARNING_TYPE_TIME" else "PCFG_MM_RESERVOIR_WARNING_TYPE_UNITS", PumpConfigurationGroup.Other, map)
+        addSettingToMap("PCFG_MM_SRESERVOIR_WARNING_POINT", "" + ByteUtil.asUINT8(rd[19]),
+            PumpConfigurationGroup.Other, map)
+        addSettingToMap("CFG_MM_KEYPAD_LOCKED", parseResultEnable(rd[20].toInt()), PumpConfigurationGroup.Other, map)
+        if (MedtronicDeviceType.isSameDevice(medtronicUtil.medtronicPumpModel, MedtronicDeviceType.Medtronic_523andHigher)) {
+            addSettingToMap("PCFG_BOLUS_SCROLL_STEP_SIZE", "" + rd[21], PumpConfigurationGroup.Bolus, map)
+            addSettingToMap("PCFG_CAPTURE_EVENT_ENABLE", parseResultEnable(rd[22].toInt()), PumpConfigurationGroup.Other, map)
+            addSettingToMap("PCFG_OTHER_DEVICE_ENABLE", parseResultEnable(rd[23].toInt()), PumpConfigurationGroup.Other, map)
+            addSettingToMap("PCFG_OTHER_DEVICE_PAIRED_STATE", parseResultEnable(rd[24].toInt()), PumpConfigurationGroup.Other,
+                map)
+        }
+        return map
+    }
+
+    private fun parseResultEnable(i: Int): String {
+        return when (i) {
+            0    -> "No"
+            1    -> "Yes"
+            else -> "???"
+        }
+    }
+
+    private fun getStrokesPerUnit(isBasal: Boolean): Float {
+        return if (isBasal) 40.0f else 10.0f // pumpModel.getBolusStrokes();
+    }
+
+    // 512
+    private fun decodeInsulinActionSetting(ai: ByteArray, map: MutableMap<String, PumpSettingDTO>) {
+        if (MedtronicDeviceType.isSameDevice(medtronicUtil.medtronicPumpModel, MedtronicDeviceType.Medtronic_512_712)) {
+            addSettingToMap("PCFG_INSULIN_ACTION_TYPE", if (ai[17].toInt() != 0) "Regular" else "Fast",
+                PumpConfigurationGroup.Insulin, map)
+        } else {
+            val i = ai[17].toInt()
+            val s: String
+            s = if (i == 0 || i == 1) {
+                if (ai[17].toInt() != 0) "Regular" else "Fast"
+            } else {
+                if (i == 15) "Unset" else "Curve: $i"
+            }
+            addSettingToMap("PCFG_INSULIN_ACTION_TYPE", s, PumpConfigurationGroup.Insulin, map)
+        }
+    }
+
+    private fun decodeBasalInsulin(i: Int): Double {
+        return i.toDouble() / getStrokesPerUnit(true).toDouble()
+    }
+
+    private fun decodeBolusInsulin(i: Int): Double {
+        return i.toDouble() / getStrokesPerUnit(false).toDouble()
+    }
+
+    private val settingIndexMaxBasal: Int
+        get() = if (is523orHigher()) 7 else 6
+
+    private val settingIndexTimeDisplayFormat: Int
+        get() = if (is523orHigher()) 9 else 8
+
+    private fun decodeMaxBolus(ai: ByteArray): Double {
+        return if (is523orHigher())
+            decodeBolusInsulin(ByteUtil.toInt(ai[5], ai[6]))
+        else
+            decodeBolusInsulin(ByteUtil.asUINT8(ai[5]))
+    }
+
+    private fun is523orHigher(): Boolean {
+        return MedtronicDeviceType.isSameDevice(medtronicUtil.medtronicPumpModel, MedtronicDeviceType.Medtronic_523andHigher)
+    }
+
+}
\ No newline at end of file
diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/MedtronicHistoryDecoder.java b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/MedtronicHistoryDecoder.java
deleted file mode 100644
index 2b33249503..0000000000
--- a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/MedtronicHistoryDecoder.java
+++ /dev/null
@@ -1,182 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.medtronic.comm.history;
-
-import org.apache.commons.lang3.StringUtils;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-
-import javax.inject.Inject;
-
-import info.nightscout.androidaps.logging.AAPSLogger;
-import info.nightscout.androidaps.logging.LTag;
-import info.nightscout.androidaps.plugins.pump.common.utils.ByteUtil;
-import info.nightscout.androidaps.plugins.pump.common.utils.StringUtil;
-import info.nightscout.androidaps.plugins.pump.medtronic.util.MedtronicUtil;
-
-
-/**
- * This file was taken from GGC - GNU Gluco Control (ggc.sourceforge.net), application for diabetes
- * management and modified/extended for AAPS.
- * <p>
- * Author: Andy {andy.rozman@gmail.com}
- */
-
-public abstract class MedtronicHistoryDecoder<T extends MedtronicHistoryEntry> implements MedtronicHistoryDecoderInterface<T> {
-
-    @Inject protected AAPSLogger aapsLogger;
-    @Inject protected MedtronicUtil medtronicUtil;
-
-    protected ByteUtil bitUtils;
-
-    // STATISTICS (remove at later time or not)
-    protected boolean statisticsEnabled = true;
-    protected Map<Integer, Integer> unknownOpCodes;
-    protected Map<RecordDecodeStatus, Map<String, String>> mapStatistics;
-
-
-    public MedtronicHistoryDecoder() {
-    }
-
-
-    // public abstract <E extends MedtronicHistoryEntry> Class<E> getHistoryEntryClass();
-
-    // public abstract RecordDecodeStatus decodeRecord(T record);
-
-    public abstract void postProcess();
-
-
-    protected abstract void runPostDecodeTasks();
-
-
-    // TODO_ extend this to also use bigger pages (for now we support only 1024 pages)
-    private List<Byte> checkPage(RawHistoryPage page, boolean partial) throws RuntimeException {
-        List<Byte> byteList = new ArrayList<Byte>();
-
-        // if (!partial && page.getData().length != 1024 /* page.commandType.getRecordLength() */) {
-        // LOG.error("Page size is not correct. Size should be {}, but it was {} instead.", 1024,
-        // page.getData().length);
-        // // throw exception perhaps
-        // return byteList;
-        // }
-
-        if (medtronicUtil.getMedtronicPumpModel() == null) {
-            aapsLogger.error(LTag.PUMPCOMM, "Device Type is not defined.");
-            return byteList;
-        }
-
-        if (page.getData().length != 1024) {
-            return ByteUtil.getListFromByteArray(page.getData());
-        } else if (page.isChecksumOK()) {
-            return ByteUtil.getListFromByteArray(page.getOnlyData());
-        } else {
-            return null;
-        }
-    }
-
-
-    public List<T> processPageAndCreateRecords(RawHistoryPage rawHistoryPage) {
-        return processPageAndCreateRecords(rawHistoryPage, false);
-    }
-
-
-    protected void prepareStatistics() {
-        if (!statisticsEnabled)
-            return;
-
-        unknownOpCodes = new HashMap<>();
-        mapStatistics = new HashMap<>();
-
-        for (RecordDecodeStatus stat : RecordDecodeStatus.values()) {
-            mapStatistics.put(stat, new HashMap<>());
-        }
-    }
-
-
-    protected void addToStatistics(MedtronicHistoryEntryInterface pumpHistoryEntry, RecordDecodeStatus status, Integer opCode) {
-        if (!statisticsEnabled)
-            return;
-
-        if (opCode != null) {
-            if (!unknownOpCodes.containsKey(opCode)) {
-                unknownOpCodes.put(opCode, opCode);
-            }
-            return;
-        }
-
-        if (!mapStatistics.get(status).containsKey(pumpHistoryEntry.getEntryTypeName())) {
-            mapStatistics.get(status).put(pumpHistoryEntry.getEntryTypeName(), "");
-        }
-    }
-
-
-    protected void showStatistics() {
-        StringBuilder sb = new StringBuilder();
-
-        for (Map.Entry unknownEntry : unknownOpCodes.entrySet()) {
-            StringUtil.appendToStringBuilder(sb, "" + unknownEntry.getKey(), ", ");
-        }
-
-        aapsLogger.info(LTag.PUMPCOMM, "STATISTICS OF PUMP DECODE");
-
-        if (unknownOpCodes.size() > 0) {
-            aapsLogger.warn(LTag.PUMPCOMM, "Unknown Op Codes: " + sb.toString());
-        }
-
-        for (Map.Entry<RecordDecodeStatus, Map<String, String>> entry : mapStatistics.entrySet()) {
-            sb = new StringBuilder();
-
-            if (entry.getKey() != RecordDecodeStatus.OK) {
-                if (entry.getValue().size() == 0)
-                    continue;
-
-                for (Map.Entry<String, String> entrysub : entry.getValue().entrySet()) {
-                    StringUtil.appendToStringBuilder(sb, entrysub.getKey(), ", ");
-                }
-
-                String spaces = StringUtils.repeat(" ", 14 - entry.getKey().name().length());
-
-                aapsLogger.info(LTag.PUMPCOMM, String.format(Locale.ENGLISH, "    %s%s - %d. Elements: %s", entry.getKey().name(), spaces, entry.getValue().size(), sb.toString()));
-            } else {
-                aapsLogger.info(LTag.PUMPCOMM, String.format(Locale.ENGLISH, "    %s             - %d", entry.getKey().name(), entry.getValue().size()));
-            }
-        }
-    }
-
-
-    private int getUnsignedByte(byte value) {
-        if (value < 0)
-            return value + 256;
-        else
-            return value;
-    }
-
-
-    protected int getUnsignedInt(int value) {
-        if (value < 0)
-            return value + 256;
-        else
-            return value;
-    }
-
-
-    public String getFormattedFloat(float value, int decimals) {
-        return StringUtil.getFormatedValueUS(value, decimals);
-    }
-
-
-    private List<T> processPageAndCreateRecords(RawHistoryPage rawHistoryPage, boolean partial) {
-        List<Byte> dataClear = checkPage(rawHistoryPage, partial);
-        List<T> records = createRecords(dataClear);
-
-        for (T record : records) {
-            decodeRecord(record);
-        }
-
-        runPostDecodeTasks();
-
-        return records;
-    }
-}
diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/MedtronicHistoryDecoder.kt b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/MedtronicHistoryDecoder.kt
new file mode 100644
index 0000000000..57a6b175ab
--- /dev/null
+++ b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/MedtronicHistoryDecoder.kt
@@ -0,0 +1,118 @@
+package info.nightscout.androidaps.plugins.pump.medtronic.comm.history
+
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.pump.common.utils.ByteUtil
+import info.nightscout.androidaps.plugins.pump.common.utils.StringUtil
+import info.nightscout.androidaps.plugins.pump.medtronic.util.MedtronicUtil
+import org.apache.commons.lang3.StringUtils
+
+/**
+ * This file was taken from GGC - GNU Gluco Control (ggc.sourceforge.net), application for diabetes
+ * management and modified/extended for AAPS.
+ *
+ *
+ * Author: Andy {andy.rozman@gmail.com}
+ */
+abstract class MedtronicHistoryDecoder<T : MedtronicHistoryEntry?>(var aapsLogger: AAPSLogger,
+                                                                   var medtronicUtil: MedtronicUtil,
+                                                                   var bitUtils: ByteUtil) : MedtronicHistoryDecoderInterface<T> {
+
+    // STATISTICS (remove at later time or not)
+    protected var statisticsEnabled = true
+    protected var unknownOpCodes: MutableMap<Int, Int?> = mutableMapOf()
+    protected var mapStatistics: MutableMap<RecordDecodeStatus, MutableMap<String, String>> = mutableMapOf()
+
+    abstract fun postProcess()
+    protected abstract fun runPostDecodeTasks()
+
+    // TODO_ extend this to also use bigger pages (for now we support only 1024 pages)
+    @Throws(RuntimeException::class)
+    private fun checkPage(page: RawHistoryPage): MutableList<Byte> {
+        if (!medtronicUtil.isModelSet) {
+            aapsLogger.error(LTag.PUMPCOMM, "Device Type is not defined.")
+            return mutableListOf()
+        }
+        return if (page.data.size != 1024) {
+            page.data.toMutableList()
+        } else if (page.isChecksumOK) {
+            page.onlyData.toMutableList()
+        } else {
+            mutableListOf()
+        }
+    }
+
+    fun processPageAndCreateRecords(rawHistoryPage: RawHistoryPage): MutableList<T> {
+        val dataClear = checkPage(rawHistoryPage)
+        val records: MutableList<T> = createRecords(dataClear)
+        for (record in records) {
+            decodeRecord(record)
+        }
+        runPostDecodeTasks()
+        return records
+    }
+
+    protected fun prepareStatistics() {
+        if (!statisticsEnabled) return
+        // unknownOpCodes = HashMap()
+        // mapStatistics = HashMap()
+        for (stat in RecordDecodeStatus.values()) {
+            mapStatistics[stat] = hashMapOf()
+            //(mapStatistics as HashMap<RecordDecodeStatus, MutableMap<String, String>>)[stat] = hashMapOf()
+        }
+    }
+
+    protected fun addToStatistics(pumpHistoryEntry: MedtronicHistoryEntryInterface, status: RecordDecodeStatus, opCode: Int?) {
+        if (!statisticsEnabled) return
+        if (opCode != null) {
+            if (!unknownOpCodes.containsKey(opCode)) {
+                unknownOpCodes[opCode] = opCode
+            }
+            return
+        }
+        if (!mapStatistics[status]!!.containsKey(pumpHistoryEntry.entryTypeName)) {
+            mapStatistics[status]!!.put(pumpHistoryEntry.entryTypeName, "")
+        }
+    }
+
+    protected fun showStatistics() {
+        var sb = StringBuilder()
+        for ((key) in unknownOpCodes) {
+            StringUtil.appendToStringBuilder(sb, "" + key, ", ")
+        }
+        aapsLogger.info(LTag.PUMPCOMM, "STATISTICS OF PUMP DECODE")
+        if (unknownOpCodes.size > 0) {
+            aapsLogger.warn(LTag.PUMPCOMM, "Unknown Op Codes: $sb")
+        }
+        for ((key, value) in mapStatistics) {
+            sb = StringBuilder()
+            if (key !== RecordDecodeStatus.OK) {
+                if (value.size == 0) continue
+                for ((key1) in value) {
+                    StringUtil.appendToStringBuilder(sb, key1, ", ")
+                }
+                val spaces = StringUtils.repeat(" ", 14 - key.name.length)
+                aapsLogger.info(LTag.PUMPCOMM, "    ${key.name}$spaces - ${value.size}. Elements: $sb")
+            } else {
+                aapsLogger.info(LTag.PUMPCOMM, "    ${key.name}             - ${value.size}")
+            }
+        }
+    }
+
+    private fun getUnsignedByte(value: Byte): Int {
+        return if (value < 0) value + 256 else value.toInt()
+    }
+
+    protected fun getUnsignedInt(value: Int): Int {
+        return if (value < 0) value + 256 else value
+    }
+
+    protected fun getUnsignedInt(value: Byte): Int {
+        return if (value < 0) value + 256 else value.toInt()
+    }
+
+    fun getFormattedFloat(value: Float, decimals: Int): String {
+        return StringUtil.getFormatedValueUS(value, decimals)
+    }
+
+}
\ No newline at end of file
diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/MedtronicHistoryDecoderInterface.java b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/MedtronicHistoryDecoderInterface.java
deleted file mode 100644
index b98b2d7d33..0000000000
--- a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/MedtronicHistoryDecoderInterface.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.medtronic.comm.history;
-
-import java.util.List;
-
-/**
- * Created by andy on 3/10/19.
- */
-
-public interface MedtronicHistoryDecoderInterface<T> {
-
-    RecordDecodeStatus decodeRecord(T record);
-
-    List<T> createRecords(List<Byte> dataClear);
-
-}
diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/MedtronicHistoryDecoderInterface.kt b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/MedtronicHistoryDecoderInterface.kt
new file mode 100644
index 0000000000..fa45bf1400
--- /dev/null
+++ b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/MedtronicHistoryDecoderInterface.kt
@@ -0,0 +1,10 @@
+package info.nightscout.androidaps.plugins.pump.medtronic.comm.history
+
+/**
+ * Created by andy on 3/10/19.
+ */
+interface MedtronicHistoryDecoderInterface<T> {
+
+    fun decodeRecord(record: T): RecordDecodeStatus?
+    fun createRecords(dataClearInput: MutableList<Byte>): MutableList<T>
+}
\ No newline at end of file
diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/MedtronicHistoryEntry.java b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/MedtronicHistoryEntry.java
deleted file mode 100644
index b5d41f6bfa..0000000000
--- a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/MedtronicHistoryEntry.java
+++ /dev/null
@@ -1,316 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.medtronic.comm.history;
-
-import com.google.gson.annotations.Expose;
-
-import org.slf4j.Logger;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
-import info.nightscout.androidaps.plugins.pump.common.utils.ByteUtil;
-import info.nightscout.androidaps.plugins.pump.common.utils.DateTimeUtil;
-import info.nightscout.androidaps.plugins.pump.common.utils.StringUtil;
-
-/**
- * This file was taken from GGC - GNU Gluco Control (ggc.sourceforge.net), application for diabetes
- * management and modified/extended for AAPS.
- * <p>
- * Author: Andy {andy.rozman@gmail.com}
- */
-
-public abstract class MedtronicHistoryEntry implements MedtronicHistoryEntryInterface {
-
-    protected List<Byte> rawData;
-
-    public static final Logger LOG = StacktraceLoggerWrapper.getLogger(MedtronicHistoryEntry.class);
-
-    protected int[] sizes = new int[3];
-
-    protected byte[] head;
-    protected byte[] datetime;
-    protected byte[] body;
-
-    // protected LocalDateTime dateTime;
-
-    public long id;
-
-    @Expose
-    public String DT;
-
-    @Expose
-    public Long atechDateTime;
-
-    @Expose
-    protected Map<String, Object> decodedData;
-
-    public long phoneDateTime; // time on phone
-
-    /**
-     * Pump id that will be used with AAPS object (time * 1000 + historyType (max is FF = 255)
-     */
-    protected Long pumpId;
-
-    /**
-     * if history object is already linked to AAPS object (either Treatment, TempBasal or TDD (tdd's
-     * are not actually
-     * linked))
-     */
-    public boolean linked = false;
-
-    /**
-     * Linked object, see linked
-     */
-    public Object linkedObject = null;
-
-
-    public void setLinkedObject(Object linkedObject) {
-        this.linked = true;
-        this.linkedObject = linkedObject;
-    }
-
-
-    public void setData(List<Byte> listRawData, boolean doNotProcess) {
-        this.rawData = listRawData;
-
-        // System.out.println("Head: " + sizes[0] + ", dates: " + sizes[1] +
-        // ", body=" + sizes[2]);
-
-        if (doNotProcess)
-            return;
-
-        head = new byte[getHeadLength() - 1];
-        for (int i = 1; i < (getHeadLength()); i++) {
-            head[i - 1] = listRawData.get(i);
-        }
-
-        if (getDateTimeLength() > 0) {
-            datetime = new byte[getDateTimeLength()];
-
-            for (int i = getHeadLength(), j = 0; j < getDateTimeLength(); i++, j++) {
-                datetime[j] = listRawData.get(i);
-            }
-        }
-
-        if (getBodyLength() > 0) {
-            body = new byte[getBodyLength()];
-
-            for (int i = (getHeadLength() + getDateTimeLength()), j = 0; j < getBodyLength(); i++, j++) {
-                body[j] = listRawData.get(i);
-            }
-
-        }
-
-    }
-
-
-    public String getDateTimeString() {
-        return this.DT == null ? "Unknown" : this.DT;
-    }
-
-
-    public String getDecodedDataAsString() {
-        if (decodedData == null)
-            if (isNoDataEntry())
-                return "No data";
-            else
-                return "";
-        else
-            return decodedData.toString();
-    }
-
-
-    public boolean hasData() {
-        return (decodedData != null) || (isNoDataEntry()) || getEntryTypeName().equals("UnabsorbedInsulin");
-    }
-
-
-    public boolean isNoDataEntry() {
-        return (sizes[0] == 2 && sizes[1] == 5 && sizes[2] == 0);
-    }
-
-
-    public Map<String, Object> getDecodedData() {
-        return this.decodedData;
-    }
-
-
-    public Object getDecodedDataEntry(String key) {
-        return this.decodedData != null ? this.decodedData.get(key) : null;
-    }
-
-
-    public boolean hasDecodedDataEntry(String key) {
-        return this.decodedData.containsKey(key);
-    }
-
-
-    public boolean showRaw() {
-        return getEntryTypeName().equals("EndResultTotals");
-    }
-
-
-    public int getHeadLength() {
-        return sizes[0];
-    }
-
-
-    public int getDateTimeLength() {
-        return sizes[1];
-    }
-
-
-    public int getBodyLength() {
-        return sizes[2];
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-
-        if (this.DT == null) {
-            LOG.error("DT is null. RawData=" + ByteUtil.getHex(this.rawData));
-        }
-
-        sb.append(getToStringStart());
-        sb.append(", DT: " + (this.DT == null ? "null" : StringUtil.getStringInLength(this.DT, 19)));
-        sb.append(", length=");
-        sb.append(getHeadLength());
-        sb.append(",");
-        sb.append(getDateTimeLength());
-        sb.append(",");
-        sb.append(getBodyLength());
-        sb.append("(");
-        sb.append((getHeadLength() + getDateTimeLength() + getBodyLength()));
-        sb.append(")");
-
-        boolean hasData = hasData();
-
-        if (hasData) {
-            sb.append(", data=" + getDecodedDataAsString());
-        }
-
-        if (hasData && !showRaw()) {
-            sb.append("]");
-            return sb.toString();
-        }
-
-        if (head != null) {
-            sb.append(", head=");
-            sb.append(ByteUtil.shortHexString(this.head));
-        }
-
-        if (datetime != null) {
-            sb.append(", datetime=");
-            sb.append(ByteUtil.shortHexString(this.datetime));
-        }
-
-        if (body != null) {
-            sb.append(", body=");
-            sb.append(ByteUtil.shortHexString(this.body));
-        }
-
-        sb.append(", rawData=");
-        sb.append(ByteUtil.shortHexString(this.rawData));
-        sb.append("]");
-
-        // sb.append(" DT: ");
-        // sb.append(this.dateTime == null ? " - " : this.dateTime.toString("dd.MM.yyyy HH:mm:ss"));
-
-        // sb.append(" Ext: ");
-
-        return sb.toString();
-    }
-
-
-    public abstract int getOpCode();
-
-
-    public abstract String getToStringStart();
-
-
-    public List<Byte> getRawData() {
-        return rawData;
-    }
-
-
-    public byte getRawDataByIndex(int index) {
-        return rawData.get(index);
-    }
-
-
-    public int getUnsignedRawDataByIndex(int index) {
-        return ByteUtil.convertUnsignedByteToInt(rawData.get(index));
-    }
-
-
-    public void setRawData(List<Byte> rawData) {
-        this.rawData = rawData;
-    }
-
-
-    public byte[] getHead() {
-        return head;
-    }
-
-
-    public void setHead(byte[] head) {
-        this.head = head;
-    }
-
-
-    public byte[] getDatetime() {
-        return datetime;
-    }
-
-
-    public void setDatetime(byte[] datetime) {
-        this.datetime = datetime;
-    }
-
-
-    public byte[] getBody() {
-        return body;
-    }
-
-
-    public void setBody(byte[] body) {
-        this.body = body;
-    }
-
-
-    public void setAtechDateTime(long dt) {
-        this.atechDateTime = dt;
-        this.DT = DateTimeUtil.toString(this.atechDateTime);
-    }
-
-
-    public void addDecodedData(String key, Object value) {
-        if (decodedData == null)
-            decodedData = new HashMap<>();
-
-        decodedData.put(key, value);
-    }
-
-
-    public String toShortString() {
-        if (head == null) {
-            return "Unidentified record. ";
-        } else {
-            return "HistoryRecord: head=[" + ByteUtil.shortHexString(this.head) + "]";
-        }
-    }
-
-    public boolean containsDecodedData(String key) {
-        if (decodedData == null)
-            return false;
-
-        return decodedData.containsKey(key);
-    }
-
-    // if we extend to CGMS this need to be changed back
-    // public abstract PumpHistoryEntryType getEntryType();
-
-}
diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/MedtronicHistoryEntry.kt b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/MedtronicHistoryEntry.kt
new file mode 100644
index 0000000000..dc38b62601
--- /dev/null
+++ b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/MedtronicHistoryEntry.kt
@@ -0,0 +1,215 @@
+package info.nightscout.androidaps.plugins.pump.medtronic.comm.history
+
+import com.google.gson.annotations.Expose
+import info.nightscout.androidaps.plugins.pump.common.utils.ByteUtil
+import info.nightscout.androidaps.plugins.pump.common.utils.DateTimeUtil
+import info.nightscout.androidaps.plugins.pump.common.utils.StringUtil
+
+/**
+ * This file was taken from GGC - GNU Gluco Control (ggc.sourceforge.net), application for diabetes
+ * management and modified/extended for AAPS.
+ *
+ *
+ * Author: Andy {andy.rozman@gmail.com}
+ */
+abstract class MedtronicHistoryEntry : MedtronicHistoryEntryInterface {
+
+    lateinit var rawData: List<Byte>
+
+    protected var sizes = IntArray(3)
+
+    lateinit var head: ByteArray
+    lateinit var datetime: ByteArray
+    lateinit var body: ByteArray
+
+    var id: Long = 0
+
+    @Expose
+    var DT: String? = null
+
+    @Expose
+    var atechDateTime: Long = 0L
+        set(value) {
+            field = value
+            DT = DateTimeUtil.toString(value)
+            if (isEntryTypeSet() && value != 0L) pumpId = generatePumpId()
+        }
+
+    @Expose
+    var decodedData: MutableMap<String, Any> = mutableMapOf()
+
+    /**
+     * Pump id that will be used with AAPS object (time * 1000 + historyType (max is FF = 255)
+     */
+    open var pumpId: Long = 0L
+
+    /**
+     * if history object is already linked to AAPS object (either Treatment, TempBasal or TDD (tdd's
+     * are not actually
+     * linked))
+     */
+    var linked = false
+
+    /**
+     * Linked object, see linked
+     */
+    var linkedObject: Any? = null
+        set(value) {
+            linked = true
+            field = value
+        }
+
+    abstract fun generatePumpId(): Long
+
+    abstract fun isEntryTypeSet(): Boolean
+
+    override fun setData(listRawData: MutableList<Byte>, doNotProcess: Boolean) {
+        rawData = listRawData
+
+        // System.out.println("Head: " + sizes[0] + ", dates: " + sizes[1] +
+        // ", body=" + sizes[2]);
+        if (!doNotProcess) {
+            head = ByteArray(headLength - 1)
+            for (i in 1 until headLength) {
+                head[i - 1] = listRawData[i]
+            }
+            if (dateTimeLength > 0) {
+                datetime = ByteArray(dateTimeLength)
+                var i = headLength
+                var j = 0
+                while (j < dateTimeLength) {
+                    datetime[j] = listRawData[i]
+                    i++
+                    j++
+                }
+            } else
+                datetime = byteArrayOf()
+
+            if (bodyLength > 0) {
+                body = ByteArray(bodyLength)
+                var i = headLength + dateTimeLength
+                var j = 0
+                while (j < bodyLength) {
+                    body[j] = listRawData[i]
+                    i++
+                    j++
+                }
+            } else
+                body = byteArrayOf()
+        }
+        return
+    }
+
+    val dateTimeString: String
+        get() = if (DT == null) "Unknown" else DT!!
+
+    val decodedDataAsString: String
+        get() = if (decodedData.size == 0) if (isNoDataEntry) "No data" else "" else decodedData.toString()
+
+    fun hasData(): Boolean {
+        return decodedData.size == 0 || isNoDataEntry || entryTypeName == "UnabsorbedInsulin"
+    }
+
+    val isNoDataEntry: Boolean
+        get() = sizes[0] == 2 && sizes[1] == 5 && sizes[2] == 0
+
+    fun getDecodedDataEntry(key: String?): Any? {
+        return if (decodedData.containsKey(key)) decodedData[key] else null
+    }
+
+    fun hasDecodedDataEntry(key: String?): Boolean {
+        return decodedData.containsKey(key)
+    }
+
+    fun showRaw(): Boolean {
+        return entryTypeName == "EndResultTotals"
+    }
+
+    val headLength: Int
+        get() = sizes[0]
+
+    val dateTimeLength: Int
+        get() = sizes[1]
+
+    val bodyLength: Int
+        get() = sizes[2]
+
+    override fun toString(): String {
+        val sb = StringBuilder()
+        // if (DT == null) {
+        //     Log.e("", "DT is null. RawData=" + ByteUtil.getHex(rawData))
+        // }
+        sb.append(toStringStart)
+        sb.append(", DT: " + if (DT == null) "null" else StringUtil.getStringInLength(DT, 19))
+        sb.append(", length=")
+        sb.append(headLength)
+        sb.append(",")
+        sb.append(dateTimeLength)
+        sb.append(",")
+        sb.append(bodyLength)
+        sb.append("(")
+        sb.append(headLength + dateTimeLength + bodyLength)
+        sb.append(")")
+        val hasData = hasData()
+        if (hasData) {
+            sb.append(", data=$decodedDataAsString")
+        }
+        if (hasData && !showRaw()) {
+            sb.append("]")
+            return sb.toString()
+        }
+        if (head.size != 0) {
+            sb.append(", head=")
+            sb.append(ByteUtil.shortHexString(head))
+        }
+        if (datetime.size != 0) {
+            sb.append(", datetime=")
+            sb.append(ByteUtil.shortHexString(datetime))
+        }
+        if (body.size != 0) {
+            sb.append(", body=")
+            sb.append(ByteUtil.shortHexString(body))
+        }
+        sb.append(", rawData=")
+        sb.append(ByteUtil.shortHexString(rawData))
+        sb.append("]")
+
+        // sb.append(" DT: ");
+        // sb.append(this.dateTime == null ? " - " : this.dateTime.toString("dd.MM.yyyy HH:mm:ss"));
+
+        // sb.append(" Ext: ");
+        return sb.toString()
+    }
+
+    abstract val opCode: Byte?
+    abstract val toStringStart: String?
+
+    fun getRawDataByIndex(index: Int): Byte {
+        return rawData[index]
+    }
+
+    fun getRawDataByIndexInt(index: Int): Int {
+        return rawData[index].toInt()
+    }
+
+    fun getUnsignedRawDataByIndex(index: Int): Int {
+        return ByteUtil.convertUnsignedByteToInt(rawData[index])
+    }
+
+    fun addDecodedData(key: String, value: Any) {
+        decodedData.put(key, value)
+    }
+
+    fun toShortString(): String {
+        return if (head.size != 0) {
+            "Unidentified record. "
+        } else {
+            "HistoryRecord: head=[" + ByteUtil.shortHexString(head) + "]"
+        }
+    }
+
+    fun containsDecodedData(key: String?): Boolean {
+        return decodedData.containsKey(key)
+    } // if we extend to CGMS this need to be changed back
+    // public abstract PumpHistoryEntryType getEntryType();
+}
\ No newline at end of file
diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/MedtronicHistoryEntryInterface.java b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/MedtronicHistoryEntryInterface.java
deleted file mode 100644
index 38b7e1dbeb..0000000000
--- a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/MedtronicHistoryEntryInterface.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.medtronic.comm.history;
-
-import java.util.List;
-
-/**
- * Created by andy on 7/24/18.
- */
-public interface MedtronicHistoryEntryInterface {
-
-    String getEntryTypeName();
-
-    void setData(List<Byte> listRawData, boolean doNotProcess);
-
-    int getDateLength();
-
-}
diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/MedtronicHistoryEntryInterface.kt b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/MedtronicHistoryEntryInterface.kt
new file mode 100644
index 0000000000..21098edd1e
--- /dev/null
+++ b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/MedtronicHistoryEntryInterface.kt
@@ -0,0 +1,11 @@
+package info.nightscout.androidaps.plugins.pump.medtronic.comm.history
+
+/**
+ * Created by andy on 7/24/18.
+ */
+interface MedtronicHistoryEntryInterface {
+
+    val entryTypeName: String
+    fun setData(listRawData: MutableList<Byte>, doNotProcess: Boolean)
+    val dateLength: Int
+}
\ No newline at end of file
diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/RawHistoryPage.java b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/RawHistoryPage.java
deleted file mode 100644
index 182e09b1bd..0000000000
--- a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/RawHistoryPage.java
+++ /dev/null
@@ -1,87 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.medtronic.comm.history;
-
-import java.util.Arrays;
-import java.util.Locale;
-
-import info.nightscout.androidaps.logging.AAPSLogger;
-import info.nightscout.androidaps.logging.LTag;
-import info.nightscout.androidaps.plugins.pump.common.utils.ByteUtil;
-import info.nightscout.androidaps.plugins.pump.common.utils.CRC;
-import info.nightscout.androidaps.plugins.pump.medtronic.util.MedtronicUtil;
-
-/**
- * Created by geoff on 6/4/16.
- */
-public class RawHistoryPage {
-
-    private final AAPSLogger aapsLogger;
-
-    private byte[] data = new byte[0];
-
-
-    public RawHistoryPage(AAPSLogger aapsLogger) {
-        this.aapsLogger = aapsLogger;
-    }
-
-
-    public void appendData(byte[] newdata) {
-        data = ByteUtil.concat(data, newdata);
-    }
-
-
-    public byte[] getData() {
-        return data;
-    }
-
-
-    byte[] getOnlyData() {
-        return Arrays.copyOfRange(data, 0, 1022);
-    }
-
-
-    public int getLength() {
-        return data.length;
-    }
-
-
-    public boolean isChecksumOK() {
-        if (getLength() != 1024) {
-            return false;
-        }
-        byte[] computedCRC = CRC.calculate16CCITT(ByteUtil.substring(data, 0, 1022));
-
-        int crcCalculated = ByteUtil.toInt(computedCRC[0], computedCRC[1]);
-        int crcStored = ByteUtil.toInt(data[1022], data[1023]);
-
-        if (crcCalculated != crcStored) {
-            aapsLogger.error(LTag.PUMPBTCOMM, String.format(Locale.ENGLISH, "Stored CRC (%d) is different than calculated (%d), but ignored for now.", crcStored,
-                    crcCalculated));
-        } else {
-            if (MedtronicUtil.isLowLevelDebug())
-                aapsLogger.debug(LTag.PUMPBTCOMM, "CRC ok.");
-        }
-
-        return crcCalculated == crcStored;
-    }
-
-
-    public void dumpToDebug() {
-        int linesize = 80;
-        int offset = 0;
-
-        StringBuilder sb = new StringBuilder();
-
-        while (offset < data.length) {
-            int bytesToLog = linesize;
-            if (offset + linesize > data.length) {
-                bytesToLog = data.length - offset;
-            }
-            sb.append(ByteUtil.shortHexString(ByteUtil.substring(data, offset, bytesToLog)) + " ");
-            // sb.append("\n");
-
-            offset += linesize;
-        }
-
-        aapsLogger.info(LTag.PUMPBTCOMM, "History Page Data:\n" + sb.toString());
-    }
-}
diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/RawHistoryPage.kt b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/RawHistoryPage.kt
new file mode 100644
index 0000000000..c4036ea46e
--- /dev/null
+++ b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/RawHistoryPage.kt
@@ -0,0 +1,61 @@
+package info.nightscout.androidaps.plugins.pump.medtronic.comm.history
+
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.pump.common.utils.ByteUtil
+import info.nightscout.androidaps.plugins.pump.common.utils.CRC
+import info.nightscout.androidaps.plugins.pump.medtronic.util.MedtronicUtil
+import java.util.*
+
+/**
+ * Created by geoff on 6/4/16.
+ */
+class RawHistoryPage(private val aapsLogger: AAPSLogger) {
+
+    var data = ByteArray(0)
+        private set
+
+    fun appendData(newdata: ByteArray?) {
+        data = ByteUtil.concat(data, newdata)
+    }
+
+    val onlyData: ByteArray
+        get() = Arrays.copyOfRange(data, 0, 1022)
+
+    val length: Int
+        get() = data.size
+
+    val isChecksumOK: Boolean
+        get() {
+            if (length != 1024) {
+                return false
+            }
+            val computedCRC = CRC.calculate16CCITT(ByteUtil.substring(data, 0, 1022))
+            val crcCalculated = ByteUtil.toInt(computedCRC[0].toInt(), computedCRC[1].toInt())
+            val crcStored = ByteUtil.toInt(data[1022].toInt(), data[1023].toInt())
+            if (crcCalculated != crcStored) {
+                aapsLogger.error(LTag.PUMPBTCOMM, String.format(Locale.ENGLISH, "Stored CRC (%d) is different than calculated (%d), but ignored for now.", crcStored,
+                    crcCalculated))
+            } else {
+                if (MedtronicUtil.isLowLevelDebug) aapsLogger.debug(LTag.PUMPBTCOMM, "CRC ok.")
+            }
+            return crcCalculated == crcStored
+        }
+
+    fun dumpToDebug() {
+        val linesize = 80
+        var offset = 0
+        val sb = StringBuilder()
+        while (offset < data.size) {
+            var bytesToLog = linesize
+            if (offset + linesize > data.size) {
+                bytesToLog = data.size - offset
+            }
+            sb.append(ByteUtil.shortHexString(ByteUtil.substring(data, offset, bytesToLog)) + " ")
+            // sb.append("\n");
+            offset += linesize
+        }
+        aapsLogger.info(LTag.PUMPBTCOMM, "History Page Data:\n$sb")
+    }
+
+}
\ No newline at end of file
diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/RecordDecodeStatus.java b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/RecordDecodeStatus.java
deleted file mode 100644
index 18cb02cfad..0000000000
--- a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/RecordDecodeStatus.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.medtronic.comm.history;
-
-/**
- * This file was taken from GGC - GNU Gluco Control (ggc.sourceforge.net), application for diabetes
- * management and modified/extended for AAPS.
- *
- * Author: Andy {andy.rozman@gmail.com}
- */
-
-public enum RecordDecodeStatus {
-    OK("OK     "), //
-    Ignored("IGNORE "), //
-    NotSupported("N/A YET"), //
-    Error("ERROR  "), //
-    WIP("WIP    "), //
-    Unknown("UNK    ");
-
-    String description;
-
-
-    RecordDecodeStatus(String description) {
-        this.description = description;
-
-    }
-
-
-    public String getDescription() {
-        return description;
-    }
-}
diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/RecordDecodeStatus.kt b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/RecordDecodeStatus.kt
new file mode 100644
index 0000000000..82194b1f03
--- /dev/null
+++ b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/RecordDecodeStatus.kt
@@ -0,0 +1,19 @@
+package info.nightscout.androidaps.plugins.pump.medtronic.comm.history
+
+/**
+ * This file was taken from GGC - GNU Gluco Control (ggc.sourceforge.net), application for diabetes
+ * management and modified/extended for AAPS.
+ *
+ *
+ * Author: Andy {andy.rozman@gmail.com}
+ */
+enum class RecordDecodeStatus(var description: String) {
+
+    OK("OK     "),  //
+    Ignored("IGNORE "),  //
+    NotSupported("N/A YET"),  //
+    Error("ERROR  "),  //
+    WIP("WIP    "),  //
+    Unknown("UNK    ");
+
+}
\ No newline at end of file
diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/cgms/CGMSHistoryEntry.java b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/cgms/CGMSHistoryEntry.java
deleted file mode 100644
index 4d35426fb8..0000000000
--- a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/cgms/CGMSHistoryEntry.java
+++ /dev/null
@@ -1,92 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.medtronic.comm.history.cgms;
-
-import org.apache.commons.lang3.StringUtils;
-import org.joda.time.LocalDateTime;
-
-import java.util.List;
-
-import info.nightscout.androidaps.plugins.pump.common.utils.ByteUtil;
-import info.nightscout.androidaps.plugins.pump.common.utils.DateTimeUtil;
-import info.nightscout.androidaps.plugins.pump.medtronic.comm.history.MedtronicHistoryEntry;
-
-/**
- * This file was taken from GGC - GNU Gluco Control (ggc.sourceforge.net), application for diabetes
- * management and modified/extended for AAPS.
- *
- * Author: Andy {andy.rozman@gmail.com}
- */
-
-public class CGMSHistoryEntry extends MedtronicHistoryEntry {
-
-    private CGMSHistoryEntryType entryType;
-    private Integer opCode; // this is set only when we have unknown entry...
-
-
-    public CGMSHistoryEntryType getEntryType() {
-        return entryType;
-    }
-
-
-    public void setEntryType(CGMSHistoryEntryType entryType) {
-        this.entryType = entryType;
-
-        this.sizes[0] = entryType.getHeadLength();
-        this.sizes[1] = entryType.getDateLength();
-        this.sizes[2] = entryType.getBodyLength();
-    }
-
-
-    @Override
-    public String getEntryTypeName() {
-        return this.entryType.name();
-    }
-
-
-    public void setData(List<Byte> listRawData, boolean doNotProcess) {
-        if (this.entryType.schemaSet) {
-            super.setData(listRawData, doNotProcess);
-        } else {
-            this.rawData = listRawData;
-        }
-    }
-
-
-    @Override
-    public int getDateLength() {
-        return this.entryType.getDateLength();
-    }
-
-
-    @Override
-    public int getOpCode() {
-        if (opCode == null)
-            return entryType.getOpCode();
-        else
-            return opCode;
-    }
-
-
-    public void setOpCode(Integer opCode) {
-        this.opCode = opCode;
-    }
-
-
-    public boolean hasTimeStamp() {
-        return (this.entryType.hasDate());
-    }
-
-
-    @Override
-    public String getToStringStart() {
-
-        return "CGMSHistoryEntry [type=" + StringUtils.rightPad(entryType.name(), 18) + " ["
-                + StringUtils.leftPad("" + getOpCode(), 3) + ", 0x" + ByteUtil.getCorrectHexValue(getOpCode()) + "]";
-    }
-
-
-    public void setDateTime(LocalDateTime timeStamp, int getIndex) {
-
-        setAtechDateTime(DateTimeUtil.toATechDate(timeStamp.plusMinutes(getIndex * 5)));
-
-    }
-}
diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/cgms/CGMSHistoryEntry.kt b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/cgms/CGMSHistoryEntry.kt
new file mode 100644
index 0000000000..26e9cea75a
--- /dev/null
+++ b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/cgms/CGMSHistoryEntry.kt
@@ -0,0 +1,63 @@
+package info.nightscout.androidaps.plugins.pump.medtronic.comm.history.cgms
+
+import info.nightscout.androidaps.plugins.pump.common.utils.ByteUtil
+import info.nightscout.androidaps.plugins.pump.common.utils.DateTimeUtil
+import info.nightscout.androidaps.plugins.pump.medtronic.comm.history.MedtronicHistoryEntry
+import org.apache.commons.lang3.StringUtils
+import org.joda.time.LocalDateTime
+
+/**
+ * This file was taken from GGC - GNU Gluco Control (ggc.sourceforge.net), application for diabetes
+ * management and modified/extended for AAPS.
+ *
+ * Author: Andy {andy.rozman@gmail.com}
+ */
+class CGMSHistoryEntry : MedtronicHistoryEntry() {
+
+    var entryType: CGMSHistoryEntryType = CGMSHistoryEntryType.UnknownOpCode
+        private set
+
+    override var opCode: Byte? = null // this is set only when we have unknown entry...
+        get() = if (field == null) entryType.code.toByte() else field
+
+    fun setEntryType(entryType: CGMSHistoryEntryType) {
+        this.entryType = entryType
+        sizes[0] = entryType.headLength
+        sizes[1] = entryType.dateLength
+        sizes[2] = entryType.bodyLength
+    }
+
+    override val entryTypeName: String
+        get() = entryType.name
+
+    override fun generatePumpId(): Long {
+        return entryType.code + atechDateTime * 1000L
+    }
+
+    override fun isEntryTypeSet(): Boolean {
+        return entryType != CGMSHistoryEntryType.UnknownOpCode
+    }
+
+    override fun setData(listRawData: MutableList<Byte>, doNotProcess: Boolean) {
+        if (entryType.schemaSet) {
+            super.setData(listRawData, doNotProcess)
+        } else {
+            rawData = listRawData
+        }
+    }
+
+    override val dateLength: Int
+        get() = entryType.dateLength
+
+    fun hasTimeStamp(): Boolean {
+        return entryType.hasDate()
+    }
+
+    override val toStringStart: String
+        get() = ("CGMSHistoryEntry [type=" + StringUtils.rightPad(entryType.name, 18) + " ["
+            + StringUtils.leftPad("" + opCode, 3) + ", 0x" + ByteUtil.getCorrectHexValue(opCode!!) + "]")
+
+    fun setDateTime(timeStamp: LocalDateTime, getIndex: Int) {
+        atechDateTime = (DateTimeUtil.toATechDate(timeStamp.plusMinutes(getIndex * 5)))
+    }
+}
\ No newline at end of file
diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/cgms/CGMSHistoryEntryType.java b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/cgms/CGMSHistoryEntryType.java
deleted file mode 100644
index 64161c720a..0000000000
--- a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/cgms/CGMSHistoryEntryType.java
+++ /dev/null
@@ -1,135 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.medtronic.comm.history.cgms;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * This file was taken from GGC - GNU Gluco Control (ggc.sourceforge.net), application for diabetes
- * management and modified/extended for AAPS.
- *
- * Author: Andy {andy.rozman@gmail.com}
- */
-
-public enum CGMSHistoryEntryType {
-
-    None(0, "None", 1, 0, 0, DateType.None), //
-
-    DataEnd(0x01, "DataEnd", 1, 0, 0, DateType.PreviousTimeStamp), //
-    SensorWeakSignal(0x02, "SensorWeakSignal", 1, 0, 0, DateType.PreviousTimeStamp), //
-    SensorCal(0x03, "SensorCal", 1, 0, 1, DateType.PreviousTimeStamp), //
-    SensorPacket(0x04, "SensorPacket", 1, 0, 1, DateType.PreviousTimeStamp),
-    SensorError(0x05, "SensorError", 1, 0, 1, DateType.PreviousTimeStamp),
-    SensorDataLow(0x06, "SensorDataLow", 1, 0, 1, DateType.PreviousTimeStamp),
-    SensorDataHigh(0x07, "SensorDataHigh", 1, 0, 1, DateType.PreviousTimeStamp),
-    SensorTimestamp(0x08, "SensorTimestamp", 1, 4, 0, DateType.MinuteSpecific), //
-    BatteryChange(0x0a, "BatteryChange", 1, 4, 0, DateType.MinuteSpecific), //
-    SensorStatus(0x0b, "SensorStatus", 1, 4, 0, DateType.MinuteSpecific), //
-    DateTimeChange(0x0c, "DateTimeChange", 1, 4, 0, DateType.SecondSpecific), //
-    SensorSync(0x0d, "SensorSync',packet_size=4", 1, 4, 0, DateType.MinuteSpecific), //
-    CalBGForGH(0x0e, "CalBGForGH',packet_size=5", 1, 4, 1, DateType.MinuteSpecific), //
-    SensorCalFactor(0x0f, "SensorCalFactor", 1, 4, 2, DateType.MinuteSpecific), //
-    Something10(0x10, "10-Something", 1, 4, 0, DateType.MinuteSpecific), //
-    Something19(0x13, "19-Something", 1, 0, 0, DateType.PreviousTimeStamp),
-    GlucoseSensorData(0xFF, "GlucoseSensorData", 1, 0, 0, DateType.PreviousTimeStamp);
-
-    private static final Map<Integer, CGMSHistoryEntryType> opCodeMap = new HashMap<>();
-
-    static {
-        for (CGMSHistoryEntryType type : values()) {
-            opCodeMap.put(type.opCode, type);
-        }
-    }
-
-    public boolean schemaSet;
-    private final int opCode;
-    private final String description;
-    private final int headLength;
-    private final int dateLength;
-    private final int bodyLength;
-    private final int totalLength;
-    private final DateType dateType;
-
-
-    CGMSHistoryEntryType(int opCode, String name, int head, int date, int body, DateType dateType) {
-        this.opCode = opCode;
-        this.description = name;
-        this.headLength = head;
-        this.dateLength = date;
-        this.bodyLength = body;
-        this.totalLength = (head + date + body);
-        this.schemaSet = true;
-        this.dateType = dateType;
-    }
-
-
-    // private CGMSHistoryEntryType(int opCode, String name, int length)
-    // {
-    // this.opCode = opCode;
-    // this.description = name;
-    // this.headLength = 0;
-    // this.dateLength = 0;
-    // this.bodyLength = 0;
-    // this.totalLength = length + 1; // opCode
-    // }
-
-    public static CGMSHistoryEntryType getByCode(int opCode) {
-        if (opCodeMap.containsKey(opCode)) {
-            return opCodeMap.get(opCode);
-        } else
-            return CGMSHistoryEntryType.None;
-    }
-
-
-    public int getCode() {
-        return this.opCode;
-    }
-
-
-    public int getTotalLength() {
-        return totalLength;
-    }
-
-
-    public int getOpCode() {
-        return opCode;
-    }
-
-
-    public String getDescription() {
-        return description;
-    }
-
-
-    public int getHeadLength() {
-        return headLength;
-    }
-
-
-    public int getDateLength() {
-        return dateLength;
-    }
-
-
-    public int getBodyLength() {
-        return bodyLength;
-    }
-
-
-    public DateType getDateType() {
-        return dateType;
-    }
-
-
-    public boolean hasDate() {
-        return (this.dateType == DateType.MinuteSpecific) || (this.dateType == DateType.SecondSpecific);
-    }
-
-    public enum DateType {
-        None, //
-        MinuteSpecific, //
-        SecondSpecific, //
-        PreviousTimeStamp //
-
-    }
-
-}
diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/cgms/CGMSHistoryEntryType.kt b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/cgms/CGMSHistoryEntryType.kt
new file mode 100644
index 0000000000..4e993c1249
--- /dev/null
+++ b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/cgms/CGMSHistoryEntryType.kt
@@ -0,0 +1,64 @@
+package info.nightscout.androidaps.plugins.pump.medtronic.comm.history.cgms
+
+/**
+ * This file was taken from GGC - GNU Gluco Control (ggc.sourceforge.net), application for diabetes
+ * management and modified/extended for AAPS.
+ *
+ * Author: Andy {andy.rozman@gmail.com}
+ */
+enum class CGMSHistoryEntryType(val code: Int, val description: String, val headLength: Int, val dateLength: Int, val bodyLength: Int, dateType: DateType) {
+
+    None(0, "None", 1, 0, 0, DateType.None),  //
+    DataEnd(0x01, "DataEnd", 1, 0, 0, DateType.PreviousTimeStamp),  //
+    SensorWeakSignal(0x02, "SensorWeakSignal", 1, 0, 0, DateType.PreviousTimeStamp),  //
+    SensorCal(0x03, "SensorCal", 1, 0, 1, DateType.PreviousTimeStamp),  //
+    SensorPacket(0x04, "SensorPacket", 1, 0, 1, DateType.PreviousTimeStamp), SensorError(0x05, "SensorError", 1, 0, 1, DateType.PreviousTimeStamp), SensorDataLow(0x06, "SensorDataLow", 1, 0, 1, DateType.PreviousTimeStamp), SensorDataHigh(0x07, "SensorDataHigh", 1, 0, 1, DateType.PreviousTimeStamp), SensorTimestamp(0x08, "SensorTimestamp", 1, 4, 0, DateType.MinuteSpecific),  //
+    BatteryChange(0x0a, "BatteryChange", 1, 4, 0, DateType.MinuteSpecific),  //
+    SensorStatus(0x0b, "SensorStatus", 1, 4, 0, DateType.MinuteSpecific),  //
+    DateTimeChange(0x0c, "DateTimeChange", 1, 4, 0, DateType.SecondSpecific),  //
+    SensorSync(0x0d, "SensorSync',packet_size=4", 1, 4, 0, DateType.MinuteSpecific),  //
+    CalBGForGH(0x0e, "CalBGForGH',packet_size=5", 1, 4, 1, DateType.MinuteSpecific),  //
+    SensorCalFactor(0x0f, "SensorCalFactor", 1, 4, 2, DateType.MinuteSpecific),  //
+    Something10(0x10, "10-Something", 1, 4, 0, DateType.MinuteSpecific),  //
+    Something19(0x13, "19-Something", 1, 0, 0, DateType.PreviousTimeStamp), GlucoseSensorData(0xFF, "GlucoseSensorData", 1, 0, 0, DateType.PreviousTimeStamp),
+    UnknownOpCode(0xFF, "Unknown", 0, 0, 0, DateType.None);
+
+    companion object {
+
+        private val opCodeMap: MutableMap<Int, CGMSHistoryEntryType> = mutableMapOf()
+
+        fun getByCode(opCode: Int): CGMSHistoryEntryType {
+            return if (opCodeMap.containsKey(opCode))
+                opCodeMap[opCode]!!
+            else
+                UnknownOpCode
+        }
+
+        init {
+            for (type in values()) {
+                opCodeMap[type.code] = type
+            }
+        }
+    }
+
+    var schemaSet: Boolean
+    val totalLength: Int
+    val dateType: DateType
+
+    fun hasDate(): Boolean {
+        return dateType == DateType.MinuteSpecific || dateType == DateType.SecondSpecific
+    }
+
+    enum class DateType {
+        None,  //
+        MinuteSpecific,  //
+        SecondSpecific,  //
+        PreviousTimeStamp //
+    }
+
+    init {
+        totalLength = headLength + dateLength + bodyLength
+        schemaSet = true
+        this.dateType = dateType
+    }
+}
\ No newline at end of file
diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/cgms/MedtronicCGMSHistoryDecoder.java b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/cgms/MedtronicCGMSHistoryDecoder.java
deleted file mode 100644
index 2854d49c41..0000000000
--- a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/cgms/MedtronicCGMSHistoryDecoder.java
+++ /dev/null
@@ -1,469 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.medtronic.comm.history.cgms;
-
-import org.joda.time.LocalDateTime;
-import org.slf4j.Logger;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import info.nightscout.androidaps.logging.LTag;
-import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
-import info.nightscout.androidaps.plugins.pump.common.utils.DateTimeUtil;
-import info.nightscout.androidaps.plugins.pump.medtronic.comm.history.MedtronicHistoryDecoder;
-import info.nightscout.androidaps.plugins.pump.medtronic.comm.history.RecordDecodeStatus;
-
-/**
- * This file was taken from GGC - GNU Gluco Control (ggc.sourceforge.net), application for diabetes
- * management and modified/extended for AAPS.
- * <p>
- * Author: Andy {andy.rozman@gmail.com}
- */
-
-public class MedtronicCGMSHistoryDecoder extends MedtronicHistoryDecoder<CGMSHistoryEntry> {
-
-    //private static final Logger LOG = StacktraceLoggerWrapper.getLogger(LTag.PUMPCOMM);
-
-
-    // CGMSValuesWriter cgmsValuesWriter = null;
-
-    public MedtronicCGMSHistoryDecoder() {
-    }
-
-
-    public RecordDecodeStatus decodeRecord(CGMSHistoryEntry record) {
-        try {
-            return decodeRecord(record, false);
-        } catch (Exception ex) {
-            //LOG.error("     Error decoding: type={}, ex={}", record.getEntryType().name(), ex.getMessage(), ex);
-            return RecordDecodeStatus.Error;
-        }
-    }
-
-
-    public RecordDecodeStatus decodeRecord(CGMSHistoryEntry entry, boolean x) {
-
-        if (entry.getDateTimeLength() > 0) {
-            parseDate(entry);
-        }
-
-        switch (entry.getEntryType()) {
-
-            case SensorPacket:
-                decodeSensorPacket(entry);
-                break;
-
-            case SensorError:
-                decodeSensorError(entry);
-                break;
-
-            case SensorDataLow:
-                decodeDataHighLow(entry, 40);
-                break;
-
-            case SensorDataHigh:
-                decodeDataHighLow(entry, 400);
-                break;
-
-            case SensorTimestamp:
-                decodeSensorTimestamp(entry);
-                break;
-
-            case SensorCal:
-                decodeSensorCal(entry);
-                break;
-
-            case SensorCalFactor:
-                decodeSensorCalFactor(entry);
-                break;
-
-            case SensorSync:
-                decodeSensorSync(entry);
-                break;
-
-            case SensorStatus:
-                decodeSensorStatus(entry);
-                break;
-
-            case CalBGForGH:
-                decodeCalBGForGH(entry);
-                break;
-
-            case GlucoseSensorData:
-                decodeGlucoseSensorData(entry);
-                break;
-
-            // just timestamp
-            case BatteryChange:
-            case Something10:
-            case DateTimeChange:
-                break;
-
-            // just relative timestamp
-            case Something19:
-            case DataEnd:
-            case SensorWeakSignal:
-                break;
-
-            case None:
-                break;
-
-        }
-
-        return RecordDecodeStatus.NotSupported;
-    }
-
-
-    @Override
-    public void postProcess() {
-
-    }
-
-
-    public List<CGMSHistoryEntry> createRecords(List<Byte> dataClearInput) {
-
-        List<Byte> dataClear = reverseList(dataClearInput, Byte.class);
-
-        prepareStatistics();
-
-        int counter = 0;
-
-        List<CGMSHistoryEntry> outList = new ArrayList<CGMSHistoryEntry>();
-
-        // create CGMS entries (without dates)
-        do {
-            int opCode = getUnsignedInt(dataClear.get(counter));
-            counter++;
-
-            CGMSHistoryEntryType entryType;
-
-            if (opCode == 0) {
-                // continue;
-            } else if ((opCode > 0) && (opCode < 20)) {
-                entryType = CGMSHistoryEntryType.getByCode(opCode);
-
-                if (entryType == CGMSHistoryEntryType.None) {
-                    this.unknownOpCodes.put(opCode, opCode);
-                    //LOG.warn("GlucoseHistoryEntry with unknown code: " + opCode);
-
-                    CGMSHistoryEntry pe = new CGMSHistoryEntry();
-                    pe.setEntryType(CGMSHistoryEntryType.None);
-                    pe.setOpCode(opCode);
-
-                    pe.setData(Arrays.asList((byte) opCode), false);
-
-                    outList.add(pe);
-                } else {
-                    // System.out.println("OpCode: " + opCode);
-
-                    List<Byte> listRawData = new ArrayList<Byte>();
-                    listRawData.add((byte) opCode);
-
-                    for (int j = 0; j < (entryType.getTotalLength() - 1); j++) {
-                        listRawData.add(dataClear.get(counter));
-                        counter++;
-                    }
-
-                    CGMSHistoryEntry pe = new CGMSHistoryEntry();
-                    pe.setEntryType(entryType);
-
-                    pe.setOpCode(opCode);
-                    pe.setData(listRawData, false);
-
-                    // System.out.println("Record: " + pe);
-
-                    outList.add(pe);
-                }
-            } else {
-                CGMSHistoryEntry pe = new CGMSHistoryEntry();
-                pe.setEntryType(CGMSHistoryEntryType.GlucoseSensorData);
-
-                pe.setData(Arrays.asList((byte) opCode), false);
-
-                outList.add(pe);
-            }
-
-        } while (counter < dataClear.size());
-
-        List<CGMSHistoryEntry> reversedOutList = reverseList(outList, CGMSHistoryEntry.class);
-
-        Long timeStamp = null;
-        LocalDateTime dateTime = null;
-        int getIndex = 0;
-
-        for (CGMSHistoryEntry entry : reversedOutList) {
-
-            decodeRecord(entry);
-
-            if (entry.hasTimeStamp()) {
-                timeStamp = entry.atechDateTime;
-                dateTime = DateTimeUtil.toLocalDateTime(timeStamp);
-                getIndex = 0;
-            } else if (entry.getEntryType() == CGMSHistoryEntryType.GlucoseSensorData) {
-                getIndex++;
-                if (dateTime != null)
-                    entry.setDateTime(dateTime, getIndex);
-            } else {
-                if (dateTime != null)
-                    entry.setDateTime(dateTime, getIndex);
-            }
-
-            //LOG.debug("Record: {}", entry);
-        }
-
-        return reversedOutList;
-
-    }
-
-
-    private <E> List<E> reverseList(List<E> dataClearInput, Class<E> clazz) {
-
-        List<E> outList = new ArrayList<E>();
-
-        for (int i = dataClearInput.size() - 1; i > 0; i--) {
-            outList.add(dataClearInput.get(i));
-        }
-
-        return outList;
-    }
-
-
-    private int parseMinutes(int one) {
-        return (one & Integer.parseInt("0111111", 2));
-    }
-
-
-    private int parseHours(int one) {
-        return (one & 0x1F);
-    }
-
-
-    private int parseDay(int one) {
-        return one & 0x1F;
-    }
-
-
-    private int parseMonths(int first_byte, int second_byte) {
-
-        int first_two_bits = first_byte >> 6;
-        int second_two_bits = second_byte >> 6;
-
-        return (first_two_bits << 2) + second_two_bits;
-    }
-
-
-    private int parseYear(int year) {
-        return (year & 0x0F) + 2000;
-    }
-
-
-    private Long parseDate(CGMSHistoryEntry entry) {
-
-        if (!entry.getEntryType().hasDate())
-            return null;
-
-        byte[] data = entry.getDatetime();
-
-        if (entry.getEntryType().getDateType() == CGMSHistoryEntryType.DateType.MinuteSpecific) {
-
-            Long atechDateTime = DateTimeUtil.toATechDate(parseYear(data[3]), parseMonths(data[0], data[1]),
-                    parseDay(data[2]), parseHours(data[0]), parseMinutes(data[1]), 0);
-
-            entry.setAtechDateTime(atechDateTime);
-
-            return atechDateTime;
-
-        } else if (entry.getEntryType().getDateType() == CGMSHistoryEntryType.DateType.SecondSpecific) {
-            //LOG.warn("parseDate for SecondSpecific type is not implemented.");
-            throw new RuntimeException();
-            // return null;
-        } else
-            return null;
-
-    }
-
-
-    private void decodeGlucoseSensorData(CGMSHistoryEntry entry) {
-        int sgv = entry.getUnsignedRawDataByIndex(0) * 2;
-        entry.addDecodedData("sgv", sgv);
-    }
-
-
-    private void decodeCalBGForGH(CGMSHistoryEntry entry) {
-
-        int amount = ((entry.getRawDataByIndex(3) & 0b00100000) << 3) | entry.getRawDataByIndex(5);
-        //
-        String originType;
-
-        switch (entry.getRawDataByIndex(3) >> 5 & 0b00000011) {
-            case 0x00:
-                originType = "rf";
-                break;
-
-            default:
-                originType = "unknown";
-
-        }
-
-        entry.addDecodedData("amount", amount);
-        entry.addDecodedData("originType", originType);
-
-    }
-
-
-    private void decodeSensorSync(CGMSHistoryEntry entry) {
-
-        String syncType;
-
-        switch (entry.getRawDataByIndex(3) >> 5 & 0b00000011) {
-            case 0x01:
-                syncType = "new";
-                break;
-
-            case 0x02:
-                syncType = "old";
-                break;
-
-            default:
-                syncType = "find";
-                break;
-
-        }
-
-        entry.addDecodedData("syncType", syncType);
-    }
-
-
-    private void decodeSensorStatus(CGMSHistoryEntry entry) {
-
-        String statusType;
-
-        switch (entry.getRawDataByIndex(3) >> 5 & 0b00000011) {
-            case 0x00:
-                statusType = "off";
-                break;
-
-            case 0x01:
-                statusType = "on";
-                break;
-
-            case 0x02:
-                statusType = "lost";
-                break;
-
-            default:
-                statusType = "unknown";
-        }
-
-        entry.addDecodedData("statusType", statusType);
-
-    }
-
-
-    private void decodeSensorCalFactor(CGMSHistoryEntry entry) {
-
-        double factor = (entry.getRawDataByIndex(5) << 8 | entry.getRawDataByIndex(6)) / 1000.0d;
-
-        entry.addDecodedData("factor", factor);
-    }
-
-
-    private void decodeSensorCal(CGMSHistoryEntry entry) {
-
-        String calibrationType;
-
-        switch (entry.getRawDataByIndex(1)) {
-            case 0x00:
-                calibrationType = "meter_bg_now";
-                break;
-
-            case 0x01:
-                calibrationType = "waiting";
-                break;
-
-            case 0x02:
-                calibrationType = "cal_error";
-                break;
-
-            default:
-                calibrationType = "unknown";
-        }
-
-        entry.addDecodedData("calibrationType", calibrationType);
-
-    }
-
-
-    private void decodeSensorTimestamp(CGMSHistoryEntry entry) {
-
-        String sensorTimestampType;
-
-        switch (entry.getRawDataByIndex(3) >> 5 & 0b00000011) {
-
-            case 0x00:
-                sensorTimestampType = "LastRf";
-                break;
-
-            case 0x01:
-                sensorTimestampType = "PageEnd";
-                break;
-
-            case 0x02:
-                sensorTimestampType = "Gap";
-                break;
-
-            default:
-                sensorTimestampType = "Unknown";
-                break;
-
-        }
-
-        entry.addDecodedData("sensorTimestampType", sensorTimestampType);
-    }
-
-
-    private void decodeSensorPacket(CGMSHistoryEntry entry) {
-
-        String packetType;
-
-        switch (entry.getRawDataByIndex(1)) {
-            case 0x02:
-                packetType = "init";
-                break;
-
-            default:
-                packetType = "unknown";
-        }
-
-        entry.addDecodedData("packetType", packetType);
-    }
-
-
-    private void decodeSensorError(CGMSHistoryEntry entry) {
-
-        String errorType;
-
-        switch (entry.getRawDataByIndex(1)) {
-            case 0x01:
-                errorType = "end";
-                break;
-
-            default:
-                errorType = "unknown";
-        }
-
-        entry.addDecodedData("errorType", errorType);
-    }
-
-
-    private void decodeDataHighLow(CGMSHistoryEntry entry, int sgv) {
-        entry.addDecodedData("sgv", sgv);
-    }
-
-
-    @Override
-    protected void runPostDecodeTasks() {
-        this.showStatistics();
-    }
-
-}
diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/cgms/MedtronicCGMSHistoryDecoder.kt b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/cgms/MedtronicCGMSHistoryDecoder.kt
new file mode 100644
index 0000000000..218330d6be
--- /dev/null
+++ b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/cgms/MedtronicCGMSHistoryDecoder.kt
@@ -0,0 +1,278 @@
+package info.nightscout.androidaps.plugins.pump.medtronic.comm.history.cgms
+
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.pump.common.utils.ByteUtil
+import info.nightscout.androidaps.plugins.pump.common.utils.DateTimeUtil
+import info.nightscout.androidaps.plugins.pump.medtronic.comm.history.MedtronicHistoryDecoder
+import info.nightscout.androidaps.plugins.pump.medtronic.comm.history.RecordDecodeStatus
+import info.nightscout.androidaps.plugins.pump.medtronic.comm.history.cgms.CGMSHistoryEntryType.Companion.getByCode
+import info.nightscout.androidaps.plugins.pump.medtronic.util.MedtronicUtil
+import okhttp3.internal.and
+import org.joda.time.LocalDateTime
+import java.util.*
+
+/**
+ * This file was taken from GGC - GNU Gluco Control (ggc.sourceforge.net), application for diabetes
+ * management and modified/extended for AAPS.
+ *
+ *
+ * Author: Andy {andy.rozman@gmail.com}
+ */
+class MedtronicCGMSHistoryDecoder constructor(
+    aapsLogger: AAPSLogger,
+    medtronicUtil: MedtronicUtil,
+    bitUtils: ByteUtil
+) : MedtronicHistoryDecoder<CGMSHistoryEntry>(aapsLogger, medtronicUtil, bitUtils) {
+
+    override fun decodeRecord(record: CGMSHistoryEntry): RecordDecodeStatus? {
+        return try {
+            decodeRecordInternal(record)
+        } catch (ex: Exception) {
+            aapsLogger.error(LTag.PUMPCOMM, "     Error decoding: type={}, ex={}", record.entryType.name, ex.message, ex)
+            RecordDecodeStatus.Error
+        }
+    }
+
+    fun decodeRecordInternal(entry: CGMSHistoryEntry): RecordDecodeStatus {
+        if (entry.dateTimeLength > 0) {
+            parseDate(entry)
+        }
+        when (entry.entryType) {
+            CGMSHistoryEntryType.SensorPacket      -> decodeSensorPacket(entry)
+            CGMSHistoryEntryType.SensorError       -> decodeSensorError(entry)
+            CGMSHistoryEntryType.SensorDataLow     -> decodeDataHighLow(entry, 40)
+            CGMSHistoryEntryType.SensorDataHigh    -> decodeDataHighLow(entry, 400)
+            CGMSHistoryEntryType.SensorTimestamp   -> decodeSensorTimestamp(entry)
+            CGMSHistoryEntryType.SensorCal         -> decodeSensorCal(entry)
+            CGMSHistoryEntryType.SensorCalFactor   -> decodeSensorCalFactor(entry)
+            CGMSHistoryEntryType.SensorSync        -> decodeSensorSync(entry)
+            CGMSHistoryEntryType.SensorStatus      -> decodeSensorStatus(entry)
+            CGMSHistoryEntryType.CalBGForGH        -> decodeCalBGForGH(entry)
+            CGMSHistoryEntryType.GlucoseSensorData -> decodeGlucoseSensorData(entry)
+
+            CGMSHistoryEntryType.BatteryChange,
+            CGMSHistoryEntryType.Something10,
+            CGMSHistoryEntryType.DateTimeChange    -> {
+            }
+
+            CGMSHistoryEntryType.Something19,
+            CGMSHistoryEntryType.DataEnd,
+            CGMSHistoryEntryType.SensorWeakSignal  -> {
+            }
+
+            CGMSHistoryEntryType.UnknownOpCode,
+            CGMSHistoryEntryType.None              -> {
+            }
+        }
+        return RecordDecodeStatus.NotSupported
+    }
+
+    override fun postProcess() {}
+
+    override fun createRecords(dataClearInput: MutableList<Byte>): MutableList<CGMSHistoryEntry> {
+        dataClearInput.reverse()
+        val dataClear = dataClearInput //reverseList(dataClearInput, Byte::class.java)
+        prepareStatistics()
+        var counter = 0
+        val outList: MutableList<CGMSHistoryEntry> = mutableListOf()
+
+        // create CGMS entries (without dates)
+        do {
+            val opCode = getUnsignedInt(dataClear[counter])
+            counter++
+            var entryType: CGMSHistoryEntryType?
+            if (opCode == 0) {
+                // continue;
+            } else if (opCode > 0 && opCode < 20) {
+                entryType = getByCode(opCode)
+                if (entryType === CGMSHistoryEntryType.None) {
+                    unknownOpCodes[opCode] = opCode
+                    aapsLogger.warn(LTag.PUMPCOMM, "GlucoseHistoryEntry with unknown code: $opCode")
+                    val pe = CGMSHistoryEntry()
+                    pe.setEntryType(CGMSHistoryEntryType.None)
+                    pe.opCode = opCode.toByte()
+                    pe.setData(Arrays.asList(opCode.toByte()), false)
+                    outList.add(pe)
+                } else {
+                    // System.out.println("OpCode: " + opCode);
+                    val listRawData: MutableList<Byte> = ArrayList()
+                    listRawData.add(opCode.toByte())
+                    for (j in 0 until entryType.totalLength - 1) {
+                        listRawData.add(dataClear[counter])
+                        counter++
+                    }
+                    val pe = CGMSHistoryEntry()
+                    pe.setEntryType(entryType)
+                    pe.opCode = opCode.toByte()
+                    pe.setData(listRawData, false)
+
+                    // System.out.println("Record: " + pe);
+                    outList.add(pe)
+                }
+            } else {
+                val pe = CGMSHistoryEntry()
+                pe.setEntryType(CGMSHistoryEntryType.GlucoseSensorData)
+                pe.setData(Arrays.asList(opCode.toByte()), false)
+                outList.add(pe)
+            }
+        } while (counter < dataClear.size)
+        outList.reverse()
+        val reversedOutList = outList  // reverseList(outList, CGMSHistoryEntry::class.java)
+        //var timeStamp: Long? = null
+        var dateTime: LocalDateTime? = null
+        var getIndex = 0
+        for (entry in reversedOutList) {
+            decodeRecord(entry)
+            if (entry.hasTimeStamp()) {
+                //timeStamp = entry.atechDateTime
+                dateTime = DateTimeUtil.toLocalDateTime(entry.atechDateTime)
+                getIndex = 0
+            } else if (entry.entryType == CGMSHistoryEntryType.GlucoseSensorData) {
+                getIndex++
+                if (dateTime != null) entry.setDateTime(dateTime, getIndex)
+            } else {
+                if (dateTime != null) entry.setDateTime(dateTime, getIndex)
+            }
+            aapsLogger.debug(LTag.PUMPCOMM, "Record: {}", entry)
+        }
+        return reversedOutList
+    }
+
+    // private fun <E> reverseList(dataClearInput: List<E>, clazz: Class<E>): List<E> {
+    //     val outList: MutableList<E> = ArrayList()
+    //     for (i in dataClearInput.size - 1 downTo 1) {
+    //         outList.add(dataClearInput[i])
+    //     }
+    //     return outList
+    // }
+
+    private fun parseMinutes(one: Int): Int {
+        return one and "0111111".toInt(2)
+    }
+
+    private fun parseHours(one: Int): Int {
+        return one and 0x1F
+    }
+
+    private fun parseDay(one: Int): Int {
+        return one and 0x1F
+    }
+
+    private fun parseMonths(first_byte: Int, second_byte: Int): Int {
+        val first_two_bits = first_byte shr 6
+        val second_two_bits = second_byte shr 6
+        return (first_two_bits shl 2) + second_two_bits
+    }
+
+    private fun parseYear(year: Int): Int {
+        return (year and 0x0F) + 2000
+    }
+
+    private fun parseDate(entry: CGMSHistoryEntry): Long? {
+        if (!entry.entryType.hasDate()) return null
+        val data = entry.datetime
+        return if (entry.entryType.dateType === CGMSHistoryEntryType.DateType.MinuteSpecific) {
+            val atechDateTime = DateTimeUtil.toATechDate(parseYear(data[3].toInt()), parseMonths(data[0].toInt(), data[1].toInt()),
+                parseDay(data[2].toInt()), parseHours(data[0].toInt()), parseMinutes(data[1].toInt()), 0)
+            entry.atechDateTime = atechDateTime
+            atechDateTime
+        } else if (entry.entryType.dateType === CGMSHistoryEntryType.DateType.SecondSpecific) {
+            aapsLogger.warn(LTag.PUMPCOMM, "parseDate for SecondSpecific type is not implemented.")
+            throw RuntimeException()
+            // return null;
+        } else null
+    }
+
+    private fun decodeGlucoseSensorData(entry: CGMSHistoryEntry) {
+        val sgv = entry.getUnsignedRawDataByIndex(0) * 2
+        entry.addDecodedData("sgv", sgv)
+    }
+
+    private fun decodeCalBGForGH(entry: CGMSHistoryEntry) {
+        val amount: Int = entry.getRawDataByIndex(3) and 32 shl 3 or entry.getRawDataByIndexInt(5)
+        //
+        val originType: String
+        originType = when (entry.getRawDataByIndexInt(3) shr 5 and 3) {
+            0x00 -> "rf"
+            else -> "unknown"
+        }
+        entry.addDecodedData("amount", amount)
+        entry.addDecodedData("originType", originType)
+    }
+
+    private fun decodeSensorSync(entry: CGMSHistoryEntry) {
+        val syncType: String
+        syncType = when (entry.getRawDataByIndexInt(3) shr 5 and 3) {
+            0x01 -> "new"
+            0x02 -> "old"
+            else -> "find"
+        }
+        entry.addDecodedData("syncType", syncType)
+    }
+
+    private fun decodeSensorStatus(entry: CGMSHistoryEntry) {
+        val statusType: String
+        statusType = when (entry.getRawDataByIndexInt(3) shr 5 and 3) {
+            0x00 -> "off"
+            0x01 -> "on"
+            0x02 -> "lost"
+            else -> "unknown"
+        }
+        entry.addDecodedData("statusType", statusType)
+    }
+
+    private fun decodeSensorCalFactor(entry: CGMSHistoryEntry) {
+        val factor: Double = (entry.getRawDataByIndexInt(5) shl 8 or entry.getRawDataByIndexInt(6)) / 1000.0
+        entry.addDecodedData("factor", factor)
+    }
+
+    private fun decodeSensorCal(entry: CGMSHistoryEntry) {
+        val calibrationType: String
+        calibrationType = when (entry.getRawDataByIndexInt(1)) {
+            0x00 -> "meter_bg_now"
+            0x01 -> "waiting"
+            0x02 -> "cal_error"
+            else -> "unknown"
+        }
+        entry.addDecodedData("calibrationType", calibrationType)
+    }
+
+    private fun decodeSensorTimestamp(entry: CGMSHistoryEntry) {
+        val sensorTimestampType: String
+        sensorTimestampType = when (entry.getRawDataByIndex(3).toInt() shr 5 and 3) {
+            0x00 -> "LastRf"
+            0x01 -> "PageEnd"
+            0x02 -> "Gap"
+            else -> "Unknown"
+        }
+        entry.addDecodedData("sensorTimestampType", sensorTimestampType)
+    }
+
+    private fun decodeSensorPacket(entry: CGMSHistoryEntry) {
+        val packetType: String
+        packetType = when (entry.getRawDataByIndex(1)) {
+            0x02.toByte() -> "init"
+            else          -> "unknown"
+        }
+        entry.addDecodedData("packetType", packetType)
+    }
+
+    private fun decodeSensorError(entry: CGMSHistoryEntry) {
+        val errorType: String
+        errorType = when (entry.getRawDataByIndexInt(1)) {
+            0x01 -> "end"
+            else -> "unknown"
+        }
+        entry.addDecodedData("errorType", errorType)
+    }
+
+    private fun decodeDataHighLow(entry: CGMSHistoryEntry, sgv: Int) {
+        entry.addDecodedData("sgv", sgv)
+    }
+
+    override fun runPostDecodeTasks() {
+        showStatistics()
+    }
+
+}
\ No newline at end of file
diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/pump/MedtronicPumpHistoryDecoder.java b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/pump/MedtronicPumpHistoryDecoder.java
deleted file mode 100644
index b8d57edb7c..0000000000
--- a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/pump/MedtronicPumpHistoryDecoder.java
+++ /dev/null
@@ -1,724 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.medtronic.comm.history.pump;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Locale;
-
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
-import info.nightscout.androidaps.logging.AAPSLogger;
-import info.nightscout.androidaps.logging.LTag;
-import info.nightscout.androidaps.plugins.pump.common.utils.ByteUtil;
-import info.nightscout.androidaps.plugins.pump.common.utils.DateTimeUtil;
-import info.nightscout.androidaps.plugins.pump.medtronic.comm.history.MedtronicHistoryDecoder;
-import info.nightscout.androidaps.plugins.pump.medtronic.comm.history.RecordDecodeStatus;
-import info.nightscout.androidaps.plugins.pump.medtronic.data.dto.BasalProfile;
-import info.nightscout.androidaps.plugins.pump.medtronic.data.dto.BolusDTO;
-import info.nightscout.androidaps.plugins.pump.medtronic.data.dto.BolusWizardDTO;
-import info.nightscout.androidaps.plugins.pump.medtronic.data.dto.DailyTotalsDTO;
-import info.nightscout.androidaps.plugins.pump.medtronic.data.dto.TempBasalPair;
-import info.nightscout.androidaps.plugins.pump.medtronic.defs.MedtronicDeviceType;
-import info.nightscout.androidaps.plugins.pump.medtronic.defs.PumpBolusType;
-import info.nightscout.androidaps.plugins.pump.medtronic.util.MedtronicUtil;
-
-/**
- * This file was taken from GGC - GNU Gluco Control (ggc.sourceforge.net), application for diabetes
- * management and modified/extended for AAPS.
- * <p>
- * Author: Andy {andy.rozman@gmail.com}
- */
-
-@Singleton
-public class MedtronicPumpHistoryDecoder extends MedtronicHistoryDecoder<PumpHistoryEntry> {
-
-    private PumpHistoryEntry tbrPreviousRecord;
-    private PumpHistoryEntry changeTimeRecord;
-
-    @Inject
-    public MedtronicPumpHistoryDecoder(
-            AAPSLogger aapsLogger,
-            MedtronicUtil medtronicUtil
-    ) {
-        super.aapsLogger = aapsLogger;
-        this.medtronicUtil = medtronicUtil;
-    }
-
-
-    public List<PumpHistoryEntry> createRecords(List<Byte> dataClear) {
-        prepareStatistics();
-
-        int counter = 0;
-        int record = 0;
-        boolean incompletePacket;
-
-        List<PumpHistoryEntry> outList = new ArrayList<>();
-        String skipped = null;
-
-        if (dataClear.size() == 0) {
-            aapsLogger.error(LTag.PUMPBTCOMM, "Empty page.");
-            return outList;
-        }
-
-        do {
-            int opCode = dataClear.get(counter);
-            boolean special = false;
-            incompletePacket = false;
-            boolean skippedRecords = false;
-
-            if (opCode == 0) {
-                counter++;
-                if (skipped == null)
-                    skipped = "0x00";
-                else
-                    skipped += " 0x00";
-                continue;
-            } else {
-                if (skipped != null) {
-                    aapsLogger.warn(LTag.PUMPBTCOMM, " ... Skipped " + skipped);
-                    skipped = null;
-                    skippedRecords = true;
-                }
-            }
-
-            if (skippedRecords) {
-                aapsLogger.error(LTag.PUMPBTCOMM, "We had some skipped bytes, which might indicate error in pump history. Please report this problem.");
-            }
-
-            PumpHistoryEntryType entryType = PumpHistoryEntryType.getByCode(opCode);
-
-            PumpHistoryEntry pe = new PumpHistoryEntry();
-            pe.setEntryType(medtronicUtil.getMedtronicPumpModel(), entryType);
-            pe.setOffset(counter);
-
-            counter++;
-
-            if (counter >= 1022) {
-                break;
-            }
-
-            List<Byte> listRawData = new ArrayList<>();
-            listRawData.add((byte) opCode);
-
-            if (entryType == PumpHistoryEntryType.UnabsorbedInsulin
-                    || entryType == PumpHistoryEntryType.UnabsorbedInsulin512) {
-                int elements = dataClear.get(counter);
-                listRawData.add((byte) elements);
-                counter++;
-
-                int els = getUnsignedInt(elements);
-
-                for (int k = 0; k < (els - 2); k++) {
-                    if (counter < 1022) {
-                        listRawData.add(dataClear.get(counter));
-                        counter++;
-                    }
-                }
-
-                special = true;
-            } else {
-
-                for (int j = 0; j < (entryType.getTotalLength(medtronicUtil.getMedtronicPumpModel()) - 1); j++) {
-
-                    try {
-                        listRawData.add(dataClear.get(counter));
-                        counter++;
-                    } catch (Exception ex) {
-                        aapsLogger.error(LTag.PUMPBTCOMM, "OpCode: " + ByteUtil.shortHexString((byte) opCode) + ", Invalid package: "
-                                + ByteUtil.getHex(listRawData));
-                        // throw ex;
-                        incompletePacket = true;
-                        break;
-                    }
-
-                }
-
-                if (incompletePacket)
-                    break;
-
-            }
-
-            if (entryType == PumpHistoryEntryType.None) {
-                aapsLogger.error(LTag.PUMPBTCOMM, "Error in code. We should have not come into this branch.");
-            } else {
-
-                if (pe.getEntryType() == PumpHistoryEntryType.UnknownBasePacket) {
-                    pe.setOpCode(opCode);
-                }
-
-                if (entryType.getHeadLength(medtronicUtil.getMedtronicPumpModel()) == 0)
-                    special = true;
-
-                pe.setData(listRawData, special);
-
-                RecordDecodeStatus decoded = decodeRecord(pe);
-
-                if ((decoded == RecordDecodeStatus.OK) || (decoded == RecordDecodeStatus.Ignored)) {
-                    //Log.i(TAG, "#" + record + " " + decoded.getDescription() + " " + pe);
-                } else {
-                    aapsLogger.warn(LTag.PUMPBTCOMM, "#" + record + " " + decoded.getDescription() + "  " + pe);
-                }
-
-                addToStatistics(pe, decoded, null);
-
-                record++;
-
-                if (decoded == RecordDecodeStatus.OK) // we add only OK records, all others are ignored
-                {
-                    outList.add(pe);
-                }
-            }
-
-        } while (counter < dataClear.size());
-
-        return outList;
-    }
-
-
-    public RecordDecodeStatus decodeRecord(PumpHistoryEntry record) {
-        try {
-            return decodeRecord(record, false);
-        } catch (Exception ex) {
-            aapsLogger.error(LTag.PUMPBTCOMM, String.format(Locale.ENGLISH, "     Error decoding: type=%s, ex=%s", record.getEntryType().name(), ex.getMessage(), ex));
-            return RecordDecodeStatus.Error;
-        }
-    }
-
-
-    private RecordDecodeStatus decodeRecord(PumpHistoryEntry entry, boolean x) {
-
-        if (entry.getDateTimeLength() > 0) {
-            decodeDateTime(entry);
-        }
-
-        switch (entry.getEntryType()) {
-
-            // Valid entries, but not processed
-            case ChangeBasalPattern:
-            case CalBGForPH:
-            case ChangeRemoteId:
-            case ClearAlarm:
-            case ChangeAlarmNotifyMode: // ChangeUtility:
-            case EnableDisableRemote:
-            case BGReceived: // Ian3F: CGMS
-            case SensorAlert: // Ian08 CGMS
-            case ChangeTimeFormat:
-            case ChangeReservoirWarningTime:
-            case ChangeBolusReminderEnable:
-            case SetBolusReminderTime:
-            case ChangeChildBlockEnable:
-            case BolusWizardEnabled:
-            case ChangeBGReminderOffset:
-            case ChangeAlarmClockTime:
-            case ChangeMeterId:
-            case ChangeParadigmID:
-            case JournalEntryMealMarker:
-            case JournalEntryExerciseMarker:
-            case DeleteBolusReminderTime:
-            case SetAutoOff:
-            case SelfTest:
-            case JournalEntryInsulinMarker:
-            case JournalEntryOtherMarker:
-            case BolusWizardSetup512:
-            case ChangeSensorSetup2:
-            case ChangeSensorAlarmSilenceConfig:
-            case ChangeSensorRateOfChangeAlertSetup:
-            case ChangeBolusScrollStepSize:
-            case BolusWizardSetup:
-            case ChangeVariableBolus:
-            case ChangeAudioBolus:
-            case ChangeBGReminderEnable:
-            case ChangeAlarmClockEnable:
-            case BolusReminder:
-            case DeleteAlarmClockTime:
-            case ChangeCarbUnits:
-            case ChangeWatchdogEnable:
-            case ChangeOtherDeviceID:
-            case ReadOtherDevicesIDs:
-            case BGReceived512:
-            case SensorStatus:
-            case ReadCaptureEventEnabled:
-            case ChangeCaptureEventEnable:
-            case ReadOtherDevicesStatus:
-                return RecordDecodeStatus.OK;
-
-            case Sensor_0x54:
-            case Sensor_0x55:
-            case Sensor_0x51:
-            case Sensor_0x52:
-//            case EventUnknown_MM522_0x45:
-//            case EventUnknown_MM522_0x46:
-//            case EventUnknown_MM522_0x47:
-//            case EventUnknown_MM522_0x48:
-//            case EventUnknown_MM522_0x49:
-//            case EventUnknown_MM522_0x4a:
-//            case EventUnknown_MM522_0x4b:
-//            case EventUnknown_MM522_0x4c:
-//            case EventUnknown_MM512_0x10:
-            case EventUnknown_MM512_0x2e:
-//            case EventUnknown_MM512_0x37:
-//            case EventUnknown_MM512_0x38:
-//            case EventUnknown_MM512_0x4e:
-//            case EventUnknown_MM522_0x70:
-//            case EventUnknown_MM512_0x88:
-//            case EventUnknown_MM512_0x94:
-//            case EventUnknown_MM522_0xE8:
-//            case EventUnknown_0x4d:
-//            case EventUnknown_MM522_0x25:
-//            case EventUnknown_MM522_0x05:
-                aapsLogger.debug(LTag.PUMPBTCOMM, " -- ignored Unknown Pump Entry: " + entry);
-                return RecordDecodeStatus.Ignored;
-
-            case UnabsorbedInsulin:
-            case UnabsorbedInsulin512:
-                return RecordDecodeStatus.Ignored;
-
-            // **** Implemented records ****
-
-            case DailyTotals522:
-            case DailyTotals523:
-            case DailyTotals515:
-            case EndResultTotals:
-                return decodeDailyTotals(entry);
-
-            case ChangeBasalProfile_OldProfile:
-            case ChangeBasalProfile_NewProfile:
-                return decodeBasalProfile(entry);
-
-            case BasalProfileStart:
-                return decodeBasalProfileStart(entry);
-
-            case ChangeTime:
-                changeTimeRecord = entry;
-                return RecordDecodeStatus.OK;
-
-            case NewTimeSet:
-                decodeChangeTime(entry);
-                return RecordDecodeStatus.OK;
-
-            case TempBasalDuration:
-                // decodeTempBasal(entry);
-                return RecordDecodeStatus.OK;
-
-            case TempBasalRate:
-                // decodeTempBasal(entry);
-                return RecordDecodeStatus.OK;
-
-            case Bolus:
-                decodeBolus(entry);
-                return RecordDecodeStatus.OK;
-
-            case BatteryChange:
-                decodeBatteryActivity(entry);
-                return RecordDecodeStatus.OK;
-
-            case LowReservoir:
-                decodeLowReservoir(entry);
-                return RecordDecodeStatus.OK;
-
-            case LowBattery:
-            case SuspendPump:
-            case ResumePump:
-            case Rewind:
-            case NoDeliveryAlarm:
-            case ChangeTempBasalType:
-            case ChangeMaxBolus:
-            case ChangeMaxBasal:
-            case ClearSettings:
-            case SaveSettings:
-                return RecordDecodeStatus.OK;
-
-            case BolusWizard:
-                return decodeBolusWizard(entry);
-
-            case BolusWizard512:
-                return decodeBolusWizard512(entry);
-
-            case Prime:
-                decodePrime(entry);
-                return RecordDecodeStatus.OK;
-
-            case TempBasalCombined:
-                return RecordDecodeStatus.Ignored;
-
-            case None:
-            case UnknownBasePacket:
-                return RecordDecodeStatus.Error;
-
-            default: {
-                aapsLogger.debug(LTag.PUMPBTCOMM, "Not supported: " + entry.getEntryType());
-                return RecordDecodeStatus.NotSupported;
-            }
-
-        }
-
-        // return RecordDecodeStatus.Error;
-
-    }
-
-
-    private RecordDecodeStatus decodeDailyTotals(PumpHistoryEntry entry) {
-
-        entry.addDecodedData("Raw Data", ByteUtil.getHex(entry.getRawData()));
-
-        DailyTotalsDTO totals = new DailyTotalsDTO(entry);
-
-        entry.addDecodedData("Object", totals);
-
-        return RecordDecodeStatus.OK;
-    }
-
-
-    private RecordDecodeStatus decodeBasalProfile(PumpHistoryEntry entry) {
-
-        // LOG.debug("decodeBasalProfile: {}", entry);
-
-        BasalProfile basalProfile = new BasalProfile(aapsLogger);
-        basalProfile.setRawDataFromHistory(entry.getBody());
-
-        // LOG.debug("decodeBasalProfile BasalProfile: {}", basalProfile);
-
-        entry.addDecodedData("Object", basalProfile);
-
-        return RecordDecodeStatus.OK;
-    }
-
-
-    private void decodeChangeTime(PumpHistoryEntry entry) {
-        if (changeTimeRecord == null)
-            return;
-
-        entry.setDisplayableValue(entry.getDateTimeString());
-
-        this.changeTimeRecord = null;
-    }
-
-
-    private void decodeBatteryActivity(PumpHistoryEntry entry) {
-        // this.writeData(PumpBaseType.Event, entry.getHead()[0] == 0 ? PumpEventType.BatteryRemoved :
-        // PumpEventType.BatteryReplaced, entry.getATechDate());
-
-        entry.setDisplayableValue(entry.getHead()[0] == 0 ? "Battery Removed" : "Battery Replaced");
-    }
-
-
-    private static String getFormattedValue(float value, int decimals) {
-        return String.format(Locale.ENGLISH, "%." + decimals + "f", value);
-    }
-
-
-    private RecordDecodeStatus decodeBasalProfileStart(PumpHistoryEntry entry) {
-        byte[] body = entry.getBody();
-        // int bodyOffset = headerSize + timestampSize;
-        int offset = body[0] * 1000 * 30 * 60;
-        Float rate = null;
-        int index = entry.getHead()[0];
-
-        if (MedtronicDeviceType.isSameDevice(medtronicUtil.getMedtronicPumpModel(), MedtronicDeviceType.Medtronic_523andHigher)) {
-            rate = body[1] * 0.025f;
-        }
-
-        //LOG.info("Basal Profile Start: offset={}, rate={}, index={}, body_raw={}", offset, rate, index, body);
-
-        if (rate == null) {
-            aapsLogger.warn(LTag.PUMPBTCOMM, String.format(Locale.ENGLISH, "Basal Profile Start (ERROR): offset=%d, rate=%.3f, index=%d, body_raw=%s", offset, rate, index, ByteUtil.getHex(body)));
-            return RecordDecodeStatus.Error;
-        } else {
-            entry.addDecodedData("Value", getFormattedFloat(rate, 3));
-            entry.setDisplayableValue(getFormattedFloat(rate, 3));
-            return RecordDecodeStatus.OK;
-        }
-
-    }
-
-
-    private RecordDecodeStatus decodeBolusWizard(PumpHistoryEntry entry) {
-        byte[] body = entry.getBody();
-
-        BolusWizardDTO dto = new BolusWizardDTO();
-
-        float bolusStrokes = 10.0f;
-
-        if (MedtronicDeviceType.isSameDevice(medtronicUtil.getMedtronicPumpModel(), MedtronicDeviceType.Medtronic_523andHigher)) {
-            // https://github.com/ps2/minimed_rf/blob/master/lib/minimed_rf/log_entries/bolus_wizard.rb#L102
-            bolusStrokes = 40.0f;
-
-            dto.carbs = ((body[1] & 0x0c) << 6) + body[0];
-
-            dto.bloodGlucose = ((body[1] & 0x03) << 8) + entry.getHead()[0];
-            dto.carbRatio = body[1] / 10.0f;
-            // carb_ratio (?) = (((self.body[2] & 0x07) << 8) + self.body[3]) /
-            // 10.0s
-            dto.insulinSensitivity = new Float(body[4]);
-            dto.bgTargetLow = (int) body[5];
-            dto.bgTargetHigh = (int) body[14];
-            dto.correctionEstimate = (((body[9] & 0x38) << 5) + body[6]) / bolusStrokes;
-            dto.foodEstimate = ((body[7] << 8) + body[8]) / bolusStrokes;
-            dto.unabsorbedInsulin = ((body[10] << 8) + body[11]) / bolusStrokes;
-            dto.bolusTotal = ((body[12] << 8) + body[13]) / bolusStrokes;
-        } else {
-            dto.bloodGlucose = (((body[1] & 0x0F) << 8) | entry.getHead()[0]);
-            dto.carbs = (int) body[0];
-            dto.carbRatio = Float.valueOf(body[2]);
-            dto.insulinSensitivity = new Float(body[3]);
-            dto.bgTargetLow = (int) body[4];
-            dto.bgTargetHigh = (int) body[12];
-            dto.bolusTotal = body[11] / bolusStrokes;
-            dto.foodEstimate = body[6] / bolusStrokes;
-            dto.unabsorbedInsulin = body[9] / bolusStrokes;
-            dto.bolusTotal = body[11] / bolusStrokes;
-            dto.correctionEstimate = (body[7] + (body[5] & 0x0F)) / bolusStrokes;
-        }
-
-        if (dto.bloodGlucose != null && dto.bloodGlucose < 0) {
-            dto.bloodGlucose = ByteUtil.convertUnsignedByteToInt(dto.bloodGlucose.byteValue());
-        }
-
-        dto.atechDateTime = entry.atechDateTime;
-        entry.addDecodedData("Object", dto);
-        entry.setDisplayableValue(dto.getDisplayableValue());
-
-        return RecordDecodeStatus.OK;
-    }
-
-
-    private RecordDecodeStatus decodeBolusWizard512(PumpHistoryEntry entry) {
-        byte[] body = entry.getBody();
-
-        BolusWizardDTO dto = new BolusWizardDTO();
-
-        float bolusStrokes = 10.0f;
-
-        dto.bloodGlucose = ((body[1] & 0x03 << 8) | entry.getHead()[0]);
-        dto.carbs = (body[1] & 0xC) << 6 | body[0]; // (int)body[0];
-        dto.carbRatio = Float.valueOf(body[2]);
-        dto.insulinSensitivity = new Float(body[3]);
-        dto.bgTargetLow = (int) body[4];
-        dto.foodEstimate = body[6] / 10.0f;
-        dto.correctionEstimate = (body[7] + (body[5] & 0x0F)) / bolusStrokes;
-        dto.unabsorbedInsulin = body[9] / bolusStrokes;
-        dto.bolusTotal = body[11] / bolusStrokes;
-        dto.bgTargetHigh = dto.bgTargetLow;
-
-        if (dto.bloodGlucose != null && dto.bloodGlucose < 0) {
-            dto.bloodGlucose = ByteUtil.convertUnsignedByteToInt(dto.bloodGlucose.byteValue());
-        }
-
-        dto.atechDateTime = entry.atechDateTime;
-        entry.addDecodedData("Object", dto);
-        entry.setDisplayableValue(dto.getDisplayableValue());
-
-        return RecordDecodeStatus.OK;
-    }
-
-
-    private void decodeLowReservoir(PumpHistoryEntry entry) {
-        float amount = (getUnsignedInt(entry.getHead()[0]) * 1.0f / 10.0f) * 2;
-
-        entry.setDisplayableValue(getFormattedValue(amount, 1));
-    }
-
-
-    private void decodePrime(PumpHistoryEntry entry) {
-        float amount = ByteUtil.toInt(entry.getHead()[2], entry.getHead()[3]) / 10.0f;
-        float fixed = ByteUtil.toInt(entry.getHead()[0], entry.getHead()[1]) / 10.0f;
-
-//        amount = (double)(asUINT8(data[4]) << 2) / 40.0;
-//        programmedAmount = (double)(asUINT8(data[2]) << 2) / 40.0;
-//        primeType = programmedAmount == 0 ? "manual" : "fixed";
-
-        entry.addDecodedData("Amount", amount);
-        entry.addDecodedData("FixedAmount", fixed);
-
-        entry.setDisplayableValue("Amount=" + getFormattedValue(amount, 2) + ", Fixed Amount="
-                + getFormattedValue(fixed, 2));
-    }
-
-
-    private void decodeChangeTempBasalType(PumpHistoryEntry entry) {
-        entry.addDecodedData("isPercent", ByteUtil.asUINT8(entry.getRawDataByIndex(0)) == 1); // index moved from 1 -> 0
-    }
-
-
-    private void decodeBgReceived(PumpHistoryEntry entry) {
-        entry.addDecodedData("amount", (ByteUtil.asUINT8(entry.getRawDataByIndex(0)) << 3) + (ByteUtil.asUINT8(entry.getRawDataByIndex(3)) >> 5));
-        entry.addDecodedData("meter", ByteUtil.substring(entry.getRawData(), 6, 3)); // index moved from 1 -> 0
-    }
-
-
-    private void decodeCalBGForPH(PumpHistoryEntry entry) {
-        entry.addDecodedData("amount", ((ByteUtil.asUINT8(entry.getRawDataByIndex(5)) & 0x80) << 1) + ByteUtil.asUINT8(entry.getRawDataByIndex(0))); // index moved from 1 -> 0
-    }
-
-
-    private void decodeNoDeliveryAlarm(PumpHistoryEntry entry) {
-        //rawtype = asUINT8(data[1]);
-        // not sure if this is actually NoDelivery Alarm?
-    }
-
-
-    @Override
-    public void postProcess() {
-    }
-
-
-    @Override
-    protected void runPostDecodeTasks() {
-        this.showStatistics();
-    }
-
-
-    private void decodeBolus(PumpHistoryEntry entry) {
-        BolusDTO bolus = new BolusDTO();
-
-        byte[] data = entry.getHead();
-
-        if (MedtronicDeviceType.isSameDevice(medtronicUtil.getMedtronicPumpModel(), MedtronicDeviceType.Medtronic_523andHigher)) {
-            bolus.setRequestedAmount(ByteUtil.toInt(data[0], data[1]) / 40.0d);
-            bolus.setDeliveredAmount(ByteUtil.toInt(data[2], data[3]) / 40.0d);
-            bolus.setInsulinOnBoard(ByteUtil.toInt(data[4], data[5]) / 40.0d);
-            bolus.setDuration(data[6] * 30);
-        } else {
-            bolus.setRequestedAmount(ByteUtil.asUINT8(data[0]) / 10.0d);
-            bolus.setDeliveredAmount(ByteUtil.asUINT8(data[1]) / 10.0d);
-            bolus.setDuration(ByteUtil.asUINT8(data[2]) * 30);
-        }
-
-        bolus.setBolusType((bolus.getDuration() != null && (bolus.getDuration() > 0)) ? PumpBolusType.Extended
-                : PumpBolusType.Normal);
-        bolus.setAtechDateTime(entry.atechDateTime);
-
-        entry.addDecodedData("Object", bolus);
-        entry.setDisplayableValue(bolus.getDisplayableValue());
-
-    }
-
-
-    private void decodeTempBasal(PumpHistoryEntry entry) {
-
-        if (this.tbrPreviousRecord == null) {
-            // LOG.debug(this.tbrPreviousRecord.toString());
-            this.tbrPreviousRecord = entry;
-            return;
-        }
-
-        decodeTempBasal(this.tbrPreviousRecord, entry);
-
-        tbrPreviousRecord = null;
-    }
-
-
-    public void decodeTempBasal(PumpHistoryEntry tbrPreviousRecord, PumpHistoryEntry entry) {
-
-        PumpHistoryEntry tbrRate = null, tbrDuration = null;
-
-        if (entry.getEntryType() == PumpHistoryEntryType.TempBasalRate) {
-            tbrRate = entry;
-        } else {
-            tbrDuration = entry;
-        }
-
-        if (tbrRate != null) {
-            tbrDuration = tbrPreviousRecord;
-        } else {
-            tbrRate = tbrPreviousRecord;
-        }
-
-//        TempBasalPair tbr = new TempBasalPair(
-//                tbrRate.getHead()[0],
-//                tbrDuration.getHead()[0],
-//                (ByteUtil.asUINT8(tbrRate.getDatetime()[4]) >> 3) == 0);
-
-        TempBasalPair tbr = new TempBasalPair(
-                tbrRate.getHead()[0],
-                tbrRate.getBody()[0],
-                tbrDuration.getHead()[0],
-                (ByteUtil.asUINT8(tbrRate.getDatetime()[4]) >> 3) == 0);
-
-        // System.out.println("TBR: amount=" + tbr.getInsulinRate() + ", duration=" + tbr.getDurationMinutes()
-        // // + " min. Packed: " + tbr.getValue()
-        // );
-
-        entry.addDecodedData("Object", tbr);
-        entry.setDisplayableValue(tbr.getDescription());
-
-    }
-
-
-    private void decodeDateTime(PumpHistoryEntry entry) {
-        byte[] dt = entry.getDatetime();
-
-        if (dt == null) {
-            aapsLogger.warn(LTag.PUMPBTCOMM, "DateTime not set.");
-        }
-
-        if (entry.getDateTimeLength() == 5) {
-
-            int seconds = dt[0] & 0x3F;
-            int minutes = dt[1] & 0x3F;
-            int hour = dt[2] & 0x1F;
-
-            int month = ((dt[0] >> 4) & 0x0c) + ((dt[1] >> 6) & 0x03);
-            // ((dt[0] & 0xC0) >> 6) | ((dt[1] & 0xC0) >> 4);
-
-            int dayOfMonth = dt[3] & 0x1F;
-            int year = fix2DigitYear(dt[4] & 0x3F); // Assuming this is correct, need to verify. Otherwise this will be
-            // a problem in 2016.
-
-            entry.setAtechDateTime(DateTimeUtil.toATechDate(year, month, dayOfMonth, hour, minutes, seconds));
-
-        } else if (entry.getDateTimeLength() == 2) {
-            int low = ByteUtil.asUINT8(dt[0]) & 0x1F;
-            int mhigh = (ByteUtil.asUINT8(dt[0]) & 0xE0) >> 4;
-            int mlow = (ByteUtil.asUINT8(dt[1]) & 0x80) >> 7;
-            int month = mhigh + mlow;
-            // int dayOfMonth = low + 1;
-            int dayOfMonth = dt[0] & 0x1F;
-            int year = 2000 + (ByteUtil.asUINT8(dt[1]) & 0x7F);
-
-            int hour = 0;
-            int minutes = 0;
-            int seconds = 0;
-
-            //LOG.debug("DT: {} {} {}", year, month, dayOfMonth);
-
-            if (dayOfMonth == 32) {
-                aapsLogger.warn(LTag.PUMPBTCOMM, String.format(Locale.ENGLISH, "Entry: Day 32 %s = [%s] %s", entry.getEntryType().name(),
-                        ByteUtil.getHex(entry.getRawData()), entry));
-            }
-
-            if (isEndResults(entry.getEntryType())) {
-                hour = 23;
-                minutes = 59;
-                seconds = 59;
-            }
-
-            entry.setAtechDateTime(DateTimeUtil.toATechDate(year, month, dayOfMonth, hour, minutes, seconds));
-
-        } else {
-            aapsLogger.warn(LTag.PUMPBTCOMM, "Unknown datetime format: " + entry.getDateTimeLength());
-        }
-
-    }
-
-
-    private boolean isEndResults(PumpHistoryEntryType entryType) {
-
-        return (entryType == PumpHistoryEntryType.EndResultTotals ||
-                entryType == PumpHistoryEntryType.DailyTotals515 ||
-                entryType == PumpHistoryEntryType.DailyTotals522 ||
-                entryType == PumpHistoryEntryType.DailyTotals523);
-    }
-
-
-    private int fix2DigitYear(int year) {
-        if (year > 90) {
-            year += 1900;
-        } else {
-            year += 2000;
-        }
-
-        return year;
-    }
-
-}
diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/pump/MedtronicPumpHistoryDecoder.kt b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/pump/MedtronicPumpHistoryDecoder.kt
new file mode 100644
index 0000000000..3152c423da
--- /dev/null
+++ b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/pump/MedtronicPumpHistoryDecoder.kt
@@ -0,0 +1,534 @@
+package info.nightscout.androidaps.plugins.pump.medtronic.comm.history.pump
+
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.pump.common.utils.ByteUtil
+import info.nightscout.androidaps.plugins.pump.common.utils.DateTimeUtil
+import info.nightscout.androidaps.plugins.pump.medtronic.comm.history.MedtronicHistoryDecoder
+import info.nightscout.androidaps.plugins.pump.medtronic.comm.history.RecordDecodeStatus
+import info.nightscout.androidaps.plugins.pump.medtronic.comm.history.pump.PumpHistoryEntryType.Companion.getByCode
+import info.nightscout.androidaps.plugins.pump.medtronic.data.dto.BasalProfile
+import info.nightscout.androidaps.plugins.pump.medtronic.data.dto.BolusDTO
+import info.nightscout.androidaps.plugins.pump.medtronic.data.dto.BolusWizardDTO
+import info.nightscout.androidaps.plugins.pump.medtronic.data.dto.DailyTotalsDTO
+import info.nightscout.androidaps.plugins.pump.medtronic.data.dto.TempBasalPair
+import info.nightscout.androidaps.plugins.pump.medtronic.defs.MedtronicDeviceType
+import info.nightscout.androidaps.plugins.pump.medtronic.defs.PumpBolusType
+import info.nightscout.androidaps.plugins.pump.medtronic.util.MedtronicUtil
+import java.util.*
+import javax.inject.Inject
+import javax.inject.Singleton
+import kotlin.experimental.and
+
+/**
+ * This file was taken from GGC - GNU Gluco Control (ggc.sourceforge.net), application for diabetes
+ * management and modified/extended for AAPS.
+ *
+ *
+ * Author: Andy {andy.rozman@gmail.com}
+ */
+@Singleton
+class MedtronicPumpHistoryDecoder @Inject constructor(
+    aapsLogger: AAPSLogger,
+    medtronicUtil: MedtronicUtil,
+    bitUtils: ByteUtil
+) : MedtronicHistoryDecoder<PumpHistoryEntry>(aapsLogger, medtronicUtil, bitUtils) {
+
+    //private var tbrPreviousRecord: PumpHistoryEntry? = null
+    private var changeTimeRecord: PumpHistoryEntry? = null
+
+    override fun createRecords(dataClearInput: MutableList<Byte>): MutableList<PumpHistoryEntry> {
+        prepareStatistics()
+        var counter = 0
+        var record = 0
+        var incompletePacket: Boolean
+        val outList: MutableList<PumpHistoryEntry> = mutableListOf()
+        var skipped: String? = null
+        if (dataClearInput.size == 0) {
+            aapsLogger.error(LTag.PUMPBTCOMM, "Empty page.")
+            return outList
+        }
+        do {
+            val opCode: Int = dataClearInput[counter].toInt()
+            var special = false
+            incompletePacket = false
+            var skippedRecords = false
+            if (opCode == 0) {
+                counter++
+                if (skipped == null) skipped = "0x00" else skipped += " 0x00"
+                continue
+            } else {
+                if (skipped != null) {
+                    aapsLogger.warn(LTag.PUMPBTCOMM, " ... Skipped $skipped")
+                    skipped = null
+                    skippedRecords = true
+                }
+            }
+            if (skippedRecords) {
+                aapsLogger.error(LTag.PUMPBTCOMM, "We had some skipped bytes, which might indicate error in pump history. Please report this problem.")
+            }
+            val entryType = getByCode(opCode.toByte())
+            val pe = PumpHistoryEntry()
+            pe.setEntryType(medtronicUtil.medtronicPumpModel, entryType, if (entryType == PumpHistoryEntryType.UnknownBasePacket) opCode.toByte() else null)
+            pe.offset = counter
+            counter++
+            if (counter >= 1022) {
+                break
+            }
+            val listRawData: MutableList<Byte> = ArrayList()
+            listRawData.add(opCode.toByte())
+            if (entryType === PumpHistoryEntryType.UnabsorbedInsulin
+                || entryType === PumpHistoryEntryType.UnabsorbedInsulin512) {
+                val elements: Int = dataClearInput[counter].toInt()
+                listRawData.add(elements.toByte())
+                counter++
+                val els = getUnsignedInt(elements)
+                for (k in 0 until els - 2) {
+                    if (counter < 1022) {
+                        listRawData.add(dataClearInput[counter])
+                        counter++
+                    }
+                }
+                special = true
+            } else {
+                for (j in 0 until entryType.getTotalLength(medtronicUtil.medtronicPumpModel) - 1) {
+                    try {
+                        listRawData.add(dataClearInput[counter])
+                        counter++
+                    } catch (ex: Exception) {
+                        aapsLogger.error(LTag.PUMPBTCOMM, "OpCode: " + ByteUtil.shortHexString(opCode.toByte()) + ", Invalid package: "
+                            + ByteUtil.getHex(listRawData))
+                        // throw ex;
+                        incompletePacket = true
+                        break
+                    }
+                }
+                if (incompletePacket) break
+            }
+            if (entryType === PumpHistoryEntryType.None) {
+                aapsLogger.error(LTag.PUMPBTCOMM, "Error in code. We should have not come into this branch.")
+            } else {
+                if (pe.entryType === PumpHistoryEntryType.UnknownBasePacket) {
+                    pe.opCode = opCode.toByte()
+                }
+                if (entryType.getHeadLength(medtronicUtil.medtronicPumpModel) == 0) special = true
+                pe.setData(listRawData, special)
+                val decoded = decodeRecord(pe)
+                if (decoded === RecordDecodeStatus.OK || decoded === RecordDecodeStatus.Ignored) {
+                    //Log.i(TAG, "#" + record + " " + decoded.getDescription() + " " + pe);
+                } else {
+                    aapsLogger.warn(LTag.PUMPBTCOMM, "#" + record + " " + decoded.description + "  " + pe)
+                }
+                addToStatistics(pe, decoded, null)
+                record++
+                if (decoded === RecordDecodeStatus.OK) // we add only OK records, all others are ignored
+                {
+                    outList.add(pe)
+                }
+            }
+        } while (counter < dataClearInput.size)
+        return outList
+    }
+
+    override fun decodeRecord(record: PumpHistoryEntry): RecordDecodeStatus {
+        return try {
+            decodeRecordInternal(record)
+        } catch (ex: Exception) {
+            aapsLogger.error(LTag.PUMPBTCOMM, String.format(Locale.ENGLISH, "     Error decoding: type=%s, ex=%s", record.entryType.name, ex.message, ex))
+            //ex.printStackTrace()
+            RecordDecodeStatus.Error
+        }
+    }
+
+    private fun decodeRecordInternal(entry: PumpHistoryEntry): RecordDecodeStatus {
+        if (entry.dateTimeLength > 0) {
+            decodeDateTime(entry)
+        }
+        return when (entry.entryType) {
+            PumpHistoryEntryType.ChangeBasalPattern,
+            PumpHistoryEntryType.CalBGForPH,
+            PumpHistoryEntryType.ChangeRemoteId,
+            PumpHistoryEntryType.ClearAlarm,
+            PumpHistoryEntryType.ChangeAlarmNotifyMode,
+            PumpHistoryEntryType.EnableDisableRemote,
+            PumpHistoryEntryType.BGReceived,
+            PumpHistoryEntryType.SensorAlert,
+            PumpHistoryEntryType.ChangeTimeFormat,
+            PumpHistoryEntryType.ChangeReservoirWarningTime,
+            PumpHistoryEntryType.ChangeBolusReminderEnable,
+            PumpHistoryEntryType.SetBolusReminderTime,
+            PumpHistoryEntryType.ChangeChildBlockEnable,
+            PumpHistoryEntryType.BolusWizardEnabled,
+            PumpHistoryEntryType.ChangeBGReminderOffset,
+            PumpHistoryEntryType.ChangeAlarmClockTime,
+            PumpHistoryEntryType.ChangeMeterId,
+            PumpHistoryEntryType.ChangeParadigmID,
+            PumpHistoryEntryType.JournalEntryMealMarker,
+            PumpHistoryEntryType.JournalEntryExerciseMarker,
+            PumpHistoryEntryType.DeleteBolusReminderTime,
+            PumpHistoryEntryType.SetAutoOff,
+            PumpHistoryEntryType.SelfTest,
+            PumpHistoryEntryType.JournalEntryInsulinMarker,
+            PumpHistoryEntryType.JournalEntryOtherMarker,
+            PumpHistoryEntryType.BolusWizardSetup512,
+            PumpHistoryEntryType.ChangeSensorSetup2,
+            PumpHistoryEntryType.ChangeSensorAlarmSilenceConfig,
+            PumpHistoryEntryType.ChangeSensorRateOfChangeAlertSetup,
+            PumpHistoryEntryType.ChangeBolusScrollStepSize,
+            PumpHistoryEntryType.BolusWizardSetup,
+            PumpHistoryEntryType.ChangeVariableBolus,
+            PumpHistoryEntryType.ChangeAudioBolus,
+            PumpHistoryEntryType.ChangeBGReminderEnable,
+            PumpHistoryEntryType.ChangeAlarmClockEnable,
+            PumpHistoryEntryType.BolusReminder,
+            PumpHistoryEntryType.DeleteAlarmClockTime,
+            PumpHistoryEntryType.ChangeCarbUnits,
+            PumpHistoryEntryType.ChangeWatchdogEnable,
+            PumpHistoryEntryType.ChangeOtherDeviceID,
+            PumpHistoryEntryType.ReadOtherDevicesIDs,
+            PumpHistoryEntryType.BGReceived512,
+            PumpHistoryEntryType.SensorStatus,
+            PumpHistoryEntryType.ReadCaptureEventEnabled,
+            PumpHistoryEntryType.ChangeCaptureEventEnable,
+            PumpHistoryEntryType.ReadOtherDevicesStatus                       -> RecordDecodeStatus.OK
+
+            PumpHistoryEntryType.Sensor_0x54,
+            PumpHistoryEntryType.Sensor_0x55,
+            PumpHistoryEntryType.Sensor_0x51,
+            PumpHistoryEntryType.Sensor_0x52,
+            PumpHistoryEntryType.EventUnknown_MM512_0x2e                      -> {
+                aapsLogger.debug(LTag.PUMPBTCOMM, " -- ignored Unknown Pump Entry: $entry")
+                RecordDecodeStatus.Ignored
+            }
+
+            PumpHistoryEntryType.UnabsorbedInsulin,
+            PumpHistoryEntryType.UnabsorbedInsulin512                         -> RecordDecodeStatus.Ignored
+            PumpHistoryEntryType.DailyTotals522,
+            PumpHistoryEntryType.DailyTotals523,
+            PumpHistoryEntryType.DailyTotals515,
+            PumpHistoryEntryType.EndResultTotals                              -> decodeDailyTotals(entry)
+            PumpHistoryEntryType.ChangeBasalProfile_OldProfile,
+            PumpHistoryEntryType.ChangeBasalProfile_NewProfile                -> decodeBasalProfile(entry)
+            PumpHistoryEntryType.BasalProfileStart                            -> decodeBasalProfileStart(entry)
+
+            PumpHistoryEntryType.ChangeTime                                   -> {
+                changeTimeRecord = entry
+                RecordDecodeStatus.OK
+            }
+
+            PumpHistoryEntryType.NewTimeSet                                   -> {
+                decodeChangeTime(entry)
+                RecordDecodeStatus.OK
+            }
+
+            PumpHistoryEntryType.TempBasalDuration                            ->   // decodeTempBasal(entry);
+                RecordDecodeStatus.OK
+
+            PumpHistoryEntryType.TempBasalRate                                ->  // decodeTempBasal(entry);
+                RecordDecodeStatus.OK
+
+            PumpHistoryEntryType.Bolus                                        -> {
+                decodeBolus(entry)
+                RecordDecodeStatus.OK
+            }
+
+            PumpHistoryEntryType.BatteryChange                                -> {
+                decodeBatteryActivity(entry)
+                RecordDecodeStatus.OK
+            }
+
+            PumpHistoryEntryType.LowReservoir                                 -> {
+                decodeLowReservoir(entry)
+                RecordDecodeStatus.OK
+            }
+
+            PumpHistoryEntryType.LowBattery,
+            PumpHistoryEntryType.SuspendPump,
+            PumpHistoryEntryType.ResumePump,
+            PumpHistoryEntryType.Rewind,
+            PumpHistoryEntryType.NoDeliveryAlarm,
+            PumpHistoryEntryType.ChangeTempBasalType,
+            PumpHistoryEntryType.ChangeMaxBolus,
+            PumpHistoryEntryType.ChangeMaxBasal,
+            PumpHistoryEntryType.ClearSettings,
+            PumpHistoryEntryType.SaveSettings                                 -> RecordDecodeStatus.OK
+            PumpHistoryEntryType.BolusWizard                                  -> decodeBolusWizard(entry)
+            PumpHistoryEntryType.BolusWizard512                               -> decodeBolusWizard512(entry)
+
+            PumpHistoryEntryType.Prime                                        -> {
+                decodePrime(entry)
+                RecordDecodeStatus.OK
+            }
+
+            PumpHistoryEntryType.TempBasalCombined                            -> RecordDecodeStatus.Ignored
+            PumpHistoryEntryType.None, PumpHistoryEntryType.UnknownBasePacket -> RecordDecodeStatus.Error
+
+            else                                                              -> {
+                aapsLogger.debug(LTag.PUMPBTCOMM, "Not supported: " + entry.entryType)
+                RecordDecodeStatus.NotSupported
+            }
+        }
+    }
+
+    private fun decodeDailyTotals(entry: PumpHistoryEntry): RecordDecodeStatus {
+        entry.addDecodedData("Raw Data", ByteUtil.getHex(entry.rawData))
+        val totals = DailyTotalsDTO(entry)
+        entry.addDecodedData("Object", totals)
+        return RecordDecodeStatus.OK
+    }
+
+    private fun decodeBasalProfile(entry: PumpHistoryEntry): RecordDecodeStatus {
+        val basalProfile = BasalProfile(aapsLogger)
+        basalProfile.setRawDataFromHistory(entry.body)
+        entry.addDecodedData("Object", basalProfile)
+        return RecordDecodeStatus.OK
+    }
+
+    private fun decodeChangeTime(entry: PumpHistoryEntry) {
+        if (changeTimeRecord == null) return
+        entry.displayableValue = entry.dateTimeString
+        changeTimeRecord = null
+    }
+
+    private fun decodeBatteryActivity(entry: PumpHistoryEntry) {
+        entry.displayableValue = if (entry.head[0] == 0.toByte()) "Battery Removed" else "Battery Replaced"
+    }
+
+    private fun decodeBasalProfileStart(entry: PumpHistoryEntry): RecordDecodeStatus {
+        val body = entry.body
+        val offset = body[0] * 1000 * 30 * 60
+        var rate: Float? = null
+        val index = entry.head[0].toInt()
+        if (MedtronicDeviceType.isSameDevice(medtronicUtil.medtronicPumpModel, MedtronicDeviceType.Medtronic_523andHigher)) {
+            rate = body[1] * 0.025f
+        }
+
+        //LOG.info("Basal Profile Start: offset={}, rate={}, index={}, body_raw={}", offset, rate, index, body);
+        return if (rate == null) {
+            aapsLogger.warn(LTag.PUMPBTCOMM, String.format(Locale.ENGLISH, "Basal Profile Start (ERROR): offset=%d, rate=%.3f, index=%d, body_raw=%s", offset, rate, index, ByteUtil.getHex(body)))
+            RecordDecodeStatus.Error
+        } else {
+            entry.addDecodedData("Value", getFormattedFloat(rate, 3))
+            entry.displayableValue = getFormattedFloat(rate, 3)
+            RecordDecodeStatus.OK
+        }
+    }
+
+    private fun decodeBolusWizard(entry: PumpHistoryEntry): RecordDecodeStatus {
+        val body = entry.body
+        val dto = BolusWizardDTO()
+        var bolusStrokes = 10.0f
+        if (MedtronicDeviceType.isSameDevice(medtronicUtil.medtronicPumpModel, MedtronicDeviceType.Medtronic_523andHigher)) {
+            // https://github.com/ps2/minimed_rf/blob/master/lib/minimed_rf/log_entries/bolus_wizard.rb#L102
+            bolusStrokes = 40.0f
+            dto.carbs = ((body[1] and 0x0c.toByte()).toInt() shl 6) + body[0]
+            dto.bloodGlucose = ((body[1] and 0x03).toInt() shl 8) + entry.head[0]
+            dto.carbRatio = body[1] / 10.0f
+            // carb_ratio (?) = (((self.body[2] & 0x07) << 8) + self.body[3]) /
+            // 10.0s
+            dto.insulinSensitivity = body[4].toFloat()
+            dto.bgTargetLow = body[5].toInt()
+            dto.bgTargetHigh = body[14].toInt()
+            dto.correctionEstimate = (((body[9] and 0x38).toInt() shl 5) + body[6]) / bolusStrokes
+            dto.foodEstimate = ((body[7].toInt() shl 8) + body[8]) / bolusStrokes
+            dto.unabsorbedInsulin = ((body[10].toInt() shl 8) + body[11]) / bolusStrokes
+            dto.bolusTotal = ((body[12].toInt() shl 8) + body[13]) / bolusStrokes
+        } else {
+            dto.bloodGlucose = (body.get(1) and 0x0F).toInt() shl 8 or entry.head.get(0).toInt()
+            dto.carbs = body[0].toInt()
+            dto.carbRatio = body[2].toFloat()
+            dto.insulinSensitivity = body[3].toFloat()
+            dto.bgTargetLow = body.get(4).toInt()
+            dto.bgTargetHigh = body.get(12).toInt()
+            dto.bolusTotal = body.get(11) / bolusStrokes
+            dto.foodEstimate = body.get(6) / bolusStrokes
+            dto.unabsorbedInsulin = body.get(9) / bolusStrokes
+            dto.bolusTotal = body.get(11) / bolusStrokes
+            dto.correctionEstimate = (body.get(7) + (body.get(5) and 0x0F)) / bolusStrokes
+        }
+        if (dto.bloodGlucose < 0) {
+            dto.bloodGlucose = ByteUtil.convertUnsignedByteToInt(dto.bloodGlucose.toByte())
+        }
+        dto.atechDateTime = entry.atechDateTime
+        entry.addDecodedData("Object", dto)
+        entry.displayableValue = dto.displayableValue
+        return RecordDecodeStatus.OK
+    }
+
+    private fun decodeBolusWizard512(entry: PumpHistoryEntry): RecordDecodeStatus {
+        val body = entry.body
+        val dto = BolusWizardDTO()
+        val bolusStrokes = 10.0f
+        dto.bloodGlucose = (body.get(1) and 0x03).toInt() shl 8 or entry.head.get(0).toInt()
+        dto.carbs = body.get(1).toInt() and 0xC shl 6 or body.get(0).toInt() // (int)body[0];
+        dto.carbRatio = body.get(2).toFloat()
+        dto.insulinSensitivity = body.get(3).toFloat()
+        dto.bgTargetLow = body.get(4).toInt()
+        dto.foodEstimate = body.get(6) / 10.0f
+        dto.correctionEstimate = (body.get(7) + (body.get(5) and 0x0F)) / bolusStrokes
+        dto.unabsorbedInsulin = body.get(9) / bolusStrokes
+        dto.bolusTotal = body.get(11) / bolusStrokes
+        dto.bgTargetHigh = dto.bgTargetLow
+        if (dto.bloodGlucose < 0) {
+            dto.bloodGlucose = ByteUtil.convertUnsignedByteToInt(dto.bloodGlucose.toByte())
+        }
+        dto.atechDateTime = entry.atechDateTime
+        entry.addDecodedData("Object", dto)
+        entry.displayableValue = dto.displayableValue
+        return RecordDecodeStatus.OK
+    }
+
+    private fun decodeLowReservoir(entry: PumpHistoryEntry) {
+        val amount = getUnsignedInt(entry.head.get(0)) * 1.0f / 10.0f * 2
+        entry.displayableValue = getFormattedValue(amount, 1)
+    }
+
+    private fun decodePrime(entry: PumpHistoryEntry) {
+        val amount = ByteUtil.toInt(entry.head.get(2), entry.head.get(3)) / 10.0f
+        val fixed = ByteUtil.toInt(entry.head.get(0), entry.head.get(1)) / 10.0f
+
+//        amount = (double)(asUINT8(data[4]) << 2) / 40.0;
+//        programmedAmount = (double)(asUINT8(data[2]) << 2) / 40.0;
+//        primeType = programmedAmount == 0 ? "manual" : "fixed";
+        entry.addDecodedData("Amount", amount)
+        entry.addDecodedData("FixedAmount", fixed)
+        entry.displayableValue = ("Amount=" + getFormattedValue(amount, 2) + ", Fixed Amount="
+            + getFormattedValue(fixed, 2))
+    }
+
+    private fun decodeChangeTempBasalType(entry: PumpHistoryEntry) {
+        entry.addDecodedData("isPercent", ByteUtil.asUINT8(entry.getRawDataByIndex(0)) == 1) // index moved from 1 -> 0
+    }
+
+    private fun decodeBgReceived(entry: PumpHistoryEntry) {
+        entry.addDecodedData("amount", (ByteUtil.asUINT8(entry.getRawDataByIndex(0)) shl 3) + (ByteUtil.asUINT8(entry.getRawDataByIndex(3)) shr 5))
+        entry.addDecodedData("meter", ByteUtil.substring(entry.rawData, 6, 3)) // index moved from 1 -> 0
+    }
+
+    private fun decodeCalBGForPH(entry: PumpHistoryEntry) {
+        entry.addDecodedData("amount", (ByteUtil.asUINT8(entry.getRawDataByIndex(5)) and 0x80 shl 1) + ByteUtil.asUINT8(entry.getRawDataByIndex(0))) // index moved from 1 -> 0
+    }
+
+    // private fun decodeNoDeliveryAlarm(entry: PumpHistoryEntry) {
+    //     //rawtype = asUINT8(data[1]);
+    //     // not sure if this is actually NoDelivery Alarm?
+    // }
+
+    override fun postProcess() {}
+
+    override fun runPostDecodeTasks() {
+        showStatistics()
+    }
+
+    private fun decodeBolus(entry: PumpHistoryEntry) {
+        val bolus: BolusDTO?
+        val data = entry.head
+        if (MedtronicDeviceType.isSameDevice(medtronicUtil.medtronicPumpModel, MedtronicDeviceType.Medtronic_523andHigher)) {
+            bolus = BolusDTO(atechDateTime = entry.atechDateTime,
+                requestedAmount = ByteUtil.toInt(data.get(0), data.get(1)) / 40.0,
+                deliveredAmount = ByteUtil.toInt(data.get(2), data.get(3)) / 40.0,
+                duration = data.get(6) * 30)
+            bolus.insulinOnBoard = ByteUtil.toInt(data.get(4), data.get(5)) / 40.0
+        } else {
+            bolus = BolusDTO(atechDateTime = entry.atechDateTime,
+                requestedAmount = ByteUtil.asUINT8(data.get(0)) / 10.0,
+                deliveredAmount = ByteUtil.asUINT8(data.get(1)) / 10.0,
+                duration = ByteUtil.asUINT8(data.get(2)) * 30)
+        }
+        bolus.bolusType = if (bolus.duration > 0) PumpBolusType.Extended else PumpBolusType.Normal
+        entry.addDecodedData("Object", bolus)
+        entry.displayableValue = bolus.displayableValue
+    }
+
+    fun decodeTempBasal(tbrPreviousRecord: PumpHistoryEntry, entry: PumpHistoryEntry) {
+        var tbrRate: PumpHistoryEntry? = null
+        var tbrDuration: PumpHistoryEntry? = null
+        if (entry.entryType === PumpHistoryEntryType.TempBasalRate) {
+            tbrRate = entry
+        } else {
+            tbrDuration = entry
+        }
+        if (tbrRate != null) {
+            tbrDuration = tbrPreviousRecord
+        } else {
+            tbrRate = tbrPreviousRecord
+        }
+
+        val tbr = TempBasalPair(
+            tbrRate.head.get(0),
+            tbrRate.body.get(0),
+            tbrDuration!!.head.get(0).toInt(),
+            ByteUtil.asUINT8(tbrRate.datetime.get(4)) shr 3 == 0)
+
+        entry.addDecodedData("Object", tbr)
+        entry.displayableValue = tbr.description
+    }
+
+    private fun decodeDateTime(entry: PumpHistoryEntry) {
+        if (entry.datetime.size == 0) {
+            aapsLogger.warn(LTag.PUMPBTCOMM, "DateTime not set.")
+        }
+        val dt = entry.datetime
+        if (entry.dateTimeLength == 5) {
+            val seconds: Int = (dt.get(0) and 0x3F.toByte()).toInt()
+            val minutes: Int = (dt.get(1) and 0x3F.toByte()).toInt()
+            val hour: Int = (dt.get(2) and 0x1F).toInt()
+            val month: Int = (dt.get(0).toInt() shr 4 and 0x0c) + (dt.get(1).toInt() shr 6 and 0x03)
+            // ((dt[0] & 0xC0) >> 6) | ((dt[1] & 0xC0) >> 4);
+            val dayOfMonth: Int = (dt.get(3) and 0x1F).toInt()
+            val year = fix2DigitYear((dt.get(4) and 0x3F.toByte()).toInt()) // Assuming this is correct, need to verify. Otherwise this will be
+            // a problem in 2016.
+            entry.atechDateTime = DateTimeUtil.toATechDate(year, month, dayOfMonth, hour, minutes, seconds)
+        } else if (entry.dateTimeLength == 2) {
+            //val low = ByteUtil.asUINT8(dt.get(0)) and 0x1F
+            val mhigh = ByteUtil.asUINT8(dt.get(0)) and 0xE0 shr 4
+            val mlow = ByteUtil.asUINT8(dt.get(1)) and 0x80 shr 7
+            val month = mhigh + mlow
+            // int dayOfMonth = low + 1;
+            val dayOfMonth: Int = (dt.get(0) and 0x1F).toInt()
+            val year = 2000 + (ByteUtil.asUINT8(dt.get(1)) and 0x7F)
+            var hour = 0
+            var minutes = 0
+            var seconds = 0
+
+            //LOG.debug("DT: {} {} {}", year, month, dayOfMonth);
+            if (dayOfMonth == 32) {
+                aapsLogger.warn(LTag.PUMPBTCOMM, String.format(Locale.ENGLISH, "Entry: Day 32 %s = [%s] %s", entry.entryType.name,
+                    ByteUtil.getHex(entry.rawData), entry))
+            }
+            if (isEndResults(entry.entryType)) {
+                hour = 23
+                minutes = 59
+                seconds = 59
+            }
+            entry.atechDateTime = DateTimeUtil.toATechDate(year, month, dayOfMonth, hour, minutes, seconds)
+        } else {
+            aapsLogger.warn(LTag.PUMPBTCOMM, "Unknown datetime format: " + entry.dateTimeLength)
+        }
+    }
+
+    private fun isEndResults(entryType: PumpHistoryEntryType?): Boolean {
+        return entryType === PumpHistoryEntryType.EndResultTotals ||
+            entryType === PumpHistoryEntryType.DailyTotals515 ||
+            entryType === PumpHistoryEntryType.DailyTotals522 ||
+            entryType === PumpHistoryEntryType.DailyTotals523
+    }
+
+    private fun fix2DigitYear(year: Int): Int {
+        var yearInternal = year
+        yearInternal += if (yearInternal > 90) {
+            1900
+        } else {
+            2000
+        }
+        return yearInternal
+    }
+
+    companion object {
+
+        private fun getFormattedValue(value: Float, decimals: Int): String {
+            return String.format(Locale.ENGLISH, "%." + decimals + "f", value)
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/pump/PumpHistoryEntry.java b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/pump/PumpHistoryEntry.java
deleted file mode 100644
index 3866e3e6ba..0000000000
--- a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/pump/PumpHistoryEntry.java
+++ /dev/null
@@ -1,174 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.medtronic.comm.history.pump;
-
-import com.google.gson.annotations.Expose;
-
-import java.util.Objects;
-
-import info.nightscout.androidaps.plugins.pump.common.utils.ByteUtil;
-import info.nightscout.androidaps.plugins.pump.common.utils.StringUtil;
-import info.nightscout.androidaps.plugins.pump.medtronic.comm.history.MedtronicHistoryEntry;
-import info.nightscout.androidaps.plugins.pump.medtronic.defs.MedtronicDeviceType;
-
-/**
- * This file was taken from GGC - GNU Gluco Control (ggc.sourceforge.net), application for diabetes
- * management and modified/extended for AAPS.
- * <p>
- * Author: Andy {andy.rozman@gmail.com}
- */
-
-public class PumpHistoryEntry extends MedtronicHistoryEntry {
-
-    @Expose
-    private PumpHistoryEntryType entryType;
-    private Integer opCode; // this is set only when we have unknown entry...
-    private int offset;
-    private String displayableValue = "";
-
-
-    public PumpHistoryEntryType getEntryType() {
-        return entryType;
-    }
-
-
-    public void setEntryType(MedtronicDeviceType medtronicDeviceType, PumpHistoryEntryType entryType) {
-        this.entryType = entryType;
-
-        this.sizes[0] = entryType.getHeadLength(medtronicDeviceType);
-        this.sizes[1] = entryType.getDateLength();
-        this.sizes[2] = entryType.getBodyLength(medtronicDeviceType);
-
-        if (this.entryType != null && this.atechDateTime != null)
-            setPumpId();
-    }
-
-
-    private void setPumpId() {
-        this.pumpId = this.entryType.getCode() + (this.atechDateTime * 1000L);
-    }
-
-
-    @Override
-    public int getOpCode() {
-        if (opCode == null)
-            return entryType.getOpCode();
-        else
-            return opCode;
-    }
-
-
-    public void setOpCode(Integer opCode) {
-        this.opCode = opCode;
-    }
-
-
-    @Override
-    public String getToStringStart() {
-        return "PumpHistoryEntry [type=" + StringUtil.getStringInLength(entryType.name(), 20) + " ["
-                + StringUtil.getStringInLength("" + getOpCode(), 3) + ", 0x"
-                + ByteUtil.shortHexString((byte) getOpCode()) + "]";
-    }
-
-
-    public String toString() {
-        return super.toString();
-//        Object object = this.getDecodedDataEntry("Object");
-//
-//        if (object == null) {
-//            return super.toString();
-//        } else {
-//            return super.toString() + "PumpHistoryEntry [type=" + StringUtil.getStringInLength(entryType.name(), 20) + ", DT: " + DT + ", Object=" + object.toString() + "]";
-//        }
-    }
-
-
-    public int getOffset() {
-        return offset;
-    }
-
-
-    public void setOffset(int offset) {
-        this.offset = offset;
-    }
-
-
-    @Override
-    public String getEntryTypeName() {
-        return this.entryType.name();
-    }
-
-
-    @Override
-    public int getDateLength() {
-        return this.entryType.getDateLength();
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o)
-            return true;
-
-        if (!(o instanceof PumpHistoryEntry))
-            return false;
-
-        PumpHistoryEntry that = (PumpHistoryEntry) o;
-
-        return entryType == that.entryType && //
-                this.atechDateTime == that.atechDateTime; // && //
-        // Objects.equals(this.decodedData, that.decodedData);
-    }
-
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(entryType, opCode, offset);
-    }
-
-
-    // public boolean isAfter(LocalDateTime dateTimeIn) {
-    // // LOG.debug("Entry: " + this.dateTime);
-    // // LOG.debug("Datetime: " + dateTimeIn);
-    // // LOG.debug("Item after: " + this.dateTime.isAfter(dateTimeIn));
-    // return this.dateTime.isAfter(dateTimeIn);
-    // }
-
-    public boolean isAfter(long atechDateTime) {
-        if (this.atechDateTime == null) {
-            LOG.error("Date is null. Show object: " + toString());
-            return false; // FIXME shouldn't happen
-        }
-
-        return atechDateTime < this.atechDateTime;
-    }
-
-
-    public void setDisplayableValue(String displayableValue) {
-        this.displayableValue = displayableValue;
-    }
-
-
-    public String getDisplayableValue() {
-        return displayableValue;
-    }
-
-    public static class Comparator implements java.util.Comparator<PumpHistoryEntry> {
-
-        @Override
-        public int compare(PumpHistoryEntry o1, PumpHistoryEntry o2) {
-            int data = (int) (o2.atechDateTime - o1.atechDateTime);
-
-            if (data != 0)
-                return data;
-
-            return o2.getEntryType().getCode() - o1.getEntryType().getCode();
-        }
-    }
-
-
-    public Long getPumpId() {
-        setPumpId();
-
-        return pumpId;
-    }
-
-}
diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/pump/PumpHistoryEntry.kt b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/pump/PumpHistoryEntry.kt
new file mode 100644
index 0000000000..0bc1e8106e
--- /dev/null
+++ b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/pump/PumpHistoryEntry.kt
@@ -0,0 +1,116 @@
+package info.nightscout.androidaps.plugins.pump.medtronic.comm.history.pump
+
+import com.google.gson.annotations.Expose
+import info.nightscout.androidaps.plugins.pump.common.utils.ByteUtil
+import info.nightscout.androidaps.plugins.pump.common.utils.StringUtil
+import info.nightscout.androidaps.plugins.pump.medtronic.comm.history.MedtronicHistoryEntry
+import info.nightscout.androidaps.plugins.pump.medtronic.data.dto.BolusDTO
+import info.nightscout.androidaps.plugins.pump.medtronic.defs.MedtronicDeviceType
+import java.util.*
+
+/**
+ * This file was taken from GGC - GNU Gluco Control (ggc.sourceforge.net), application for diabetes
+ * management and modified/extended for AAPS.
+ *
+ *
+ * Author: Andy {andy.rozman@gmail.com}
+ */
+class PumpHistoryEntry : MedtronicHistoryEntry() {
+
+    @Expose
+    var entryType: PumpHistoryEntryType = PumpHistoryEntryType.None
+        private set
+
+    override var opCode: Byte? = null
+        // this is set only when we have unknown entry...
+        get() = if (field == null) entryType.code else field
+
+    var offset = 0
+    var displayableValue = ""
+
+    fun setEntryType(medtronicDeviceType: MedtronicDeviceType, entryType: PumpHistoryEntryType, opCode: Byte? = null) {
+        this.entryType = entryType
+        sizes[0] = entryType.getHeadLength(medtronicDeviceType)
+        sizes[1] = entryType.dateLength
+        sizes[2] = entryType.getBodyLength(medtronicDeviceType)
+        if (isEntryTypeSet() && atechDateTime != 0L) pumpId = generatePumpId()
+        this.opCode = opCode
+    }
+
+    override fun generatePumpId(): Long {
+        return entryType.code + atechDateTime * 1000L
+    }
+
+    override fun isEntryTypeSet(): Boolean {
+        return this.entryType != PumpHistoryEntryType.None
+    }
+
+    override val toStringStart: String
+        get() = ("PumpHistoryEntry [type=" + StringUtil.getStringInLength(entryType.name, 20) + " ["
+            + StringUtil.getStringInLength("" + opCode, 3) + ", 0x"
+            + ByteUtil.shortHexString(opCode!!) + "]")
+
+    override val entryTypeName: String
+        get() = entryType.name
+
+    override val dateLength: Int
+        get() = entryType.dateLength
+
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (other !is PumpHistoryEntry) return false
+        val that = other //as PumpHistoryEntry
+        return this.pumpId == that.pumpId
+        // return entryType == that.entryType &&  //
+        //     atechDateTime === that.atechDateTime // && //
+        // Objects.equals(this.decodedData, that.decodedData);
+    }
+
+    override fun hashCode(): Int {
+        return Objects.hash(entryType, opCode, offset)
+    }
+
+    // public boolean isAfter(LocalDateTime dateTimeIn) {
+    // // LOG.debug("Entry: " + this.dateTime);
+    // // LOG.debug("Datetime: " + dateTimeIn);
+    // // LOG.debug("Item after: " + this.dateTime.isAfter(dateTimeIn));
+    // return this.dateTime.isAfter(dateTimeIn);
+    // }
+    fun isAfter(atechDateTime: Long): Boolean {
+        if (this.atechDateTime == 0L) {
+            // Log.e("PumpHistoryEntry", "Date is null. Show object: " + toString())
+            return false // FIXME shouldn't happen
+        }
+        return atechDateTime < this.atechDateTime
+    }
+
+    class Comparator : java.util.Comparator<PumpHistoryEntry> {
+
+        override fun compare(o1: PumpHistoryEntry, o2: PumpHistoryEntry): Int {
+            val data = (o2.atechDateTime - o1.atechDateTime).toInt()
+            return if (data != 0) data else o2.entryType.code - o1.entryType.code
+        }
+    }
+
+    override var pumpId: Long = 0L
+        get() {
+            if (field == 0L) {
+                field = generatePumpId()
+            }
+            return field
+        }
+
+    fun hasBolusChanged(entry: PumpHistoryEntry): Boolean {
+        if (entryType == PumpHistoryEntryType.Bolus) {
+            val thisOne: BolusDTO = this.decodedData["Object"] as BolusDTO
+
+            if (entry.entryType == PumpHistoryEntryType.Bolus) {
+                val otherOne: BolusDTO = entry.decodedData["Object"] as BolusDTO
+                return (thisOne.value.equals(otherOne.value))
+            } else
+                return false
+        }
+
+        return false
+    }
+}
\ No newline at end of file
diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/pump/PumpHistoryEntryType.java b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/pump/PumpHistoryEntryType.java
deleted file mode 100644
index 3a8212d1f9..0000000000
--- a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/pump/PumpHistoryEntryType.java
+++ /dev/null
@@ -1,378 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.medtronic.comm.history.pump;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import info.nightscout.androidaps.plugins.pump.common.defs.PumpHistoryEntryGroup;
-import info.nightscout.androidaps.plugins.pump.medtronic.defs.MedtronicDeviceType;
-
-/**
- * This file was taken from GGC - GNU Gluco Control (ggc.sourceforge.net), application for diabetes
- * management and modified/extended for AAPS.
- * <p>
- * Author: Andy {andy.rozman@gmail.com}
- */
-
-public enum PumpHistoryEntryType // implements CodeEnum
-{
-    // all commented out are probably not the real items
-    None(0, "None", PumpHistoryEntryGroup.Unknown, 1, 0, 0),
-    Bolus(0x01, "Bolus", PumpHistoryEntryGroup.Bolus, 4, 5, 0), // 523+[H=8] 9/13
-    Prime(0x03, "Prime", PumpHistoryEntryGroup.Prime, 5, 5, 0), //
-    //    /**/EventUnknown_MM522_0x05((byte) 0x05, "Unknown Event 0x05", PumpHistoryEntryGroup.Unknown, 2, 5, 28), //
-    NoDeliveryAlarm(0x06, "No Delivery", PumpHistoryEntryGroup.Alarm, 4, 5, 0), //
-    EndResultTotals(0x07, "End Result Totals", PumpHistoryEntryGroup.Statistic, 5, 2, 0),
-    ChangeBasalProfile_OldProfile(0x08, "Change Basal Profile (Old)", PumpHistoryEntryGroup.Basal, 2, 5, 145),
-    ChangeBasalProfile_NewProfile(0x09, "Change Basal Profile (New)", PumpHistoryEntryGroup.Basal, 2, 5, 145), //
-    //    /**/EventUnknown_MM512_0x10(0x10, "Unknown Event 0x10", PumpHistoryEntryGroup.Unknown), // 29, 5, 0
-    CalBGForPH(0x0a, "BG Capture", PumpHistoryEntryGroup.Glucose), //
-    SensorAlert(0x0b, "Sensor Alert", PumpHistoryEntryGroup.Alarm, 3, 5, 0), // Ian08
-    ClearAlarm(0x0c, "Clear Alarm", PumpHistoryEntryGroup.Alarm, 2, 5, 0), // 2,5,4
-    ChangeBasalPattern(0x14, "Change Basal Pattern", PumpHistoryEntryGroup.Basal), //
-    TempBasalDuration(0x16, "TBR Duration", PumpHistoryEntryGroup.Basal), //
-    ChangeTime(0x17, "Change Time", PumpHistoryEntryGroup.Configuration), //
-    NewTimeSet(0x18, "New Time Set", PumpHistoryEntryGroup.Notification), //
-    LowBattery(0x19, "LowBattery", PumpHistoryEntryGroup.Notification), //
-    BatteryChange(0x1a, "Battery Change", PumpHistoryEntryGroup.Notification), //
-    SetAutoOff(0x1b, "Set Auto Off", PumpHistoryEntryGroup.Configuration), //
-    SuspendPump(0x1e, "Suspend", PumpHistoryEntryGroup.Basal), //
-    ResumePump(0x1f, "Resume", PumpHistoryEntryGroup.Basal), //
-    SelfTest(0x20, "Self Test", PumpHistoryEntryGroup.Statistic), //
-    Rewind(0x21, "Rewind", PumpHistoryEntryGroup.Prime), //
-    ClearSettings(0x22, "Clear Settings", PumpHistoryEntryGroup.Configuration), //
-    ChangeChildBlockEnable(0x23, "Change Child Block Enable", PumpHistoryEntryGroup.Configuration), //
-    ChangeMaxBolus(0x24, "Change Max Bolus", PumpHistoryEntryGroup.Configuration), //
-    //    /**/EventUnknown_MM522_0x25(0x25, "Unknown Event 0x25", PumpHistoryEntryGroup.Unknown), // 8?
-    EnableDisableRemote(0x26, "Enable/Disable Remote", PumpHistoryEntryGroup.Configuration, 2, 5, 14), // 2, 5, 14 V6:2,5,14
-    ChangeRemoteId(0x27, "Change Remote ID", PumpHistoryEntryGroup.Configuration), // ??
-    ChangeMaxBasal(0x2c, "Change Max Basal", PumpHistoryEntryGroup.Configuration), //
-    BolusWizardEnabled(0x2d, "Bolus Wizard Enabled", PumpHistoryEntryGroup.Configuration), // V3 ?
-    /* TODO */EventUnknown_MM512_0x2e(0x2e, "Unknown Event 0x2e", PumpHistoryEntryGroup.Unknown, 2, 5, 100), //
-    BolusWizard512(0x2f, "Bolus Wizard (512)", PumpHistoryEntryGroup.Bolus, 2, 5, 12), //
-    UnabsorbedInsulin512(0x30, "Unabsorbed Insulin (512)", PumpHistoryEntryGroup.Statistic, 5, 0, 0), // FIXME
-    ChangeBGReminderOffset(0x31, "Change BG Reminder Offset", PumpHistoryEntryGroup.Configuration), //
-    ChangeAlarmClockTime(0x32, "Change Alarm Clock Time", PumpHistoryEntryGroup.Configuration), //
-    TempBasalRate(0x33, "TBR Rate", PumpHistoryEntryGroup.Basal, 2, 5, 1), //
-    LowReservoir(0x34, "Low Reservoir", PumpHistoryEntryGroup.Notification), //
-    ChangeAlarmClock(0x35, "Change Alarm Clock", PumpHistoryEntryGroup.Configuration), //
-    ChangeMeterId(0x36, "Change Meter ID", PumpHistoryEntryGroup.Configuration), //
-    //    /**/EventUnknown_MM512_0x37(0x37, "Unknown Event 0x37", PumpHistoryEntryGroup.Unknown), // V:MM512
-//    /**/EventUnknown_MM512_0x38(0x38, "Unknown Event 0x38", PumpHistoryEntryGroup.Unknown), //
-    BGReceived512(0x39, "BG Received (512)", PumpHistoryEntryGroup.Glucose, 2, 5, 3), //
-    /* TODO */ConfirmInsulinChange(0x3a, "Confirm Insulin Change", PumpHistoryEntryGroup.Unknown), //
-    SensorStatus(0x3b, "Sensor Status", PumpHistoryEntryGroup.Glucose), //
-    ChangeParadigmID(0x3c, "Change Paradigm ID", PumpHistoryEntryGroup.Configuration, 2, 5, 14), // V3 ? V6: 2,5,14 ?? is it this length or just 7
-    //    EventUnknown_MM512_0x3D(0x3d, "Unknown Event 0x3D", PumpHistoryEntryGroup.Unknown), //
-//    EventUnknown_MM512_0x3E(0x3e, "Unknown Event 0x3E", PumpHistoryEntryGroup.Unknown), //
-    BGReceived(0x3f, "BG Received", PumpHistoryEntryGroup.Glucose, 2, 5, 3), // Ian3F
-    JournalEntryMealMarker(0x40, "Meal Marker", PumpHistoryEntryGroup.Bolus, 2, 5, 2), // is size just 7??? V6
-    JournalEntryExerciseMarker(0x41, "Exercise Marker", PumpHistoryEntryGroup.Bolus, 2, 5, 1), // ??
-    JournalEntryInsulinMarker(0x42, "Insulin Marker", PumpHistoryEntryGroup.Bolus, 2, 5, 0), // V6 = body(0)/was=1
-    JournalEntryOtherMarker(0x43, "Other Marker", PumpHistoryEntryGroup.Bolus, 2, 5, 1), // V6 = body(1)/was=0
-    EnableSensorAutoCal(0x44, "Enable Sensor AutoCal", PumpHistoryEntryGroup.Glucose), //
-    //    /**/EventUnknown_MM522_0x45(0x45, "Unknown Event 0x45", PumpHistoryEntryGroup.Unknown, 2, 5, 1), //
-//    /**/EventUnknown_MM522_0x46(0x46, "Unknown Event 0x46", PumpHistoryEntryGroup.Unknown, 2, 5, 1), //
-//    /**/EventUnknown_MM522_0x47(0x47, "Unknown Event 0x47", PumpHistoryEntryGroup.Unknown, 2, 5, 1), //
-//    /**/EventUnknown_MM522_0x48(0x48, "Unknown Event 0x48", PumpHistoryEntryGroup.Unknown, 2, 5, 1), //
-//    /**/EventUnknown_MM522_0x49(0x49, "Unknown Event 0x49", PumpHistoryEntryGroup.Unknown, 2, 5, 1), //
-//    /**/EventUnknown_MM522_0x4a(0x4a, "Unknown Event 0x4a", PumpHistoryEntryGroup.Unknown, 2, 5, 1), //
-//    /**/EventUnknown_MM522_0x4b(0x4b, "Unknown Event 0x4b", PumpHistoryEntryGroup.Unknown, 2, 5, 1), //
-//    /**/EventUnknown_MM522_0x4c(0x4c, "Unknown Event 0x4c", PumpHistoryEntryGroup.Unknown, 2, 5, 1), //
-//    /**/EventUnknown_0x4d(0x4d, "Unknown Event 0x4d", PumpHistoryEntryGroup.Unknown), // V5: 512: 7, 522: 8 ????NS
-//    /**/EventUnknown_MM512_0x4e(0x4e, "Unknown Event 0x4e", PumpHistoryEntryGroup.Unknown), // /**/
-    BolusWizardSetup512(0x4f, "Bolus Wizard Setup (512)", PumpHistoryEntryGroup.Configuration, 2, 5, 32), //
-    ChangeSensorSetup2(0x50, "Sensor Setup2", PumpHistoryEntryGroup.Configuration, 2, 5, 30), // Ian50
-    /* TODO */Sensor_0x51(0x51, "Unknown Event 0x51", PumpHistoryEntryGroup.Unknown), //
-    /* TODO */Sensor_0x52(0x52, "Unknown Event 0x52", PumpHistoryEntryGroup.Unknown), //
-    ChangeSensorAlarmSilenceConfig(0x53, "Sensor Alarm Silence Config", PumpHistoryEntryGroup.Configuration, 2, 5, 1), // 8
-    /* TODO */Sensor_0x54(0x54, "Unknown Event 0x54", PumpHistoryEntryGroup.Unknown), // Ian54
-    /* TODO */Sensor_0x55(0x55, "Unknown Event 0x55", PumpHistoryEntryGroup.Unknown), //
-    ChangeSensorRateOfChangeAlertSetup(0x56, "Sensor Rate Of Change Alert Setup", PumpHistoryEntryGroup.Configuration, 2, 5, 5), // 12
-    ChangeBolusScrollStepSize(0x57, "Change Bolus Scroll Step Size", PumpHistoryEntryGroup.Configuration), //
-    BolusWizardSetup(0x5a, "Bolus Wizard Setup (522)", PumpHistoryEntryGroup.Configuration, 2, 5, 117),
-    // V2: 522+[B=143]; V6: 124, v6: 137, v7: 117/137 [523]
-    BolusWizard(0x5b, "Bolus Wizard Estimate", PumpHistoryEntryGroup.Configuration, 2, 5, 13), // 15 //
-    UnabsorbedInsulin(0x5c, "Unabsorbed Insulin", PumpHistoryEntryGroup.Statistic, 5, 0, 0), // head[1] -> body
-    SaveSettings(0x5d, "Save Settings", PumpHistoryEntryGroup.Configuration), //
-    ChangeVariableBolus(0x5e, "Change Variable Bolus", PumpHistoryEntryGroup.Configuration), //
-    ChangeAudioBolus(0x5f, "Easy Bolus Enabled", PumpHistoryEntryGroup.Configuration), // V3 ?
-    ChangeBGReminderEnable(0x60, "BG Reminder Enable", PumpHistoryEntryGroup.Configuration), // questionable60
-    ChangeAlarmClockEnable(0x61, "Alarm Clock Enable", PumpHistoryEntryGroup.Configuration), //
-    ChangeTempBasalType((byte) 0x62, "Change Basal Type", PumpHistoryEntryGroup.Configuration), // ChangeTempBasalTypePumpEvent
-    ChangeAlarmNotifyMode(0x63, "Change Alarm Notify Mode", PumpHistoryEntryGroup.Configuration), //
-    ChangeTimeFormat(0x64, "Change Time Format", PumpHistoryEntryGroup.Configuration), //
-    ChangeReservoirWarningTime((byte) 0x65, "Change Reservoir Warning Time", PumpHistoryEntryGroup.Configuration), //
-    ChangeBolusReminderEnable(0x66, "Change Bolus Reminder Enable", PumpHistoryEntryGroup.Configuration), // 9 -> 7
-    SetBolusReminderTime((byte) 0x67, "Change Bolus Reminder Time", PumpHistoryEntryGroup.Configuration, 2, 5, 2), // 9
-    DeleteBolusReminderTime((byte) 0x68, "Delete Bolus Reminder Time", PumpHistoryEntryGroup.Configuration, 2, 5, 2), // 9
-    BolusReminder(0x69, "Bolus Reminder", PumpHistoryEntryGroup.Configuration, 2, 5, 0), // Ian69
-    DeleteAlarmClockTime(0x6a, "Delete Alarm Clock Time", PumpHistoryEntryGroup.Configuration, 2, 5, 7), // 14
-    DailyTotals515(0x6c, "Daily Totals (515)", PumpHistoryEntryGroup.Statistic, 1, 2, 35), // v4: 0,0,36. v5: 1,2,33
-    DailyTotals522(0x6d, "Daily Totals (522)", PumpHistoryEntryGroup.Statistic, 1, 2, 41), //
-    DailyTotals523(0x6e, "Daily Totals (523)", PumpHistoryEntryGroup.Statistic, 1, 2, 49), // 1102014-03-17T00:00:00
-    ChangeCarbUnits((byte) 0x6f, "Change Carb Units", PumpHistoryEntryGroup.Configuration), //
-    //    /**/EventUnknown_MM522_0x70((byte) 0x70, "Unknown Event 0x70", PumpHistoryEntryGroup.Unknown, 2, 5, 1), //
-    BasalProfileStart(0x7b, "Basal Profile Start", PumpHistoryEntryGroup.Basal, 2, 5, 3), // // 722
-    ChangeWatchdogEnable((byte) 0x7c, "Change Watchdog Enable", PumpHistoryEntryGroup.Configuration), //
-    ChangeOtherDeviceID((byte) 0x7d, "Change Other Device ID", PumpHistoryEntryGroup.Configuration, 2, 5, 30), //
-    ChangeWatchdogMarriageProfile(0x81, "Change Watchdog Marriage Profile", PumpHistoryEntryGroup.Configuration, 2, 5, 5), // 12
-    DeleteOtherDeviceID(0x82, "Delete Other Device ID", PumpHistoryEntryGroup.Configuration, 2, 5, 5), //
-    ChangeCaptureEventEnable(0x83, "Change Capture Event Enable", PumpHistoryEntryGroup.Configuration), //
-    //    /**/EventUnknown_MM512_0x88(0x88, "Unknown Event 0x88", PumpHistoryEntryGroup.Unknown), //
-//    /**/EventUnknown_MM512_0x94(0x94, "Unknown Event 0x94", PumpHistoryEntryGroup.Unknown), //
-    /**/ IanA8(0xA8, "Ian A8 (Unknown)", PumpHistoryEntryGroup.Unknown, 10, 5, 0), //
-    //    /**/EventUnknown_MM522_0xE8(0xe8, "Unknown Event 0xE8", PumpHistoryEntryGroup.Unknown, 2, 5, 25), //
-    // F0 - F3 are not in go code, but they are in GGC one and thet are used
-    ReadOtherDevicesIDs(0xf0, "Read Other Devices IDs", PumpHistoryEntryGroup.Configuration), // ?
-    ReadCaptureEventEnabled(0xf1, "Read Capture Event Enabled", PumpHistoryEntryGroup.Configuration), // ?
-    ChangeCaptureEventEnable2(0xf2, "Change Capture Event Enable2", PumpHistoryEntryGroup.Configuration), // ?
-    ReadOtherDevicesStatus(0xf3, "Read Other Devices Status", PumpHistoryEntryGroup.Configuration), // ?
-
-    TempBasalCombined(0xfe, "TBR", PumpHistoryEntryGroup.Basal), //
-    UnknownBasePacket(0xff, "Unknown Base Packet", PumpHistoryEntryGroup.Unknown);
-
-    private static final Map<Integer, PumpHistoryEntryType> opCodeMap = new HashMap<>();
-
-    static {
-        for (PumpHistoryEntryType type : values()) {
-            opCodeMap.put(type.opCode, type);
-        }
-
-        setSpecialRulesForEntryTypes();
-    }
-
-    private final int opCode;
-    private final String description;
-    private final int headLength;
-    private final int dateLength;
-    // private MinimedDeviceType deviceType;
-    private final int bodyLength;
-    private final int totalLength;
-    // special rules need to be put in list from highest to lowest (e.g.:
-    // 523andHigher=12, 515andHigher=10 and default (set in cnstr) would be 8)
-    private List<SpecialRule> specialRulesHead;
-    private List<SpecialRule> specialRulesBody;
-    private boolean hasSpecialRules = false;
-    private final PumpHistoryEntryGroup group;
-
-
-    PumpHistoryEntryType(int opCode, String name, PumpHistoryEntryGroup group) {
-        this(opCode, name, group, 2, 5, 0);
-    }
-
-
-    PumpHistoryEntryType(int opCode, PumpHistoryEntryGroup group) {
-        this(opCode, null, group, 2, 5, 0);
-    }
-
-
-    PumpHistoryEntryType(int opCode, PumpHistoryEntryGroup group, int head, int date, int body) {
-        this(opCode, null, group, head, date, body);
-    }
-
-
-    PumpHistoryEntryType(int opCode, String name, PumpHistoryEntryGroup group, int head, int date, int body) {
-        this.opCode = (byte) opCode;
-        this.description = name;
-        this.headLength = head;
-        this.dateLength = date;
-        this.bodyLength = body;
-        this.totalLength = (head + date + body);
-        this.group = group;
-    }
-
-
-    static void setSpecialRulesForEntryTypes() {
-        EndResultTotals.addSpecialRuleBody(new SpecialRule(MedtronicDeviceType.Medtronic_523andHigher, 3));
-        Bolus.addSpecialRuleHead(new SpecialRule(MedtronicDeviceType.Medtronic_523andHigher, 8));
-        BolusWizardSetup.addSpecialRuleBody(new SpecialRule(MedtronicDeviceType.Medtronic_523andHigher, 137));
-        BolusWizard.addSpecialRuleBody(new SpecialRule(MedtronicDeviceType.Medtronic_523andHigher, 15));
-        BolusReminder.addSpecialRuleBody(new SpecialRule(MedtronicDeviceType.Medtronic_523andHigher, 2));
-        ChangeSensorSetup2.addSpecialRuleBody(new SpecialRule(MedtronicDeviceType.Medtronic_523andHigher, 34));
-    }
-
-
-    public static PumpHistoryEntryType getByCode(int opCode) {
-        if (opCodeMap.containsKey(opCode)) {
-            return opCodeMap.get(opCode);
-        } else {
-            return PumpHistoryEntryType.UnknownBasePacket;
-        }
-    }
-
-
-    //
-    // private PumpHistoryEntryType(int opCode, String name, int head, int date,
-    // int body)
-    // {
-    // this.opCode = (byte) opCode;
-    // this.description = name;
-    // this.headLength = head;
-    // this.dateLength = date;
-    // this.bodyLength = body;
-    // this.totalLength = (head + date + body);
-    // }
-    //
-
-    public static boolean isAAPSRelevantEntry(PumpHistoryEntryType entryType) {
-        return (entryType == PumpHistoryEntryType.Bolus || // Treatments
-                entryType == PumpHistoryEntryType.TempBasalRate || //
-                entryType == PumpHistoryEntryType.TempBasalDuration || //
-
-                entryType == PumpHistoryEntryType.Prime || // Pump Status Change
-                entryType == PumpHistoryEntryType.SuspendPump || //
-                entryType == PumpHistoryEntryType.ResumePump || //
-                entryType == PumpHistoryEntryType.Rewind || //
-                entryType == PumpHistoryEntryType.NoDeliveryAlarm || // no delivery
-                entryType == PumpHistoryEntryType.BasalProfileStart || //
-
-                entryType == PumpHistoryEntryType.ChangeTime || // Time Change
-                entryType == PumpHistoryEntryType.NewTimeSet || //
-
-                entryType == PumpHistoryEntryType.ChangeBasalPattern || // Configuration
-                entryType == PumpHistoryEntryType.ClearSettings || //
-                entryType == PumpHistoryEntryType.SaveSettings || //
-                entryType == PumpHistoryEntryType.ChangeMaxBolus || //
-                entryType == PumpHistoryEntryType.ChangeMaxBasal || //
-                entryType == PumpHistoryEntryType.ChangeTempBasalType || //
-
-                entryType == PumpHistoryEntryType.ChangeBasalProfile_NewProfile || // Basal profile
-
-                entryType == PumpHistoryEntryType.DailyTotals515 || // Daily Totals
-                entryType == PumpHistoryEntryType.DailyTotals522 || //
-                entryType == PumpHistoryEntryType.DailyTotals523 || //
-                entryType == PumpHistoryEntryType.EndResultTotals);
-    }
-
-
-    public static boolean isRelevantEntry() {
-        return true;
-    }
-
-
-    public int getCode() {
-        return this.opCode;
-    }
-
-
-    public int getTotalLength(MedtronicDeviceType medtronicDeviceType) {
-        if (hasSpecialRules()) {
-            return getHeadLength(medtronicDeviceType) + getBodyLength(medtronicDeviceType) + getDateLength();
-        } else {
-            return totalLength;
-        }
-    }
-
-
-    private boolean hasSpecialRules() {
-        return hasSpecialRules;
-    }
-
-
-    void addSpecialRuleHead(SpecialRule rule) {
-        if (isEmpty(specialRulesHead)) {
-            specialRulesHead = new ArrayList<>();
-        }
-
-        specialRulesHead.add(rule);
-        hasSpecialRules = true;
-    }
-
-
-    void addSpecialRuleBody(SpecialRule rule) {
-        if (isEmpty(specialRulesBody)) {
-            specialRulesBody = new ArrayList<>();
-        }
-
-        specialRulesBody.add(rule);
-        hasSpecialRules = true;
-    }
-
-
-    public int getOpCode() {
-        return opCode;
-    }
-
-
-    public String getDescription() {
-        return this.description == null ? name() : this.description;
-    }
-
-
-    public int getHeadLength(MedtronicDeviceType medtronicDeviceType) {
-        if (hasSpecialRules) {
-            if (isNotEmpty(specialRulesHead)) {
-                return determineSizeByRule(medtronicDeviceType, headLength, specialRulesHead);
-            } else {
-                return headLength;
-            }
-        } else {
-            return headLength;
-        }
-    }
-
-
-    public int getDateLength() {
-        return dateLength;
-    }
-
-
-    public int getBodyLength(MedtronicDeviceType medtronicDeviceType) {
-        if (hasSpecialRules) {
-            if (isNotEmpty(specialRulesBody)) {
-                return determineSizeByRule(medtronicDeviceType, bodyLength, specialRulesBody);
-            } else {
-                return bodyLength;
-            }
-        } else {
-            return bodyLength;
-        }
-    }
-
-
-    private boolean isNotEmpty(List list) {
-        return list != null && !list.isEmpty();
-    }
-
-
-    private boolean isEmpty(List list) {
-        return list == null || list.isEmpty();
-    }
-
-
-    // byte[] dh = { 2, 3 };
-
-    private int determineSizeByRule(MedtronicDeviceType medtronicDeviceType, int defaultValue, List<SpecialRule> rules) {
-        int size = defaultValue;
-
-        for (SpecialRule rule : rules) {
-            if (MedtronicDeviceType.isSameDevice(medtronicDeviceType, rule.deviceType)) {
-                size = rule.size;
-                break;
-            }
-        }
-
-        return size;
-    }
-
-
-    public PumpHistoryEntryGroup getGroup() {
-
-        return group;
-    }
-
-    public static class SpecialRule {
-
-        MedtronicDeviceType deviceType;
-        int size;
-
-
-        SpecialRule(MedtronicDeviceType deviceType, int size) {
-            this.deviceType = deviceType;
-            this.size = size;
-        }
-    }
-
-}
diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/pump/PumpHistoryEntryType.kt b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/pump/PumpHistoryEntryType.kt
new file mode 100644
index 0000000000..1c2dc301f2
--- /dev/null
+++ b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/pump/PumpHistoryEntryType.kt
@@ -0,0 +1,266 @@
+package info.nightscout.androidaps.plugins.pump.medtronic.comm.history.pump
+
+import info.nightscout.androidaps.plugins.pump.common.defs.PumpHistoryEntryGroup
+import info.nightscout.androidaps.plugins.pump.medtronic.defs.MedtronicDeviceType
+import java.util.*
+
+/**
+ * This file was taken from GGC - GNU Gluco Control (ggc.sourceforge.net), application for diabetes
+ * management and modified/extended for AAPS.
+ *
+ *
+ * Author: Andy {andy.rozman@gmail.com}
+ */
+enum class PumpHistoryEntryType // implements CodeEnum
+constructor(var code: Byte,
+            var description: String,
+            var group: PumpHistoryEntryGroup,
+            var headLength: Int = 2,
+            var dateLength: Int = 5,
+            var bodyLength: Int = 0) {
+
+    // all commented out are probably not the real items
+    None(0, "None", PumpHistoryEntryGroup.Unknown, 1, 0, 0),
+    Bolus(0x01, "Bolus", PumpHistoryEntryGroup.Bolus, 4, 5, 0),  // 523+[H=8] 9/13
+    Prime(0x03, "Prime", PumpHistoryEntryGroup.Prime, 5, 5, 0),  //
+
+    //    /**/EventUnknown_MM522_0x05((byte) 0x05, "Unknown Event 0x05", PumpHistoryEntryGroup.Unknown, 2, 5, 28), //
+    NoDeliveryAlarm(0x06, "No Delivery", PumpHistoryEntryGroup.Alarm, 4, 5, 0),  //
+    EndResultTotals(0x07, "End Result Totals", PumpHistoryEntryGroup.Statistic, 5, 2, 0), ChangeBasalProfile_OldProfile(0x08, "Change Basal Profile (Old)", PumpHistoryEntryGroup.Basal, 2, 5, 145), ChangeBasalProfile_NewProfile(0x09, "Change Basal Profile (New)", PumpHistoryEntryGroup.Basal, 2, 5, 145),  //
+
+    //    /**/EventUnknown_MM512_0x10(0x10, "Unknown Event 0x10", PumpHistoryEntryGroup.Unknown), // 29, 5, 0
+    CalBGForPH(0x0a, "BG Capture", PumpHistoryEntryGroup.Glucose),  //
+    SensorAlert(0x0b, "Sensor Alert", PumpHistoryEntryGroup.Alarm, 3, 5, 0),  // Ian08
+    ClearAlarm(0x0c, "Clear Alarm", PumpHistoryEntryGroup.Alarm, 2, 5, 0),  // 2,5,4
+    ChangeBasalPattern(0x14, "Change Basal Pattern", PumpHistoryEntryGroup.Basal),  //
+    TempBasalDuration(0x16, "TBR Duration", PumpHistoryEntryGroup.Basal),  //
+    ChangeTime(0x17, "Change Time", PumpHistoryEntryGroup.Configuration),  //
+    NewTimeSet(0x18, "New Time Set", PumpHistoryEntryGroup.Notification),  //
+    LowBattery(0x19, "LowBattery", PumpHistoryEntryGroup.Notification),  //
+    BatteryChange(0x1a, "Battery Change", PumpHistoryEntryGroup.Notification),  //
+    SetAutoOff(0x1b, "Set Auto Off", PumpHistoryEntryGroup.Configuration),  //
+    SuspendPump(0x1e, "Suspend", PumpHistoryEntryGroup.Basal),  //
+    ResumePump(0x1f, "Resume", PumpHistoryEntryGroup.Basal),  //
+    SelfTest(0x20, "Self Test", PumpHistoryEntryGroup.Statistic),  //
+    Rewind(0x21, "Rewind", PumpHistoryEntryGroup.Prime),  //
+    ClearSettings(0x22, "Clear Settings", PumpHistoryEntryGroup.Configuration),  //
+    ChangeChildBlockEnable(0x23, "Change Child Block Enable", PumpHistoryEntryGroup.Configuration),  //
+    ChangeMaxBolus(0x24, "Change Max Bolus", PumpHistoryEntryGroup.Configuration),  //
+
+    //    /**/EventUnknown_MM522_0x25(0x25, "Unknown Event 0x25", PumpHistoryEntryGroup.Unknown), // 8?
+    EnableDisableRemote(0x26, "Enable/Disable Remote", PumpHistoryEntryGroup.Configuration, 2, 5, 14),  // 2, 5, 14 V6:2,5,14
+    ChangeRemoteId(0x27, "Change Remote ID", PumpHistoryEntryGroup.Configuration),  // ??
+    ChangeMaxBasal(0x2c, "Change Max Basal", PumpHistoryEntryGroup.Configuration),  //
+    BolusWizardEnabled(0x2d, "Bolus Wizard Enabled", PumpHistoryEntryGroup.Configuration),  // V3 ?
+    /* TODO */ EventUnknown_MM512_0x2e(0x2e, "Unknown Event 0x2e", PumpHistoryEntryGroup.Unknown, 2, 5, 100),  //
+    BolusWizard512(0x2f, "Bolus Wizard (512)", PumpHistoryEntryGroup.Bolus, 2, 5, 12),  //
+    UnabsorbedInsulin512(0x30, "Unabsorbed Insulin (512)", PumpHistoryEntryGroup.Statistic, 5, 0, 0),
+    ChangeBGReminderOffset(0x31, "Change BG Reminder Offset", PumpHistoryEntryGroup.Configuration),  //
+    ChangeAlarmClockTime(0x32, "Change Alarm Clock Time", PumpHistoryEntryGroup.Configuration),  //
+    TempBasalRate(0x33, "TBR Rate", PumpHistoryEntryGroup.Basal, 2, 5, 1),  //
+    LowReservoir(0x34, "Low Reservoir", PumpHistoryEntryGroup.Notification),  //
+    ChangeAlarmClock(0x35, "Change Alarm Clock", PumpHistoryEntryGroup.Configuration),  //
+    ChangeMeterId(0x36, "Change Meter ID", PumpHistoryEntryGroup.Configuration),  //
+
+    //    /**/EventUnknown_MM512_0x37(0x37, "Unknown Event 0x37", PumpHistoryEntryGroup.Unknown), // V:MM512
+    //    /**/EventUnknown_MM512_0x38(0x38, "Unknown Event 0x38", PumpHistoryEntryGroup.Unknown), //
+    BGReceived512(0x39, "BG Received (512)", PumpHistoryEntryGroup.Glucose, 2, 5, 3),  //
+    /* TODO */ ConfirmInsulinChange(0x3a, "Confirm Insulin Change", PumpHistoryEntryGroup.Unknown),  //
+    SensorStatus(0x3b, "Sensor Status", PumpHistoryEntryGroup.Glucose),  //
+    ChangeParadigmID(0x3c, "Change Paradigm ID", PumpHistoryEntryGroup.Configuration, 2, 5, 14),  // V3 ? V6: 2,5,14 ?? is it this length or just 7
+
+    //    EventUnknown_MM512_0x3D(0x3d, "Unknown Event 0x3D", PumpHistoryEntryGroup.Unknown), //
+    //    EventUnknown_MM512_0x3E(0x3e, "Unknown Event 0x3E", PumpHistoryEntryGroup.Unknown), //
+    BGReceived(0x3f, "BG Received", PumpHistoryEntryGroup.Glucose, 2, 5, 3),  // Ian3F
+    JournalEntryMealMarker(0x40, "Meal Marker", PumpHistoryEntryGroup.Bolus, 2, 5, 2),  // is size just 7??? V6
+    JournalEntryExerciseMarker(0x41, "Exercise Marker", PumpHistoryEntryGroup.Bolus, 2, 5, 1),  // ??
+    JournalEntryInsulinMarker(0x42, "Insulin Marker", PumpHistoryEntryGroup.Bolus, 2, 5, 0),  // V6 = body(0)/was=1
+    JournalEntryOtherMarker(0x43, "Other Marker", PumpHistoryEntryGroup.Bolus, 2, 5, 1),  // V6 = body(1) was=0
+    EnableSensorAutoCal(0x44, "Enable Sensor AutoCal", PumpHistoryEntryGroup.Glucose),  //
+
+    //    /**/EventUnknown_MM522_0x45(0x45, "Unknown Event 0x45", PumpHistoryEntryGroup.Unknown, 2, 5, 1), //
+    //    /**/EventUnknown_MM522_0x46(0x46, "Unknown Event 0x46", PumpHistoryEntryGroup.Unknown, 2, 5, 1), //
+    //    /**/EventUnknown_MM522_0x47(0x47, "Unknown Event 0x47", PumpHistoryEntryGroup.Unknown, 2, 5, 1), //
+    //    /**/EventUnknown_MM522_0x48(0x48, "Unknown Event 0x48", PumpHistoryEntryGroup.Unknown, 2, 5, 1), //
+    //    /**/EventUnknown_MM522_0x49(0x49, "Unknown Event 0x49", PumpHistoryEntryGroup.Unknown, 2, 5, 1), //
+    //    /**/EventUnknown_MM522_0x4a(0x4a, "Unknown Event 0x4a", PumpHistoryEntryGroup.Unknown, 2, 5, 1), //
+    //    /**/EventUnknown_MM522_0x4b(0x4b, "Unknown Event 0x4b", PumpHistoryEntryGroup.Unknown, 2, 5, 1), //
+    //    /**/EventUnknown_MM522_0x4c(0x4c, "Unknown Event 0x4c", PumpHistoryEntryGroup.Unknown, 2, 5, 1), //
+    //    /**/EventUnknown_0x4d(0x4d, "Unknown Event 0x4d", PumpHistoryEntryGroup.Unknown), // V5: 512: 7, 522: 8 ????NS
+    //    /**/EventUnknown_MM512_0x4e(0x4e, "Unknown Event 0x4e", PumpHistoryEntryGroup.Unknown), // /**/
+    BolusWizardSetup512(0x4f, "Bolus Wizard Setup (512)", PumpHistoryEntryGroup.Configuration, 2, 5, 32),  //
+    ChangeSensorSetup2(0x50, "Sensor Setup2", PumpHistoryEntryGroup.Configuration, 2, 5, 30),  // Ian50
+
+    /* TODO */ Sensor_0x51(0x51, "Unknown Event 0x51", PumpHistoryEntryGroup.Unknown),  //
+    /* TODO */ Sensor_0x52(0x52, "Unknown Event 0x52", PumpHistoryEntryGroup.Unknown),  //
+    ChangeSensorAlarmSilenceConfig(0x53, "Sensor Alarm Silence Config", PumpHistoryEntryGroup.Configuration, 2, 5, 1),  // 8
+    /* TODO */ Sensor_0x54(0x54, "Unknown Event 0x54", PumpHistoryEntryGroup.Unknown),  // Ian54
+    /* TODO */ Sensor_0x55(0x55, "Unknown Event 0x55", PumpHistoryEntryGroup.Unknown),  //
+    ChangeSensorRateOfChangeAlertSetup(0x56, "Sensor Rate Of Change Alert Setup", PumpHistoryEntryGroup.Configuration, 2, 5, 5),  // 12
+    ChangeBolusScrollStepSize(0x57, "Change Bolus Scroll Step Size", PumpHistoryEntryGroup.Configuration),  //
+    BolusWizardSetup(0x5a, "Bolus Wizard Setup (522)", PumpHistoryEntryGroup.Configuration, 2, 5, 117),  // V2: 522+[B=143]; V6: 124, v6: 137, v7: 117/137 [523]
+    BolusWizard(0x5b, "Bolus Wizard Estimate", PumpHistoryEntryGroup.Configuration, 2, 5, 13),  // 15 //
+    UnabsorbedInsulin(0x5c, "Unabsorbed Insulin", PumpHistoryEntryGroup.Statistic, 5, 0, 0),  // head[1] -> body
+    SaveSettings(0x5d, "Save Settings", PumpHistoryEntryGroup.Configuration),  //
+    ChangeVariableBolus(0x5e, "Change Variable Bolus", PumpHistoryEntryGroup.Configuration),  //
+    ChangeAudioBolus(0x5f, "Easy Bolus Enabled", PumpHistoryEntryGroup.Configuration),  // V3 ?
+    ChangeBGReminderEnable(0x60, "BG Reminder Enable", PumpHistoryEntryGroup.Configuration),  // questionable60
+    ChangeAlarmClockEnable(0x61, "Alarm Clock Enable", PumpHistoryEntryGroup.Configuration),  //
+    ChangeTempBasalType(0x62.toByte(), "Change Basal Type", PumpHistoryEntryGroup.Configuration),  // ChangeTempBasalTypePumpEvent
+    ChangeAlarmNotifyMode(0x63, "Change Alarm Notify Mode", PumpHistoryEntryGroup.Configuration),  //
+    ChangeTimeFormat(0x64, "Change Time Format", PumpHistoryEntryGroup.Configuration),  //
+    ChangeReservoirWarningTime(0x65.toByte(), "Change Reservoir Warning Time", PumpHistoryEntryGroup.Configuration),  //
+    ChangeBolusReminderEnable(0x66, "Change Bolus Reminder Enable", PumpHistoryEntryGroup.Configuration),  // 9
+    SetBolusReminderTime(0x67.toByte(), "Change Bolus Reminder Time", PumpHistoryEntryGroup.Configuration, 2, 5, 2),  // 9
+    DeleteBolusReminderTime(0x68.toByte(), "Delete Bolus Reminder Time", PumpHistoryEntryGroup.Configuration, 2, 5, 2),  // 9
+    BolusReminder(0x69, "Bolus Reminder", PumpHistoryEntryGroup.Configuration, 2, 5, 0),  // Ian69
+    DeleteAlarmClockTime(0x6a, "Delete Alarm Clock Time", PumpHistoryEntryGroup.Configuration, 2, 5, 7),  // 14
+    DailyTotals515(0x6c, "Daily Totals (515)", PumpHistoryEntryGroup.Statistic, 1, 2, 35),  // v4: 0,0,36. v5: 1,2,33
+    DailyTotals522(0x6d, "Daily Totals (522)", PumpHistoryEntryGroup.Statistic, 1, 2, 41),  //
+    DailyTotals523(0x6e, "Daily Totals (523)", PumpHistoryEntryGroup.Statistic, 1, 2, 49),  // 1102014-03-17T00:00:00
+    ChangeCarbUnits(0x6f.toByte(), "Change Carb Units", PumpHistoryEntryGroup.Configuration),  //
+
+    //    /**/EventUnknown_MM522_0x70((byte) 0x70, "Unknown Event 0x70", PumpHistoryEntryGroup.Unknown, 2, 5, 1), //
+    BasalProfileStart(0x7b, "Basal Profile Start", PumpHistoryEntryGroup.Basal, 2, 5, 3),  // // 722
+    ChangeWatchdogEnable(0x7c, "Change Watchdog Enable", PumpHistoryEntryGroup.Configuration),  //
+    ChangeOtherDeviceID(0x7d, "Change Other Device ID", PumpHistoryEntryGroup.Configuration, 2, 5, 30),  //
+    ChangeWatchdogMarriageProfile(0x81.toByte(), "Change Watchdog Marriage Profile", PumpHistoryEntryGroup.Configuration, 2, 5, 5),  // 12
+    DeleteOtherDeviceID(0x82.toByte(), "Delete Other Device ID", PumpHistoryEntryGroup.Configuration, 2, 5, 5),  //
+    ChangeCaptureEventEnable(0x83.toByte(), "Change Capture Event Enable", PumpHistoryEntryGroup.Configuration),  //
+
+    //    /**/EventUnknown_MM512_0x88(0x88, "Unknown Event 0x88", PumpHistoryEntryGroup.Unknown), //
+    //    /**/EventUnknown_MM512_0x94(0x94, "Unknown Event 0x94", PumpHistoryEntryGroup.Unknown), //
+    /**/
+    IanA8(0xA8.toByte(), "Ian A8 (Unknown)", PumpHistoryEntryGroup.Unknown, 10, 5, 0),  //
+
+    //    /**/EventUnknown_MM522_0xE8(0xe8, "Unknown Event 0xE8", PumpHistoryEntryGroup.Unknown, 2, 5, 25), //
+    // F0 - F3 are not in go code, but they are in GGC one and thet are used
+    ReadOtherDevicesIDs(0xf0.toByte(), "Read Other Devices IDs", PumpHistoryEntryGroup.Configuration),  // ?
+    ReadCaptureEventEnabled(0xf1.toByte(), "Read Capture Event Enabled", PumpHistoryEntryGroup.Configuration),  // ?
+    ChangeCaptureEventEnable2(0xf2.toByte(), "Change Capture Event Enable2", PumpHistoryEntryGroup.Configuration),  // ?
+    ReadOtherDevicesStatus(0xf3.toByte(), "Read Other Devices Status", PumpHistoryEntryGroup.Configuration),  // ?
+    TempBasalCombined(0xfe.toByte(), "TBR", PumpHistoryEntryGroup.Basal),  //
+    UnknownBasePacket(0xff.toByte(), "Unknown Base Packet", PumpHistoryEntryGroup.Unknown);
+
+    companion object {
+
+        private val opCodeMap: MutableMap<Byte, PumpHistoryEntryType?> = HashMap()
+        fun setSpecialRulesForEntryTypes() {
+            EndResultTotals.addSpecialRuleBody(SpecialRule(MedtronicDeviceType.Medtronic_523andHigher, 3))
+            Bolus.addSpecialRuleHead(SpecialRule(MedtronicDeviceType.Medtronic_523andHigher, 8))
+            BolusWizardSetup.addSpecialRuleBody(SpecialRule(MedtronicDeviceType.Medtronic_523andHigher, 137))
+            BolusWizard.addSpecialRuleBody(SpecialRule(MedtronicDeviceType.Medtronic_523andHigher, 15))
+            BolusReminder.addSpecialRuleBody(SpecialRule(MedtronicDeviceType.Medtronic_523andHigher, 2))
+            ChangeSensorSetup2.addSpecialRuleBody(SpecialRule(MedtronicDeviceType.Medtronic_523andHigher, 34))
+        }
+
+        fun getByCode(opCode: Byte): PumpHistoryEntryType {
+            return if (opCodeMap.containsKey(opCode)) {
+                opCodeMap[opCode]!!
+            } else {
+                UnknownBasePacket
+            }
+        }
+
+        fun isAAPSRelevantEntry(entryType: PumpHistoryEntryType): Boolean {
+            return entryType == Bolus || // Treatments
+                entryType == TempBasalRate || //
+                entryType == TempBasalDuration || //
+                entryType == Prime || // Pump Status Change
+                entryType == SuspendPump || //
+                entryType == ResumePump || //
+                entryType == Rewind || //
+                entryType == NoDeliveryAlarm || // no delivery
+                entryType == BasalProfileStart || //
+                entryType == ChangeTime || // Time Change
+                entryType == NewTimeSet || //
+                entryType == ChangeBasalPattern || // Configuration
+                entryType == ClearSettings || //
+                entryType == SaveSettings || //
+                entryType == ChangeMaxBolus || //
+                entryType == ChangeMaxBasal || //
+                entryType == ChangeTempBasalType || //
+                entryType == ChangeBasalProfile_NewProfile || // Basal profile
+                entryType == DailyTotals515 || // Daily Totals
+                entryType == DailyTotals522 || //
+                entryType == DailyTotals523 || //
+                entryType == EndResultTotals
+        }
+
+        val isRelevantEntry: Boolean
+            get() = true
+
+        init {
+            for (type in values()) {
+                opCodeMap[type.code] = type
+            }
+            setSpecialRulesForEntryTypes()
+        }
+    }
+
+    private val totalLength: Int
+
+    // special rules need to be put in list from highest to lowest (e.g.:
+    // 523andHigher=12, 515andHigher=10 and default (set in cnstr) would be 8)
+    private var specialRulesHead: MutableList<SpecialRule>? = null
+    private var specialRulesBody: MutableList<SpecialRule>? = null
+    private var hasSpecialRules = false
+
+    fun getTotalLength(medtronicDeviceType: MedtronicDeviceType): Int {
+        return if (hasSpecialRules) {
+            getHeadLength(medtronicDeviceType) + getBodyLength(medtronicDeviceType) + dateLength
+        } else {
+            totalLength
+        }
+    }
+
+    fun addSpecialRuleHead(rule: SpecialRule) {
+        if (specialRulesHead.isNullOrEmpty()) {
+            specialRulesHead = ArrayList()
+        }
+        specialRulesHead!!.add(rule)
+        hasSpecialRules = true
+    }
+
+    fun addSpecialRuleBody(rule: SpecialRule) {
+        if (specialRulesBody.isNullOrEmpty()) {
+            specialRulesBody = ArrayList()
+        }
+        specialRulesBody!!.add(rule)
+        hasSpecialRules = true
+    }
+
+    fun getHeadLength(medtronicDeviceType: MedtronicDeviceType): Int {
+        return if (hasSpecialRules && !specialRulesHead.isNullOrEmpty()) {
+            determineSizeByRule(medtronicDeviceType, headLength, specialRulesHead!!)
+        } else {
+            headLength
+        }
+    }
+
+    fun getBodyLength(medtronicDeviceType: MedtronicDeviceType): Int {
+        return if (hasSpecialRules && !specialRulesBody.isNullOrEmpty()) {
+            determineSizeByRule(medtronicDeviceType, bodyLength, specialRulesBody!!)
+        } else {
+            bodyLength
+        }
+    }
+
+    // byte[] dh = { 2, 3 };
+    private fun determineSizeByRule(medtronicDeviceType: MedtronicDeviceType, defaultValue: Int, rules: List<SpecialRule>): Int {
+        var size = defaultValue
+        for (rule in rules) {
+            if (MedtronicDeviceType.isSameDevice(medtronicDeviceType, rule.deviceType)) {
+                size = rule.size
+                break
+            }
+        }
+        return size
+    }
+
+    class SpecialRule internal constructor(var deviceType: MedtronicDeviceType, var size: Int)
+
+    init {
+        totalLength = headLength + dateLength + bodyLength
+    }
+}
\ No newline at end of file
diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/pump/PumpHistoryResult.java b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/pump/PumpHistoryResult.java
deleted file mode 100644
index 4bb67cfb3e..0000000000
--- a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/pump/PumpHistoryResult.java
+++ /dev/null
@@ -1,177 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.medtronic.comm.history.pump;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import info.nightscout.androidaps.logging.AAPSLogger;
-import info.nightscout.androidaps.logging.LTag;
-import info.nightscout.androidaps.plugins.pump.common.utils.DateTimeUtil;
-
-/**
- * History page contains data, sorted from newest to oldest (0=newest..n=oldest)
- * <p>
- * Created by andy on 9/23/18.
- */
-public class PumpHistoryResult {
-
-    private final AAPSLogger aapsLogger;
-
-    private boolean searchFinished = false;
-    private final PumpHistoryEntry searchEntry = null;
-    private Long searchDate = null;
-    private SearchType searchType = SearchType.None;
-    public List<PumpHistoryEntry> unprocessedEntries;
-    public List<PumpHistoryEntry> validEntries;
-
-
-    public PumpHistoryResult(AAPSLogger aapsLogger, PumpHistoryEntry searchEntry, Long targetDate) {
-        this.aapsLogger = aapsLogger;
-        if (searchEntry != null) {
-            /*
-             * this.searchEntry = searchEntry;
-             * this.searchType = SearchType.LastEntry;
-             * aapsLogger.debug(LTag.PUMPCOMM,"PumpHistoryResult. Search parameters: Last Entry: " + searchEntry.atechDateTime + " type="
-             * + searchEntry.getEntryType().name());
-             */
-            this.searchDate = searchEntry.atechDateTime;
-            this.searchType = SearchType.Date;
-            aapsLogger.debug(LTag.PUMPCOMM, "PumpHistoryResult. Search parameters: Date(with searchEntry): " + targetDate);
-        } else if (targetDate != null) {
-            this.searchDate = targetDate;
-            this.searchType = SearchType.Date;
-            aapsLogger.debug(LTag.PUMPCOMM, "PumpHistoryResult. Search parameters: Date: " + targetDate);
-        }
-
-        // this.unprocessedEntries = new ArrayList<>();
-        this.validEntries = new ArrayList<>();
-    }
-
-
-    public void addHistoryEntries(List<PumpHistoryEntry> entries, int page) {
-        this.unprocessedEntries = entries;
-        //aapsLogger.debug(LTag.PUMPCOMM,"PumpHistoryResult. Unprocessed entries: {}", MedtronicUtil.getGsonInstance().toJson(entries));
-        processEntries();
-    }
-
-    // TODO Bug #145 need to check if we had timeChange that went -1, that situation needs to be evaluated separately
-    public void processEntries() {
-        int olderEntries = 0;
-
-        Collections.reverse(this.unprocessedEntries);
-
-        switch (searchType) {
-            case None:
-                //aapsLogger.debug(LTag.PUMPCOMM,"PE. None search");
-                this.validEntries.addAll(this.unprocessedEntries);
-                break;
-
-            case LastEntry: {
-                aapsLogger.debug(LTag.PUMPCOMM, "PE. Last entry search");
-
-                //Collections.sort(this.unprocessedEntries, new PumpHistoryEntry.Comparator());
-
-                aapsLogger.debug(LTag.PUMPCOMM, "PE. PumpHistoryResult. Search entry date: " + searchEntry.atechDateTime);
-
-                Long date = searchEntry.atechDateTime;
-
-                for (PumpHistoryEntry unprocessedEntry : unprocessedEntries) {
-
-                    if (unprocessedEntry.equals(searchEntry)) {
-                        //aapsLogger.debug(LTag.PUMPCOMM,"PE. Item found {}.", unprocessedEntry);
-                        searchFinished = true;
-                        break;
-                    }
-
-                    //aapsLogger.debug(LTag.PUMPCOMM,"PE. Entry {} added.", unprocessedEntry);
-                    this.validEntries.add(unprocessedEntry);
-                }
-            }
-            break;
-            case Date: {
-                aapsLogger.debug(LTag.PUMPCOMM, "PE. Date search: Search date: " + this.searchDate);
-
-
-                for (PumpHistoryEntry unprocessedEntry : unprocessedEntries) {
-
-                    if (unprocessedEntry.atechDateTime == null || unprocessedEntry.atechDateTime == 0) {
-                        aapsLogger.debug(LTag.PUMPCOMM, "PE. PumpHistoryResult. Search entry date: Entry with no date: " + unprocessedEntry);
-                        continue;
-                    }
-
-                    if (unprocessedEntry.isAfter(this.searchDate)) {
-                        this.validEntries.add(unprocessedEntry);
-                    } else {
-//                        aapsLogger.debug(LTag.PUMPCOMM,"PE. PumpHistoryResult. Not after.. Unprocessed Entry [year={},entry={}]",
-//                                DateTimeUtil.getYear(unprocessedEntry.atechDateTime), unprocessedEntry);
-                        if (DateTimeUtil.getYear(unprocessedEntry.atechDateTime) > 2015)
-                            olderEntries++;
-                    }
-                }
-
-                if (olderEntries > 0) {
-                    //Collections.sort(this.validEntries, new PumpHistoryEntry.Comparator());
-
-                    searchFinished = true;
-                }
-            }
-            break;
-
-        } // switch
-
-        //aapsLogger.debug(LTag.PUMPCOMM,"PE. Valid Entries: {}", validEntries);
-    }
-
-
-    public String toString() {
-        return "PumpHistoryResult [unprocessed=" + (unprocessedEntries != null ? "" + unprocessedEntries.size() : "0") + //
-                ", valid=" + (validEntries != null ? "" + validEntries.size() : "0") + //
-                ", searchEntry=" + searchEntry + //
-                ", searchDate=" + searchDate + //
-                ", searchType=" + searchType + //
-                ", searchFinished=" + searchFinished + //
-                "]";
-
-    }
-
-
-    /**
-     * Return latest entry (entry with highest date time)
-     *
-     * @return
-     */
-    public PumpHistoryEntry getLatestEntry() {
-        if (this.validEntries == null || this.validEntries.size() == 0)
-            return null;
-        else {
-            return this.validEntries.get(0);
-            // PumpHistoryEntry pumpHistoryEntry = this.validEntries.get(0);
-            //
-            // if (pumpHistoryEntry.getEntryType() == PumpHistoryEntryType.EndResultTotals)
-            // return pumpHistoryEntry;
-            // else
-            // return this.validEntries.get(1);
-        }
-    }
-
-
-    public boolean isSearchRequired() {
-        return searchType != SearchType.None;
-    }
-
-
-    public boolean isSearchFinished() {
-        return searchFinished;
-    }
-
-
-    public List<PumpHistoryEntry> getValidEntries() {
-        return validEntries;
-    }
-
-    enum SearchType {
-        None, //
-        LastEntry, //
-        Date
-    }
-}
diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/pump/PumpHistoryResult.kt b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/pump/PumpHistoryResult.kt
new file mode 100644
index 0000000000..7bdc42d1ef
--- /dev/null
+++ b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/pump/PumpHistoryResult.kt
@@ -0,0 +1,130 @@
+package info.nightscout.androidaps.plugins.pump.medtronic.comm.history.pump
+
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.pump.common.utils.DateTimeUtil
+import java.util.*
+import kotlin.collections.ArrayList
+
+/**
+ * History page contains data, sorted from newest to oldest (0=newest..n=oldest)
+ *
+ *
+ * Created by andy on 9/23/18.
+ */
+class PumpHistoryResult(private val aapsLogger: AAPSLogger, searchEntry: PumpHistoryEntry?, targetDate: Long?) {
+
+    var isSearchFinished = false
+        private set
+    private val searchEntry: PumpHistoryEntry? = null
+    private var searchDate: Long? = null
+    private var searchType = SearchType.None
+    var unprocessedEntries: List<PumpHistoryEntry> = ArrayList()
+    var validEntries: MutableList<PumpHistoryEntry> = ArrayList()
+
+    fun addHistoryEntries(entries: List<PumpHistoryEntry> /*, page: Int*/) {
+        unprocessedEntries = entries
+        //aapsLogger.debug(LTag.PUMPCOMM,"PumpHistoryResult. Unprocessed entries: {}", MedtronicUtil.getGsonInstance().toJson(entries));
+        processEntries()
+    }
+
+    // TODO Bug #145 need to check if we had timeChange that went -1, that situation needs to be evaluated separately
+    fun processEntries() {
+        var olderEntries = 0
+        Collections.reverse(unprocessedEntries)
+        when (searchType) {
+            SearchType.None      ->                 //aapsLogger.debug(LTag.PUMPCOMM,"PE. None search");
+                validEntries.addAll(unprocessedEntries)
+
+            SearchType.LastEntry -> {
+                aapsLogger.debug(LTag.PUMPCOMM, "PE. Last entry search")
+
+                //Collections.sort(this.unprocessedEntries, new PumpHistoryEntry.Comparator());
+                aapsLogger.debug(LTag.PUMPCOMM, "PE. PumpHistoryResult. Search entry date: " + searchEntry!!.atechDateTime)
+                //val date = searchEntry.atechDateTime
+                for (unprocessedEntry in unprocessedEntries) {
+                    if (unprocessedEntry.equals(searchEntry)) {
+                        //aapsLogger.debug(LTag.PUMPCOMM,"PE. Item found {}.", unprocessedEntry);
+                        isSearchFinished = true
+                        break
+                    }
+
+                    //aapsLogger.debug(LTag.PUMPCOMM,"PE. Entry {} added.", unprocessedEntry);
+
+                    validEntries.add(unprocessedEntry)
+                }
+                // TODO 5minutes back
+            }
+
+            SearchType.Date      -> {
+                aapsLogger.debug(LTag.PUMPCOMM, "PE. Date search: Search date: " + searchDate)
+                for (unprocessedEntry in unprocessedEntries) {
+                    if (unprocessedEntry.atechDateTime == 0L) {
+                        aapsLogger.debug(LTag.PUMPCOMM, "PE. PumpHistoryResult. Search entry date: Entry with no date: $unprocessedEntry")
+                        continue
+                    }
+                    if (unprocessedEntry.isAfter(searchDate!!)) {
+                        validEntries.add(unprocessedEntry)
+                    } else {
+//                        aapsLogger.debug(LTag.PUMPCOMM,"PE. PumpHistoryResult. Not after.. Unprocessed Entry [year={},entry={}]",
+//                                DateTimeUtil.getYear(unprocessedEntry.atechDateTime), unprocessedEntry);
+                        if (DateTimeUtil.getYear(unprocessedEntry.atechDateTime) > 2015) olderEntries++
+                    }
+                }
+                if (olderEntries > 0) {
+                    //Collections.sort(this.validEntries, new PumpHistoryEntry.Comparator());
+                    isSearchFinished = true
+                }
+            }
+        }
+
+        //aapsLogger.debug(LTag.PUMPCOMM,"PE. Valid Entries: {}", validEntries);
+    }
+
+    override fun toString(): String {
+        return "PumpHistoryResult [unprocessed=" + unprocessedEntries.size +  //
+            ", valid=" + validEntries.size +  //
+            ", searchEntry=" + searchEntry +  //
+            ", searchDate=" + searchDate +  //
+            ", searchType=" + searchType +  //
+            ", searchFinished=" + isSearchFinished +  //
+            "]"
+    }
+
+    /**
+     * Return latest entry (entry with highest date time)
+     * @return
+     */
+    val latestEntry: PumpHistoryEntry?
+        get() = if (validEntries.size == 0) null else validEntries[0]
+
+    // val isSearchRequired: Boolean
+    //     get() = searchType != SearchType.None
+
+    internal enum class SearchType {
+        None,  //
+        LastEntry,  //
+        Date
+    }
+
+    init {
+        if (searchEntry != null) {
+            /*
+             * this.searchEntry = searchEntry;
+             * this.searchType = SearchType.LastEntry;
+             * aapsLogger.debug(LTag.PUMPCOMM,"PumpHistoryResult. Search parameters: Last Entry: " + searchEntry.atechDateTime + " type="
+             * + searchEntry.getEntryType().name());
+             */
+            searchDate = searchEntry.atechDateTime
+            searchType = SearchType.Date
+            aapsLogger.debug(LTag.PUMPCOMM, "PumpHistoryResult. Search parameters: Date(with searchEntry): $targetDate")
+        } else if (targetDate != null) {
+            searchDate = targetDate
+            searchType = SearchType.Date
+            aapsLogger.debug(LTag.PUMPCOMM, "PumpHistoryResult. Search parameters: Date: $targetDate")
+        }
+
+        // this.unprocessedEntries = new ArrayList<>();
+        //validEntries = ArrayList()
+    }
+}
\ No newline at end of file
diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/message/CarelinkLongMessageBody.java b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/message/CarelinkLongMessageBody.java
deleted file mode 100644
index 7f2c51e032..0000000000
--- a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/message/CarelinkLongMessageBody.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.medtronic.comm.message;
-
-/**
- * Created by geoff on 6/2/16.
- */
-public class CarelinkLongMessageBody extends MessageBody {
-
-    private static final int LONG_MESSAGE_BODY_LENGTH = 65;
-    protected byte[] data;
-
-
-    CarelinkLongMessageBody() {
-        init(new byte[0]);
-    }
-
-
-    public CarelinkLongMessageBody(byte[] payload) {
-        init(payload);
-    }
-
-    @Override
-    public void init(byte[] rxData) {
-
-        if (rxData != null && rxData.length == LONG_MESSAGE_BODY_LENGTH) {
-            data = rxData;
-        } else {
-            data = new byte[LONG_MESSAGE_BODY_LENGTH];
-            if (rxData != null) {
-                int size = rxData.length < LONG_MESSAGE_BODY_LENGTH ? rxData.length : LONG_MESSAGE_BODY_LENGTH;
-                for (int i = 0; i < size; i++) {
-                    data[i] = rxData[i];
-                }
-            }
-        }
-    }
-
-
-    @Override
-    public int getLength() {
-        return LONG_MESSAGE_BODY_LENGTH;
-    }
-
-
-    @Override
-    public byte[] getTxData() {
-        return data;
-    }
-
-}
diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/message/CarelinkLongMessageBody.kt b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/message/CarelinkLongMessageBody.kt
new file mode 100644
index 0000000000..e46e8feb6a
--- /dev/null
+++ b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/message/CarelinkLongMessageBody.kt
@@ -0,0 +1,46 @@
+package info.nightscout.androidaps.plugins.pump.medtronic.comm.message
+
+/**
+ * Created by geoff on 6/2/16.
+ */
+open class CarelinkLongMessageBody : MessageBody {
+
+    //protected var data: ByteArray? = null
+
+    internal constructor() {
+        init(ByteArray(0))
+    }
+
+    constructor(payload: ByteArray) {
+        init(payload)
+    }
+
+    override fun init(rxData: ByteArray?) {
+        if (rxData != null && rxData.size == LONG_MESSAGE_BODY_LENGTH) {
+            data = rxData
+        } else {
+            data = ByteArray(LONG_MESSAGE_BODY_LENGTH)
+            if (rxData != null) {
+                val size = if (rxData.size < LONG_MESSAGE_BODY_LENGTH) rxData.size else LONG_MESSAGE_BODY_LENGTH
+                for (i in 0 until size) {
+                    data!![i] = rxData[i]
+                }
+            }
+        }
+    }
+
+    override val length: Int
+        get() = LONG_MESSAGE_BODY_LENGTH
+
+    // {
+    //     return LONG_MESSAGE_BODY_LENGTH
+    // }
+
+    // override fun getTxData(): ByteArray {
+    //     return data
+    // }
+
+    companion object {
+        private const val LONG_MESSAGE_BODY_LENGTH = 65
+    }
+}
\ No newline at end of file
diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/message/CarelinkShortMessageBody.java b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/message/CarelinkShortMessageBody.java
deleted file mode 100644
index e2ebbff085..0000000000
--- a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/message/CarelinkShortMessageBody.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.medtronic.comm.message;
-
-/**
- * Created by geoff on 5/29/16.
- */
-// Andy: See comments in message body
-public class CarelinkShortMessageBody extends MessageBody {
-
-    byte[] body;
-
-
-    public CarelinkShortMessageBody() {
-        init(new byte[] { 0 });
-    }
-
-
-    public CarelinkShortMessageBody(byte[] data) {
-        init(data);
-    }
-
-
-    @Override
-    public int getLength() {
-        return body.length;
-    }
-
-
-    @Override
-    public void init(byte[] rxData) {
-        body = rxData;
-    }
-
-
-    public byte[] getRxData() {
-        return body;
-    }
-
-
-    public void setRxData(byte[] rxData) {
-        init(rxData);
-    }
-
-
-    @Override
-    public byte[] getTxData() {
-        return body;
-    }
-
-
-    public void setTxData(byte[] txData) {
-        init(txData);
-    }
-}
diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/message/CarelinkShortMessageBody.kt b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/message/CarelinkShortMessageBody.kt
new file mode 100644
index 0000000000..7d99b45ae2
--- /dev/null
+++ b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/message/CarelinkShortMessageBody.kt
@@ -0,0 +1,38 @@
+package info.nightscout.androidaps.plugins.pump.medtronic.comm.message
+
+/**
+ * Created by geoff on 5/29/16.
+ */
+// Andy: See comments in message body
+open class CarelinkShortMessageBody : MessageBody {
+
+    //var body: ByteArray?
+
+    constructor() {
+        init(byteArrayOf(0))
+    }
+
+    constructor(data: ByteArray?) {
+        init(data)
+    }
+
+    override val length: Int
+        get() = data!!.size
+
+    override fun init(rxData: ByteArray?) {
+        data = rxData
+    }
+
+    var rxData: ByteArray?
+        get() = data
+        set(rxData) {
+            init(rxData)
+        }
+
+    // override var txData: ByteArray?
+    //     get() = body
+    //     set(txData) {
+    //         init(txData)
+    //     }
+
+}
\ No newline at end of file
diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/message/GetHistoryPageCarelinkMessageBody.java b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/message/GetHistoryPageCarelinkMessageBody.java
deleted file mode 100644
index 25e8aa087c..0000000000
--- a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/message/GetHistoryPageCarelinkMessageBody.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.medtronic.comm.message;
-
-import info.nightscout.androidaps.plugins.pump.common.utils.ByteUtil;
-
-/**
- * Created by geoff on 6/2/16.
- */
-public class GetHistoryPageCarelinkMessageBody extends CarelinkLongMessageBody {
-
-    // public boolean wasLastFrame = false;
-    // public int frameNumber = 0;
-    // public byte[] frame = new byte[] {};
-
-    public GetHistoryPageCarelinkMessageBody(byte[] frameData) {
-        init(frameData);
-    }
-
-
-    public GetHistoryPageCarelinkMessageBody(int pageNum) {
-        init(pageNum);
-    }
-
-
-    @Override
-    public int getLength() {
-        return data.length;
-    }
-
-
-    @Override
-    public void init(byte[] rxData) {
-        super.init(rxData);
-    }
-
-
-    public void init(int pageNum) {
-        byte numArgs = 1;
-        super.init(new byte[] { numArgs, (byte)pageNum });
-    }
-
-
-    public int getFrameNumber() {
-        if (data.length > 0) {
-            return data[0] & 0x7f;
-        }
-        return 255;
-    }
-
-
-    public boolean wasLastFrame() {
-        return (data[0] & 0x80) != 0;
-    }
-
-
-    public byte[] getFrameData() {
-        return ByteUtil.substring(data, 1, data.length - 1);
-    }
-
-}
diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/message/GetHistoryPageCarelinkMessageBody.kt b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/message/GetHistoryPageCarelinkMessageBody.kt
new file mode 100644
index 0000000000..574bbacc9f
--- /dev/null
+++ b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/message/GetHistoryPageCarelinkMessageBody.kt
@@ -0,0 +1,47 @@
+package info.nightscout.androidaps.plugins.pump.medtronic.comm.message
+
+import info.nightscout.androidaps.plugins.pump.common.utils.ByteUtil
+import kotlin.experimental.and
+
+/**
+ * Created by geoff on 6/2/16.
+ */
+class GetHistoryPageCarelinkMessageBody : CarelinkLongMessageBody {
+
+    // public boolean wasLastFrame = false;
+    // public int frameNumber = 0;
+    // public byte[] frame = new byte[] {};
+    constructor(frameData: ByteArray?) {
+        init(frameData)
+    }
+
+    constructor(pageNum: Int) {
+        init(pageNum)
+    }
+
+    override val length: Int
+        get() = data!!.size
+
+    fun init(pageNum: Int) {
+        val numArgs: Byte = 1
+        super.init(byteArrayOf(numArgs, pageNum.toByte()))
+    }
+
+    val frameNumber: Int
+        get() = if (data!!.size > 0) {
+            (data!![0] and 0x7f.toByte()).toInt()
+        } else 255
+
+    fun wasLastFrame(): Boolean {
+        return (data!![0] and 0x80.toByte()).toInt() != 0
+    }
+
+    val frameData: ByteArray
+        get() {
+            return if (data == null) {
+                byteArrayOf()
+            } else {
+                ByteUtil.substring(data!!, 1, data!!.size - 1)
+            }
+        }
+}
\ No newline at end of file
diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/message/MessageBody.java b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/message/MessageBody.java
deleted file mode 100644
index fa4a3817be..0000000000
--- a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/message/MessageBody.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.medtronic.comm.message;
-
-import info.nightscout.androidaps.plugins.pump.common.utils.ByteUtil;
-
-/**
- * Created by geoff on 5/29/16.
- */
-public class MessageBody {
-
-    public int getLength() {
-        return 0;
-    }
-
-
-    public void init(byte[] rxData) {
-    }
-
-
-    public byte[] getTxData() {
-        return new byte[]{};
-    }
-
-
-    public String toString() {
-        StringBuilder sb = new StringBuilder(getClass().getSimpleName());
-
-        sb.append(" [txData=");
-        sb.append(ByteUtil.shortHexString(getTxData()));
-        sb.append("]");
-
-        return sb.toString();
-    }
-
-}
diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/message/MessageBody.kt b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/message/MessageBody.kt
new file mode 100644
index 0000000000..45bfdcf5de
--- /dev/null
+++ b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/message/MessageBody.kt
@@ -0,0 +1,27 @@
+package info.nightscout.androidaps.plugins.pump.medtronic.comm.message
+
+import info.nightscout.androidaps.plugins.pump.common.utils.ByteUtil
+
+/**
+ * Created by geoff on 5/29/16.
+ */
+open class MessageBody {
+
+    protected var data: ByteArray? = null
+
+    open val length: Int
+        get() = 0
+
+    open fun init(rxData: ByteArray?) {}
+
+    open val txData: ByteArray?
+        get() = if (data == null) byteArrayOf() else data
+
+    override fun toString(): String {
+        val sb = StringBuilder(javaClass.simpleName)
+        sb.append(" [txData=")
+        sb.append(ByteUtil.shortHexString(txData))
+        sb.append("]")
+        return sb.toString()
+    }
+}
\ No newline at end of file
diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/message/PacketType.java b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/message/PacketType.java
deleted file mode 100644
index f153dd8cac..0000000000
--- a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/message/PacketType.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.medtronic.comm.message;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * Created by geoff on 5/29/16.
- * refactored into enum
- */
-public enum PacketType {
-    Invalid(0x00), //
-    MySentry(0xa2), //
-    Meter(0xa5), //
-    Carelink(0xa7), //
-    Sensor(0xa8) //
-    ;
-
-    public static Map<Byte, PacketType> mapByValue;
-
-    static {
-        mapByValue = new HashMap<>();
-
-        for (PacketType packetType : values()) {
-            mapByValue.put(packetType.value, packetType);
-        }
-    }
-
-    private final byte value;
-
-
-    PacketType(int value) {
-        this.value = (byte)value;
-    }
-
-
-    public static PacketType getByValue(short value) {
-        if (mapByValue.containsKey(value))
-            return mapByValue.get(value);
-        else
-            return PacketType.Invalid;
-    }
-
-
-    public byte getValue() {
-        return value;
-    }
-}
diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/message/PacketType.kt b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/message/PacketType.kt
new file mode 100644
index 0000000000..68769944b1
--- /dev/null
+++ b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/message/PacketType.kt
@@ -0,0 +1,37 @@
+package info.nightscout.androidaps.plugins.pump.medtronic.comm.message
+
+import java.util.*
+
+/**
+ * Created by geoff on 5/29/16.
+ * refactored into enum
+ */
+enum class PacketType(value: Int) {
+
+    Invalid(0x00),  //
+    MySentry(0xa2),  //
+    Meter(0xa5),  //
+    Carelink(0xa7),  //
+    Sensor(0xa8 //
+    );
+
+    companion object {
+        var mapByValue: MutableMap<Byte, PacketType> = HashMap()
+
+        fun getByValue(value: Short): PacketType? {
+            return if (mapByValue.containsKey(value.toByte())) mapByValue.get(value.toByte()) else Invalid
+        }
+
+        init {
+            for (packetType in values()) {
+                mapByValue[packetType.value] = packetType
+            }
+        }
+    }
+
+    val value: Byte
+
+    init {
+        this.value = value.toByte()
+    }
+}
\ No newline at end of file
diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/message/PumpAckMessageBody.java b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/message/PumpAckMessageBody.java
deleted file mode 100644
index 4cfda08975..0000000000
--- a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/message/PumpAckMessageBody.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.medtronic.comm.message;
-
-/**
- * Created by geoff on 5/29/16.
- */
-public class PumpAckMessageBody extends CarelinkShortMessageBody {
-
-    public PumpAckMessageBody() {
-        init(new byte[] { 0 });
-    }
-
-
-    public PumpAckMessageBody(byte[] bodyData) {
-        init(bodyData);
-    }
-}
diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/message/PumpAckMessageBody.kt b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/message/PumpAckMessageBody.kt
new file mode 100644
index 0000000000..39d85deb44
--- /dev/null
+++ b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/message/PumpAckMessageBody.kt
@@ -0,0 +1,15 @@
+package info.nightscout.androidaps.plugins.pump.medtronic.comm.message
+
+/**
+ * Created by geoff on 5/29/16.
+ */
+class PumpAckMessageBody : CarelinkShortMessageBody {
+
+    constructor() {
+        init(byteArrayOf(0))
+    }
+
+    constructor(bodyData: ByteArray?) {
+        init(bodyData)
+    }
+}
\ No newline at end of file
diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/message/PumpMessage.java b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/message/PumpMessage.java
deleted file mode 100644
index 71d50c4691..0000000000
--- a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/message/PumpMessage.java
+++ /dev/null
@@ -1,214 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.medtronic.comm.message;
-
-import info.nightscout.androidaps.logging.AAPSLogger;
-import info.nightscout.androidaps.logging.LTag;
-import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.data.RLMessage;
-import info.nightscout.androidaps.plugins.pump.common.utils.ByteUtil;
-import info.nightscout.androidaps.plugins.pump.medtronic.defs.MedtronicCommandType;
-
-/**
- * Created by geoff on 5/29/16.
- */
-public class PumpMessage implements RLMessage {
-
-    private final AAPSLogger aapsLogger;
-
-    private PacketType packetType = PacketType.Carelink;
-    public byte[] address = new byte[]{0, 0, 0};
-    public MedtronicCommandType commandType;
-    public Byte invalidCommandType;
-    public MessageBody messageBody = new MessageBody();
-    public String error = null;
-
-    public static final int FRAME_DATA_LENGTH = 64;
-
-
-    public PumpMessage(AAPSLogger aapsLogger, String error) {
-        this.error = error;
-        this.aapsLogger = aapsLogger;
-    }
-
-
-    public PumpMessage(AAPSLogger aapsLogger, byte[] rxData) {
-        this.aapsLogger = aapsLogger;
-        init(rxData);
-    }
-
-
-    public PumpMessage(AAPSLogger aapsLogger) {
-        this.aapsLogger = aapsLogger;
-    }
-
-
-    public boolean isErrorResponse() {
-        return (this.error != null);
-    }
-
-
-    public void init(PacketType packetType, byte[] address, MedtronicCommandType commandType, MessageBody messageBody) {
-        this.packetType = packetType;
-        this.address = address;
-        this.commandType = commandType;
-        this.messageBody = messageBody;
-    }
-
-
-    public void init(byte[] rxData) {
-        if (rxData == null) {
-            return;
-        }
-        if (rxData.length > 0) {
-            this.packetType = PacketType.getByValue(rxData[0]);
-        }
-        if (rxData.length > 3) {
-            this.address = ByteUtil.substring(rxData, 1, 3);
-        }
-        if (rxData.length > 4) {
-            this.commandType = MedtronicCommandType.getByCode(rxData[4]);
-            if (this.commandType == MedtronicCommandType.InvalidCommand) {
-                aapsLogger.error(LTag.PUMPCOMM, "PumpMessage - Unknown commandType " + rxData[4]);
-            }
-        }
-        if (rxData.length > 5) {
-            this.messageBody = MedtronicCommandType.constructMessageBody(commandType,
-                    ByteUtil.substring(rxData, 5, rxData.length - 5));
-        }
-    }
-
-
-    @Override
-    public byte[] getTxData() {
-        byte[] rval = ByteUtil.concat(new byte[]{packetType.getValue()}, address);
-        rval = ByteUtil.concat(rval, commandType.getCommandCode());
-        rval = ByteUtil.concat(rval, messageBody.getTxData());
-        return rval;
-    }
-
-
-    public byte[] getContents() {
-        return ByteUtil.concat(new byte[]{commandType.getCommandCode()}, messageBody.getTxData());
-    }
-
-
-    // rawContent = just response without code (contents-2, messageBody.txData-1);
-    public byte[] getRawContent() {
-
-        if ((messageBody == null) || (messageBody.getTxData() == null) || (messageBody.getTxData().length == 0))
-            return null;
-
-        byte[] data = messageBody.getTxData();
-
-        int length = ByteUtil.asUINT8(data[0]); // length is not always correct so, we check whole array if we have
-        // data, after length
-        int originalLength = length;
-
-        // check if displayed length is invalid
-        if (length > data.length - 1) {
-            return data;
-        }
-
-        // check Old Way
-        boolean oldWay = false;
-        for (int i = (length + 1); i < data.length; i++) {
-            if (data[i] != 0x00) {
-                oldWay = true;
-            }
-        }
-
-        if (oldWay) {
-            length = data.length - 1;
-        }
-
-        byte[] arrayOut = new byte[length];
-
-        System.arraycopy(messageBody.getTxData(), 1, arrayOut, 0, length);
-
-//        if (isLogEnabled())
-//            LOG.debug("PumpMessage - Length: " + length + ", Original Length: " + originalLength + ", CommandType: "
-//            + commandType);
-
-        return arrayOut;
-    }
-
-
-    public byte[] getRawContentOfFrame() {
-        byte[] raw = messageBody.getTxData();
-        if (raw==null || raw.length==0) {
-            return new byte[0];
-        } else {
-            return ByteUtil.substring(raw, 1, Math.min(FRAME_DATA_LENGTH, raw.length - 1));
-        }
-    }
-
-
-    public boolean isValid() {
-        if (packetType == null)
-            return false;
-        if (address == null)
-            return false;
-        if (commandType == null)
-            return false;
-        return messageBody != null;
-    }
-
-
-    public MessageBody getMessageBody() {
-        return messageBody;
-    }
-
-
-    public String getResponseContent() {
-        StringBuilder sb = new StringBuilder("PumpMessage [response=");
-        boolean showData = true;
-
-        if (commandType != null) {
-            if (commandType == MedtronicCommandType.CommandACK) {
-                sb.append("Acknowledged");
-                showData = false;
-            } else if (commandType == MedtronicCommandType.CommandNAK) {
-                sb.append("NOT Acknowledged");
-                showData = false;
-            } else {
-                sb.append(commandType.name());
-            }
-        } else {
-            sb.append("Unknown_Type");
-            sb.append(" (" + invalidCommandType + ")");
-        }
-
-        if (showData) {
-            sb.append(", rawResponse=");
-            sb.append(ByteUtil.shortHexString(getRawContent()));
-        }
-
-        sb.append("]");
-
-        return sb.toString();
-    }
-
-
-    public String toString() {
-        StringBuilder sb = new StringBuilder("PumpMessage [");
-
-        sb.append("packetType=");
-        sb.append(packetType == null ? "null" : packetType.name());
-
-        sb.append(", address=(");
-        sb.append(ByteUtil.shortHexString(this.address));
-
-        sb.append("), commandType=");
-        sb.append(commandType == null ? "null" : commandType.name());
-
-        if (invalidCommandType != null) {
-            sb.append(", invalidCommandType=");
-            sb.append(invalidCommandType);
-        }
-
-        sb.append(", messageBody=(");
-        sb.append(this.messageBody == null ? "null" : this.messageBody);
-
-        sb.append(")]");
-
-        return sb.toString();
-    }
-}
diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/message/PumpMessage.kt b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/message/PumpMessage.kt
new file mode 100644
index 0000000000..462d589941
--- /dev/null
+++ b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/message/PumpMessage.kt
@@ -0,0 +1,187 @@
+package info.nightscout.androidaps.plugins.pump.medtronic.comm.message
+
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.data.RLMessage
+import info.nightscout.androidaps.plugins.pump.common.utils.ByteUtil
+import info.nightscout.androidaps.plugins.pump.medtronic.defs.MedtronicCommandType
+import kotlin.math.min
+
+/**
+ * Created by geoff on 5/29/16.
+ */
+class PumpMessage : RLMessage {
+
+    private val aapsLogger: AAPSLogger
+    private var packetType: PacketType? = PacketType.Carelink
+    var address: ByteArray? = byteArrayOf(0, 0, 0)
+    var commandType: MedtronicCommandType? = null
+    private var invalidCommandType: Byte? = null
+    var messageBody: MessageBody? = MessageBody()
+    var error: String? = null
+
+    constructor(aapsLogger: AAPSLogger, error: String?) {
+        this.error = error
+        this.aapsLogger = aapsLogger
+    }
+
+    constructor(aapsLogger: AAPSLogger, rxData: ByteArray?) {
+        this.aapsLogger = aapsLogger
+        init(rxData)
+    }
+
+    constructor(aapsLogger: AAPSLogger) {
+        this.aapsLogger = aapsLogger
+    }
+
+    @Suppress("unused") val isErrorResponse: Boolean
+        get() = error != null
+
+    fun init(packetType: PacketType?, address: ByteArray?, commandType: MedtronicCommandType?, messageBody: MessageBody?) {
+        this.packetType = packetType
+        this.address = address
+        this.commandType = commandType
+        this.messageBody = messageBody
+    }
+
+    fun init(rxData: ByteArray?) {
+        if (rxData == null) {
+            return
+        }
+        if (rxData.isNotEmpty()) {
+            packetType = PacketType.getByValue(rxData[0].toShort())
+        }
+        if (rxData.size > 3) {
+            address = ByteUtil.substring(rxData, 1, 3)
+        }
+        if (rxData.size > 4) {
+            commandType = MedtronicCommandType.getByCode(rxData[4])
+            if (commandType == MedtronicCommandType.InvalidCommand) {
+                aapsLogger.error(LTag.PUMPCOMM, "PumpMessage - Unknown commandType " + rxData[4])
+            }
+        }
+        if (rxData.size > 5) {
+            messageBody = MedtronicCommandType.constructMessageBody(commandType,
+                ByteUtil.substring(rxData, 5, rxData.size - 5))
+        }
+    }
+
+    override fun getTxData(): ByteArray {
+        var rval = ByteUtil.concat(byteArrayOf(packetType!!.value), address)
+        rval = ByteUtil.concat(rval, commandType!!.commandCode)
+        rval = ByteUtil.concat(rval, messageBody!!.txData)
+        return rval
+    }
+
+    val contents: ByteArray
+        get() = ByteUtil.concat(byteArrayOf(commandType!!.commandCode), messageBody!!.txData)// length is not always correct so, we check whole array if we have
+    // data, after length
+
+    // check if displayed length is invalid
+
+    // check Old Way
+
+//        if (isLogEnabled())
+//            LOG.debug("PumpMessage - Length: " + length + ", Original Length: " + originalLength + ", CommandType: "
+//            + commandType);
+
+    // rawContent = just response without code (contents-2, messageBody.txData-1);
+    val rawContent: ByteArray
+        get() {
+            if (messageBody == null || messageBody!!.txData == null || messageBody?.txData?.size == 0) return byteArrayOf()
+            val data = messageBody!!.txData
+            var length = ByteUtil.asUINT8(data!![0]) // length is not always correct so, we check whole array if we have
+            // data, after length
+            //val originalLength = length
+
+            // check if displayed length is invalid
+            if (length > data.size - 1) {
+                return data
+            }
+
+            // check Old Way
+            var oldWay = false
+            for (i in length + 1 until data.size) {
+                if (data[i] != 0x00.toByte()) {
+                    oldWay = true
+                }
+            }
+            if (oldWay) {
+                length = data.size - 1
+            }
+            val arrayOut = ByteArray(length)
+            messageBody?.txData?.let {
+                System.arraycopy(it, 1, arrayOut, 0, length)
+            }
+
+//        if (isLogEnabled())
+//            LOG.debug("PumpMessage - Length: " + length + ", Original Length: " + originalLength + ", CommandType: "
+//            + commandType);
+            return arrayOut
+        }
+
+    val rawContentOfFrame: ByteArray
+        get() {
+            val raw = messageBody!!.txData
+            return if (raw == null || raw.isEmpty()) {
+                byteArrayOf()
+            } else {
+                ByteUtil.substring(raw, 1, min(FRAME_DATA_LENGTH, raw.size - 1))
+            }
+        }
+
+    override fun isValid(): Boolean {
+        if (packetType == null) return false
+        if (address == null) return false
+        return if (commandType == null) false else messageBody != null
+    }
+
+    val responseContent: String
+        get() {
+            val sb = StringBuilder("PumpMessage [response=")
+            var showData = true
+            if (commandType != null) {
+                if (commandType == MedtronicCommandType.CommandACK) {
+                    sb.append("Acknowledged")
+                    showData = false
+                } else if (commandType == MedtronicCommandType.CommandNAK) {
+                    sb.append("NOT Acknowledged")
+                    showData = false
+                } else {
+                    sb.append(commandType!!.name)
+                }
+            } else {
+                sb.append("Unknown_Type")
+                sb.append(" ($invalidCommandType)")
+            }
+            if (showData) {
+                sb.append(", rawResponse=")
+                sb.append(ByteUtil.shortHexString(rawContent))
+            }
+            sb.append("]")
+            return sb.toString()
+        }
+
+    override fun toString(): String {
+        val sb = StringBuilder("PumpMessage [")
+        sb.append("packetType=")
+        sb.append(if (packetType == null) "null" else packetType!!.name)
+        sb.append(", address=(")
+        sb.append(ByteUtil.shortHexString(address))
+        sb.append("), commandType=")
+        sb.append(if (commandType == null) "null" else commandType!!.name)
+        if (invalidCommandType != null) {
+            sb.append(", invalidCommandType=")
+            sb.append(invalidCommandType)
+        }
+        sb.append(", messageBody=(")
+        sb.append(if (messageBody == null) "null" else messageBody)
+        sb.append(")]")
+        return sb.toString()
+    }
+
+    companion object {
+
+        const val FRAME_DATA_LENGTH = 64
+    }
+}
\ No newline at end of file
diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/message/UnknownMessageBody.java b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/message/UnknownMessageBody.java
deleted file mode 100644
index 675a794bd8..0000000000
--- a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/message/UnknownMessageBody.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.medtronic.comm.message;
-
-/**
- * Created by geoff on 5/29/16.
- */
-public class UnknownMessageBody extends MessageBody {
-
-    public byte[] rxData;
-
-
-    public UnknownMessageBody(byte[] data) {
-        this.rxData = data;
-    }
-
-
-    @Override
-    public int getLength() {
-        return 0;
-    }
-
-
-    @Override
-    public void init(byte[] rxData) {
-    }
-
-
-    public byte[] getRxData() {
-        return rxData;
-    }
-
-
-    public void setRxData(byte[] rxData) {
-        this.rxData = rxData;
-    }
-
-
-    @Override
-    public byte[] getTxData() {
-        return rxData;
-    }
-
-
-    public void setTxData(byte[] txData) {
-        this.rxData = txData;
-    }
-}
diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/message/UnknownMessageBody.kt b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/message/UnknownMessageBody.kt
new file mode 100644
index 0000000000..ba3c998d9e
--- /dev/null
+++ b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/message/UnknownMessageBody.kt
@@ -0,0 +1,15 @@
+package info.nightscout.androidaps.plugins.pump.medtronic.comm.message
+
+/**
+ * Created by geoff on 5/29/16.
+ */
+class UnknownMessageBody(override var txData: ByteArray) : MessageBody() {
+
+    override val length: Int
+        get() = 0
+
+    override fun init(rxData: ByteArray?) {
+        data = rxData
+    }
+
+}
\ No newline at end of file
diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/ui/MedtronicUIComm.java b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/ui/MedtronicUIComm.java
deleted file mode 100644
index 0eed54e71f..0000000000
--- a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/ui/MedtronicUIComm.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.medtronic.comm.ui;
-
-import dagger.android.HasAndroidInjector;
-import info.nightscout.androidaps.logging.AAPSLogger;
-import info.nightscout.androidaps.logging.LTag;
-import info.nightscout.androidaps.plugins.pump.medtronic.comm.MedtronicCommunicationManager;
-import info.nightscout.androidaps.plugins.pump.medtronic.defs.MedtronicCommandType;
-import info.nightscout.androidaps.plugins.pump.medtronic.util.MedtronicUtil;
-
-/**
- * Created by andy on 6/14/18.
- */
-public class MedtronicUIComm {
-
-    private final HasAndroidInjector injector;
-    private final AAPSLogger aapsLogger;
-    private final MedtronicUtil medtronicUtil;
-    private final MedtronicCommunicationManager medtronicCommunicationManager;
-    private final MedtronicUIPostprocessor medtronicUIPostprocessor;
-
-    public MedtronicUIComm(
-            HasAndroidInjector injector,
-            AAPSLogger aapsLogger,
-            MedtronicUtil medtronicUtil,
-            MedtronicUIPostprocessor medtronicUIPostprocessor,
-            MedtronicCommunicationManager medtronicCommunicationManager
-    ) {
-        this.injector = injector;
-        this.aapsLogger = aapsLogger;
-        this.medtronicUtil = medtronicUtil;
-        this.medtronicUIPostprocessor = medtronicUIPostprocessor;
-        this.medtronicCommunicationManager = medtronicCommunicationManager;
-    }
-
-    public synchronized MedtronicUITask executeCommand(MedtronicCommandType commandType, Object... parameters) {
-
-        aapsLogger.info(LTag.PUMP, "Execute Command: " + commandType.name());
-
-        MedtronicUITask task = new MedtronicUITask(injector, commandType, parameters);
-
-        medtronicUtil.setCurrentCommand(commandType);
-
-        task.execute(medtronicCommunicationManager);
-
-        if (!task.isReceived()) {
-            aapsLogger.warn(LTag.PUMP, "Reply not received for " + commandType);
-        }
-
-        task.postProcess(medtronicUIPostprocessor);
-
-        return task;
-
-    }
-
-    public int getInvalidResponsesCount() {
-        return medtronicCommunicationManager.getNotConnectedCount();
-    }
-}
\ No newline at end of file
diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/ui/MedtronicUIComm.kt b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/ui/MedtronicUIComm.kt
new file mode 100644
index 0000000000..3bff5105ee
--- /dev/null
+++ b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/ui/MedtronicUIComm.kt
@@ -0,0 +1,45 @@
+package info.nightscout.androidaps.plugins.pump.medtronic.comm.ui
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.pump.medtronic.comm.MedtronicCommunicationManager
+import info.nightscout.androidaps.plugins.pump.medtronic.defs.MedtronicCommandType
+import info.nightscout.androidaps.plugins.pump.medtronic.util.MedtronicUtil
+import javax.inject.Inject
+
+/**
+ * Created by andy on 6/14/18.
+ */
+class MedtronicUIComm @Inject constructor(
+        private val injector: HasAndroidInjector,
+        private val aapsLogger: AAPSLogger,
+        private val medtronicUtil: MedtronicUtil,
+        private val medtronicUIPostprocessor: MedtronicUIPostprocessor,
+        private val medtronicCommunicationManager: MedtronicCommunicationManager
+) {
+
+    fun executeCommand(commandType: MedtronicCommandType): MedtronicUITask {
+        return executeCommand(commandType, null)
+    }
+
+    @Synchronized
+    fun executeCommand(commandType: MedtronicCommandType, parameters: ArrayList<Any>?): MedtronicUITask {
+
+        aapsLogger.info(LTag.PUMP, "Execute Command: " + commandType.name)
+        val task = MedtronicUITask(injector, commandType, parameters)
+        medtronicUtil.setCurrentCommand(commandType)
+        task.execute(medtronicCommunicationManager)
+
+        if (!task.isReceived) {
+            aapsLogger.warn(LTag.PUMP, "Reply not received for $commandType")
+        }
+
+        task.postProcess(medtronicUIPostprocessor)
+        return task
+    }
+
+    val invalidResponsesCount: Int
+        get() = medtronicCommunicationManager.notConnectedCount
+
+}
\ No newline at end of file
diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/ui/MedtronicUIPostprocessor.java b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/ui/MedtronicUIPostprocessor.java
deleted file mode 100644
index 8022384731..0000000000
--- a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/ui/MedtronicUIPostprocessor.java
+++ /dev/null
@@ -1,252 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.medtronic.comm.ui;
-
-import org.joda.time.DateTimeZone;
-import org.joda.time.Duration;
-
-import java.util.Date;
-import java.util.Locale;
-import java.util.Map;
-
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
-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.medtronic.MedtronicPumpPlugin;
-import info.nightscout.androidaps.plugins.pump.medtronic.data.dto.BasalProfile;
-import info.nightscout.androidaps.plugins.pump.medtronic.data.dto.BatteryStatusDTO;
-import info.nightscout.androidaps.plugins.pump.medtronic.data.dto.ClockDTO;
-import info.nightscout.androidaps.plugins.pump.medtronic.data.dto.PumpSettingDTO;
-import info.nightscout.androidaps.plugins.pump.medtronic.defs.BasalProfileStatus;
-import info.nightscout.androidaps.plugins.pump.medtronic.defs.MedtronicNotificationType;
-import info.nightscout.androidaps.plugins.pump.medtronic.defs.MedtronicUIResponseType;
-import info.nightscout.androidaps.plugins.pump.medtronic.driver.MedtronicPumpStatus;
-import info.nightscout.androidaps.plugins.pump.medtronic.util.MedtronicUtil;
-import info.nightscout.androidaps.utils.resources.ResourceHelper;
-
-
-/**
- * Created by andy on 6/15/18.
- */
-
-@Singleton
-public class MedtronicUIPostprocessor {
-
-    private final AAPSLogger aapsLogger;
-    private final RxBusWrapper rxBus;
-    private final ResourceHelper resourceHelper;
-    private final MedtronicUtil medtronicUtil;
-    private final MedtronicPumpStatus medtronicPumpStatus;
-    private final MedtronicPumpPlugin medtronicPumpPlugin;
-
-    @Inject
-    public MedtronicUIPostprocessor(
-            AAPSLogger aapsLogger,
-            RxBusWrapper rxBus,
-            ResourceHelper resourceHelper,
-            MedtronicUtil medtronicUtil,
-            MedtronicPumpStatus medtronicPumpStatus,
-            MedtronicPumpPlugin medtronicPumpPlugin) {
-        this.aapsLogger = aapsLogger;
-        this.rxBus = rxBus;
-        this.resourceHelper = resourceHelper;
-        this.medtronicUtil = medtronicUtil;
-        this.medtronicPumpStatus = medtronicPumpStatus;
-        this.medtronicPumpPlugin = medtronicPumpPlugin;
-    }
-
-
-    // this is mostly intended for command that return certain statuses (Remaining Insulin, ...), and
-    // where responses won't be directly used
-    void postProcessData(MedtronicUITask uiTask) {
-
-        switch (uiTask.commandType) {
-
-            case SetBasalProfileSTD: {
-                Boolean response = (Boolean) uiTask.returnData;
-
-                if (response) {
-                    BasalProfile basalProfile = (BasalProfile) uiTask.getParameter(0);
-
-                    medtronicPumpStatus.basalsByHour = basalProfile.getProfilesByHour(medtronicPumpPlugin.getPumpDescription().getPumpType());
-                }
-            }
-            break;
-
-            case GetBasalProfileSTD: {
-                BasalProfile basalProfile = (BasalProfile) uiTask.returnData;
-
-                try {
-                    Double[] profilesByHour = basalProfile.getProfilesByHour(medtronicPumpPlugin.getPumpDescription().getPumpType());
-
-                    if (profilesByHour != null) {
-                        medtronicPumpStatus.basalsByHour = profilesByHour;
-                        medtronicPumpStatus.basalProfileStatus = BasalProfileStatus.ProfileOK;
-                    } else {
-                        uiTask.responseType = MedtronicUIResponseType.Error;
-                        uiTask.errorDescription = "No profile found.";
-                        aapsLogger.error(LTag.PUMPCOMM, String.format(Locale.ENGLISH, "Basal Profile was NOT valid. [%s]", basalProfile.basalProfileToStringError()));
-                    }
-                } catch (Exception ex) {
-                    aapsLogger.error(LTag.PUMPCOMM, String.format(Locale.ENGLISH, "Basal Profile was returned, but was invalid. [%s]", basalProfile.basalProfileToStringError()));
-                    uiTask.responseType = MedtronicUIResponseType.Error;
-                    uiTask.errorDescription = "No profile found.";
-                }
-            }
-            break;
-
-            case SetBolus: {
-                medtronicPumpStatus.lastBolusAmount = uiTask.getDoubleFromParameters(0);
-                medtronicPumpStatus.lastBolusTime = new Date();
-            }
-            break;
-
-            case GetRemainingInsulin: {
-                medtronicPumpStatus.reservoirRemainingUnits = (Float) uiTask.returnData;
-            }
-            break;
-
-            case CancelTBR: {
-                medtronicPumpStatus.tempBasalStart = null;
-                medtronicPumpStatus.tempBasalAmount = null;
-                medtronicPumpStatus.tempBasalLength = null;
-            }
-            break;
-
-            case GetRealTimeClock: {
-                processTime(uiTask);
-            }
-            break;
-
-            case SetRealTimeClock: {
-                boolean response = (Boolean) uiTask.returnData;
-
-                aapsLogger.debug(LTag.PUMP, String.format(Locale.ENGLISH, "New time was %s set.", response ? "" : "NOT"));
-
-                if (response) {
-                    medtronicUtil.getPumpTime().timeDifference = 0;
-                }
-            }
-            break;
-
-
-            case GetBatteryStatus: {
-                BatteryStatusDTO batteryStatusDTO = (BatteryStatusDTO) uiTask.returnData;
-
-                medtronicPumpStatus.batteryRemaining = batteryStatusDTO.getCalculatedPercent(medtronicPumpStatus.batteryType);
-
-                if (batteryStatusDTO.voltage != null) {
-                    medtronicPumpStatus.batteryVoltage = batteryStatusDTO.voltage;
-                }
-
-                aapsLogger.debug(LTag.PUMP, String.format(Locale.ENGLISH, "BatteryStatus: %s", batteryStatusDTO.toString()));
-
-            }
-            break;
-
-            case PumpModel: {
-                if (medtronicPumpStatus.medtronicDeviceType != medtronicUtil.getMedtronicPumpModel()) {
-                    aapsLogger.warn(LTag.PUMP, "Configured pump is different then pump detected !");
-                    medtronicUtil.sendNotification(MedtronicNotificationType.PumpTypeNotSame, resourceHelper, rxBus);
-                }
-            }
-            break;
-
-            case Settings_512:
-            case Settings: {
-                postProcessSettings(uiTask);
-            }
-            break;
-
-            // no postprocessing
-
-            default:
-                break;
-            //aapsLogger.error(LTag.PUMP, "Post-processing not implemented for {}.", uiTask.commandType.name());
-
-        }
-
-    }
-
-
-    private void processTime(MedtronicUITask uiTask) {
-
-        ClockDTO clockDTO = (ClockDTO) uiTask.returnData;
-
-        Duration dur = new Duration(clockDTO.pumpTime.toDateTime(DateTimeZone.UTC),
-                clockDTO.localDeviceTime.toDateTime(DateTimeZone.UTC));
-
-        clockDTO.timeDifference = (int) dur.getStandardSeconds();
-
-        medtronicUtil.setPumpTime(clockDTO);
-
-        aapsLogger.debug(LTag.PUMP, "Pump Time: " + clockDTO.localDeviceTime + ", DeviceTime=" + clockDTO.pumpTime + //
-                ", diff: " + dur.getStandardSeconds() + " s");
-
-//        if (dur.getStandardMinutes() >= 10) {
-//            if (isLogEnabled())
-//                LOG.warn("Pump clock needs update, pump time: " + clockDTO.pumpTime.toString("HH:mm:ss") + " (difference: "
-//                        + dur.getStandardSeconds() + " s)");
-//            sendNotification(MedtronicNotificationType.PumpWrongTimeUrgent);
-//        } else if (dur.getStandardMinutes() >= 4) {
-//            if (isLogEnabled())
-//                LOG.warn("Pump clock needs update, pump time: " + clockDTO.pumpTime.toString("HH:mm:ss") + " (difference: "
-//                        + dur.getStandardSeconds() + " s)");
-//            sendNotification(MedtronicNotificationType.PumpWrongTimeNormal);
-//        }
-
-    }
-
-
-    private void postProcessSettings(MedtronicUITask uiTask) {
-
-        Map<String, PumpSettingDTO> settings = (Map<String, PumpSettingDTO>) uiTask.returnData;
-
-        medtronicUtil.setSettings(settings);
-
-        PumpSettingDTO checkValue;
-
-        medtronicPumpPlugin.getRileyLinkService().verifyConfiguration();
-
-        // check profile
-        if (!"Yes".equals(settings.get("PCFG_BASAL_PROFILES_ENABLED").value)) {
-            aapsLogger.error(LTag.PUMP, "Basal profiles are not enabled on pump.");
-            medtronicUtil.sendNotification(MedtronicNotificationType.PumpBasalProfilesNotEnabled, resourceHelper, rxBus);
-
-        } else {
-            checkValue = settings.get("PCFG_ACTIVE_BASAL_PROFILE");
-
-            if (!"STD".equals(checkValue.value)) {
-                aapsLogger.error("Basal profile set on pump is incorrect (must be STD).");
-                medtronicUtil.sendNotification(MedtronicNotificationType.PumpIncorrectBasalProfileSelected, resourceHelper, rxBus);
-            }
-        }
-
-        // TBR
-
-        checkValue = settings.get("PCFG_TEMP_BASAL_TYPE");
-
-        if (!"Units".equals(checkValue.value)) {
-            aapsLogger.error("Wrong TBR type set on pump (must be Absolute).");
-            medtronicUtil.sendNotification(MedtronicNotificationType.PumpWrongTBRTypeSet, resourceHelper, rxBus);
-        }
-
-        // MAXes
-
-        checkValue = settings.get("PCFG_MAX_BOLUS");
-
-        if (!MedtronicUtil.isSame(Double.parseDouble(checkValue.value), medtronicPumpStatus.maxBolus)) {
-            aapsLogger.error(LTag.PUMPCOMM, String.format(Locale.ENGLISH, "Wrong Max Bolus set on Pump (current=%s, required=%.2f).", checkValue.value, medtronicPumpStatus.maxBolus));
-            medtronicUtil.sendNotification(MedtronicNotificationType.PumpWrongMaxBolusSet, resourceHelper, rxBus, medtronicPumpStatus.maxBolus);
-        }
-
-        checkValue = settings.get("PCFG_MAX_BASAL");
-
-        if (!MedtronicUtil.isSame(Double.parseDouble(checkValue.value), medtronicPumpStatus.maxBasal)) {
-            aapsLogger.error(LTag.PUMPCOMM, String.format(Locale.ENGLISH, "Wrong Max Basal set on Pump (current=%s, required=%.2f).", checkValue.value, medtronicPumpStatus.maxBasal));
-            medtronicUtil.sendNotification(MedtronicNotificationType.PumpWrongMaxBasalSet, resourceHelper, rxBus, medtronicPumpStatus.maxBasal);
-        }
-
-    }
-}
diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/ui/MedtronicUIPostprocessor.kt b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/ui/MedtronicUIPostprocessor.kt
new file mode 100644
index 0000000000..621a17666b
--- /dev/null
+++ b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/ui/MedtronicUIPostprocessor.kt
@@ -0,0 +1,193 @@
+package info.nightscout.androidaps.plugins.pump.medtronic.comm.ui
+
+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.medtronic.MedtronicPumpPlugin
+import info.nightscout.androidaps.plugins.pump.medtronic.data.dto.BasalProfile
+import info.nightscout.androidaps.plugins.pump.medtronic.data.dto.BatteryStatusDTO
+import info.nightscout.androidaps.plugins.pump.medtronic.data.dto.ClockDTO
+import info.nightscout.androidaps.plugins.pump.medtronic.data.dto.PumpSettingDTO
+import info.nightscout.androidaps.plugins.pump.medtronic.defs.BasalProfileStatus
+import info.nightscout.androidaps.plugins.pump.medtronic.defs.MedtronicCommandType
+import info.nightscout.androidaps.plugins.pump.medtronic.defs.MedtronicNotificationType
+import info.nightscout.androidaps.plugins.pump.medtronic.defs.MedtronicUIResponseType
+import info.nightscout.androidaps.plugins.pump.medtronic.driver.MedtronicPumpStatus
+import info.nightscout.androidaps.plugins.pump.medtronic.util.MedtronicUtil
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import org.joda.time.DateTimeZone
+import org.joda.time.Duration
+import java.util.*
+import javax.inject.Inject
+import javax.inject.Singleton
+
+/**
+ * Created by andy on 6/15/18.
+ */
+@Singleton
+class MedtronicUIPostprocessor @Inject constructor(
+    private val aapsLogger: AAPSLogger,
+    private val rxBus: RxBusWrapper,
+    private val resourceHelper: ResourceHelper,
+    private val medtronicUtil: MedtronicUtil,
+    private val medtronicPumpStatus: MedtronicPumpStatus,
+    private val medtronicPumpPlugin: MedtronicPumpPlugin) {
+
+    // this is mostly intended for command that return certain statuses (Remaining Insulin, ...), and
+    // where responses won't be directly used
+    fun postProcessData(uiTask: MedtronicUITask) {
+        when (uiTask.commandType) {
+            MedtronicCommandType.SetBasalProfileSTD  -> {
+                val response = uiTask.result as Boolean?
+                if (response != null && response) {
+                    val basalProfile = uiTask.getParameter(0) as BasalProfile
+                    aapsLogger.debug("D: basal profile returned after set: $basalProfile")
+
+                    medtronicPumpStatus.basalsByHour = basalProfile.getProfilesByHour(medtronicPumpPlugin.pumpDescription.pumpType)
+                }
+            }
+
+            MedtronicCommandType.GetBasalProfileSTD  -> {
+                val basalProfile = uiTask.result as BasalProfile?
+
+                //aapsLogger.debug("D: basal profile on read: " + basalProfile);
+                try {
+                    if (basalProfile != null) {
+                        val profilesByHour = basalProfile.getProfilesByHour(medtronicPumpPlugin.pumpDescription.pumpType)
+                        if (!BasalProfile.isBasalProfileByHourUndefined(profilesByHour)) {
+                            medtronicPumpStatus.basalsByHour = profilesByHour
+                            medtronicPumpStatus.basalProfileStatus = BasalProfileStatus.ProfileOK
+                            //aapsLogger.debug("D: basal profile on read: basalsByHour: " +  BasalProfile.getProfilesByHourToString(medtronicPumpStatus.basalsByHour));
+                        } else {
+                            uiTask.responseType = MedtronicUIResponseType.Error
+                            uiTask.errorDescription = "No profile found."
+                            aapsLogger.error(LTag.PUMPCOMM, String.format(Locale.ENGLISH, "Basal Profile was NOT valid. [%s]", basalProfile.basalProfileToStringError()))
+                        }
+                    }
+                } catch (ex: Exception) {
+                    aapsLogger.error(LTag.PUMPCOMM, String.format(Locale.ENGLISH, "Basal Profile was returned, but was invalid. [%s]", basalProfile!!.basalProfileToStringError()))
+                    uiTask.responseType = MedtronicUIResponseType.Error
+                    uiTask.errorDescription = "No profile found."
+                }
+            }
+
+            MedtronicCommandType.SetBolus            -> {
+                medtronicPumpStatus.lastBolusAmount = uiTask.getDoubleFromParameters(0)
+                medtronicPumpStatus.lastBolusTime = Date()
+            }
+
+            MedtronicCommandType.GetRemainingInsulin -> {
+                medtronicPumpStatus.reservoirRemainingUnits = uiTask.result as Double
+            }
+
+            MedtronicCommandType.CancelTBR           -> {
+                medtronicPumpStatus.tempBasalStart = null
+                medtronicPumpStatus.tempBasalAmount = null
+                medtronicPumpStatus.tempBasalLength = null
+            }
+
+            MedtronicCommandType.GetRealTimeClock    -> {
+                processTime(uiTask)
+            }
+
+            MedtronicCommandType.SetRealTimeClock    -> {
+                val response = uiTask.result as Boolean
+                aapsLogger.debug(LTag.PUMP, String.format(Locale.ENGLISH, "New time was %s set.", if (response) "" else "NOT"))
+                if (response) {
+                    medtronicUtil.pumpTime!!.timeDifference = 0
+                }
+            }
+
+            MedtronicCommandType.GetBatteryStatus    -> {
+                val batteryStatusDTO = uiTask.result as BatteryStatusDTO?
+                if (batteryStatusDTO != null) {
+                    medtronicPumpStatus.batteryRemaining = batteryStatusDTO.getCalculatedPercent(medtronicPumpStatus.batteryType)
+                    if (batteryStatusDTO.voltage != null) {
+                        medtronicPumpStatus.batteryVoltage = batteryStatusDTO.voltage
+                    }
+                    aapsLogger.debug(LTag.PUMP, String.format(Locale.ENGLISH, "BatteryStatus: %s", batteryStatusDTO.toString()))
+                } else {
+                    medtronicPumpStatus.batteryVoltage = null
+                }
+            }
+
+            MedtronicCommandType.PumpModel           -> {
+                if (medtronicPumpStatus.medtronicDeviceType !== medtronicUtil.medtronicPumpModel) {
+                    aapsLogger.warn(LTag.PUMP, "Configured pump is different then pump detected !")
+                    medtronicUtil.sendNotification(MedtronicNotificationType.PumpTypeNotSame, resourceHelper, rxBus)
+                }
+            }
+
+            MedtronicCommandType.Settings_512,
+            MedtronicCommandType.Settings            -> {
+                postProcessSettings(uiTask)
+            }
+
+            else                                     -> {
+            }
+        }
+    }
+
+    private fun processTime(uiTask: MedtronicUITask) {
+        val clockDTO = uiTask.result as ClockDTO?
+        if (clockDTO != null) {
+            val dur = Duration(clockDTO.pumpTime.toDateTime(DateTimeZone.UTC),
+                clockDTO.localDeviceTime.toDateTime(DateTimeZone.UTC))
+            clockDTO.timeDifference = dur.standardSeconds.toInt()
+            medtronicUtil.pumpTime = clockDTO
+            aapsLogger.debug(LTag.PUMP, "Pump Time: " + clockDTO.localDeviceTime + ", DeviceTime=" + clockDTO.pumpTime +  //
+                ", diff: " + dur.standardSeconds + " s")
+        } else {
+            aapsLogger.debug(LTag.PUMP, "Problem with returned data: " + medtronicUtil.gsonInstance.toJson(uiTask.result))
+        }
+    }
+
+    private fun postProcessSettings(uiTask: MedtronicUITask) {
+        @Suppress("UNCHECKED_CAST") val settings = uiTask.result as? Map<String, PumpSettingDTO> ?: return
+
+        medtronicUtil.settings = settings
+        var checkValue: PumpSettingDTO
+        medtronicPumpPlugin.rileyLinkService.verifyConfiguration()
+
+        // check profile
+        if (settings.containsKey("PCFG_BASAL_PROFILES_ENABLED") && settings.containsKey("PCFG_ACTIVE_BASAL_PROFILE")) {
+            checkValue = settings["PCFG_BASAL_PROFILES_ENABLED"]!!
+            if ("Yes" != checkValue.value) {
+                aapsLogger.error(LTag.PUMP, "Basal profiles are not enabled on pump.")
+                medtronicUtil.sendNotification(MedtronicNotificationType.PumpBasalProfilesNotEnabled, resourceHelper, rxBus)
+            } else {
+                checkValue = settings["PCFG_ACTIVE_BASAL_PROFILE"]!!
+                if ("STD" != checkValue.value) {
+                    aapsLogger.error("Basal profile set on pump is incorrect (must be STD).")
+                    medtronicUtil.sendNotification(MedtronicNotificationType.PumpIncorrectBasalProfileSelected, resourceHelper, rxBus)
+                }
+            }
+        }
+
+        // TBR
+        if (settings.containsKey("PCFG_TEMP_BASAL_TYPE")) {
+            if ("Units" != settings["PCFG_TEMP_BASAL_TYPE"]!!.value) {
+                aapsLogger.error("Wrong TBR type set on pump (must be Absolute).")
+                medtronicUtil.sendNotification(MedtronicNotificationType.PumpWrongTBRTypeSet, resourceHelper, rxBus)
+            }
+        }
+
+        // MAXes
+        if (settings.containsKey("PCFG_MAX_BOLUS")) {
+            checkValue = settings["PCFG_MAX_BOLUS"]!!
+            if (!MedtronicUtil.isSame(checkValue.value.toDouble(), medtronicPumpStatus.maxBolus!!)) {
+                aapsLogger.error(LTag.PUMPCOMM, String.format(Locale.ENGLISH, "Wrong Max Bolus set on Pump (current=%s, required=%.2f).", checkValue.value, medtronicPumpStatus.maxBolus))
+                medtronicUtil.sendNotification(MedtronicNotificationType.PumpWrongMaxBolusSet, resourceHelper, rxBus, medtronicPumpStatus.maxBolus)
+            }
+        }
+
+        if (settings.containsKey("PCFG_MAX_BASAL")) {
+            checkValue = settings["PCFG_MAX_BASAL"]!!
+            if (!MedtronicUtil.isSame(checkValue.value.toDouble(), medtronicPumpStatus.maxBasal!!)) {
+                aapsLogger.error(LTag.PUMPCOMM, String.format(Locale.ENGLISH, "Wrong Max Basal set on Pump (current=%s, required=%.2f).", checkValue.value, medtronicPumpStatus.maxBasal))
+                medtronicUtil.sendNotification(MedtronicNotificationType.PumpWrongMaxBasalSet, resourceHelper, rxBus, medtronicPumpStatus.maxBasal)
+            }
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/ui/MedtronicUITask.java b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/ui/MedtronicUITask.java
deleted file mode 100644
index f8ef1ee190..0000000000
--- a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/ui/MedtronicUITask.java
+++ /dev/null
@@ -1,234 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.medtronic.comm.ui;
-
-import org.joda.time.LocalDateTime;
-
-import java.util.Locale;
-
-import javax.inject.Inject;
-
-import dagger.android.HasAndroidInjector;
-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.common.defs.PumpDeviceState;
-import info.nightscout.androidaps.plugins.pump.common.events.EventRileyLinkDeviceStatusChange;
-import info.nightscout.androidaps.plugins.pump.medtronic.comm.MedtronicCommunicationManager;
-import info.nightscout.androidaps.plugins.pump.medtronic.comm.history.pump.PumpHistoryEntry;
-import info.nightscout.androidaps.plugins.pump.medtronic.data.dto.BasalProfile;
-import info.nightscout.androidaps.plugins.pump.medtronic.data.dto.TempBasalPair;
-import info.nightscout.androidaps.plugins.pump.medtronic.defs.MedtronicCommandType;
-import info.nightscout.androidaps.plugins.pump.medtronic.defs.MedtronicUIResponseType;
-import info.nightscout.androidaps.plugins.pump.medtronic.driver.MedtronicPumpStatus;
-import info.nightscout.androidaps.plugins.pump.medtronic.events.EventMedtronicPumpValuesChanged;
-import info.nightscout.androidaps.plugins.pump.medtronic.util.MedtronicUtil;
-
-/**
- * Created by andy on 6/14/18.
- */
-
-public class MedtronicUITask {
-
-    @Inject RxBusWrapper rxBus;
-    @Inject AAPSLogger aapsLogger;
-    @Inject MedtronicPumpStatus medtronicPumpStatus;
-    @Inject MedtronicUtil medtronicUtil;
-
-    private final HasAndroidInjector injector;
-
-    public MedtronicCommandType commandType;
-    public Object returnData;
-    String errorDescription;
-    // boolean invalid = false;
-    private Object[] parameters;
-    // private boolean received;
-    MedtronicUIResponseType responseType;
-
-
-    public MedtronicUITask(HasAndroidInjector injector, MedtronicCommandType commandType) {
-        this.injector = injector;
-        this.injector.androidInjector().inject(this);
-        this.commandType = commandType;
-    }
-
-
-    public MedtronicUITask(HasAndroidInjector injector, MedtronicCommandType commandType, Object... parameters) {
-        this.injector = injector;
-        this.injector.androidInjector().inject(this);
-        this.commandType = commandType;
-        this.parameters = parameters;
-    }
-
-
-    public void execute(MedtronicCommunicationManager communicationManager) {
-
-        aapsLogger.debug(LTag.PUMP, "MedtronicUITask: @@@ In execute. " + commandType);
-
-        switch (commandType) {
-            case PumpModel: {
-                returnData = communicationManager.getPumpModel();
-            }
-            break;
-
-            case GetBasalProfileSTD: {
-                returnData = communicationManager.getBasalProfile();
-            }
-            break;
-
-            case GetRemainingInsulin: {
-                returnData = communicationManager.getRemainingInsulin();
-            }
-            break;
-
-            case GetRealTimeClock: {
-                returnData = communicationManager.getPumpTime();
-                medtronicUtil.setPumpTime(null);
-            }
-            break;
-
-            case SetRealTimeClock: {
-                returnData = communicationManager.setPumpTime();
-            }
-            break;
-
-            case GetBatteryStatus: {
-                returnData = communicationManager.getRemainingBattery();
-            }
-            break;
-
-            case SetTemporaryBasal: {
-                TempBasalPair tbr = getTBRSettings();
-                if (tbr != null) {
-                    returnData = communicationManager.setTBR(tbr);
-                }
-            }
-            break;
-
-            case ReadTemporaryBasal: {
-                returnData = communicationManager.getTemporaryBasal();
-            }
-            break;
-
-
-            case Settings:
-            case Settings_512: {
-                returnData = communicationManager.getPumpSettings();
-            }
-            break;
-
-            case SetBolus: {
-                Double amount = getDoubleFromParameters(0);
-
-                if (amount != null)
-                    returnData = communicationManager.setBolus(amount);
-            }
-            break;
-
-            case CancelTBR: {
-                returnData = communicationManager.cancelTBR();
-            }
-            break;
-
-            case SetBasalProfileSTD:
-            case SetBasalProfileA: {
-                BasalProfile profile = (BasalProfile) parameters[0];
-
-                returnData = communicationManager.setBasalProfile(profile);
-            }
-            break;
-
-            case GetHistoryData: {
-                returnData = communicationManager.getPumpHistory((PumpHistoryEntry) parameters[0],
-                        (LocalDateTime) parameters[1]);
-            }
-            break;
-
-            default: {
-                aapsLogger.warn(LTag.PUMP, String.format(Locale.ENGLISH, "This commandType is not supported (yet) - %s.", commandType));
-                // invalid = true;
-                responseType = MedtronicUIResponseType.Invalid;
-            }
-
-        }
-
-        if (responseType == null) {
-            if (returnData == null) {
-                errorDescription = communicationManager.getErrorResponse();
-                this.responseType = MedtronicUIResponseType.Error;
-            } else {
-                this.responseType = MedtronicUIResponseType.Data;
-            }
-        }
-
-    }
-
-
-    private TempBasalPair getTBRSettings() {
-        return new TempBasalPair(getDoubleFromParameters(0), //
-                false, //
-                getIntegerFromParameters(1));
-    }
-
-
-    private Float getFloatFromParameters(int index) {
-        return (Float) parameters[index];
-    }
-
-
-    Double getDoubleFromParameters(int index) {
-        return (Double) parameters[index];
-    }
-
-
-    private Integer getIntegerFromParameters(int index) {
-        return (Integer) parameters[index];
-    }
-
-
-    public Object getResult() {
-        return returnData;
-    }
-
-
-    public boolean isReceived() {
-        return (returnData != null || errorDescription != null);
-    }
-
-
-    void postProcess(MedtronicUIPostprocessor postprocessor) {
-
-        aapsLogger.debug(LTag.PUMP, "MedtronicUITask: @@@ In execute. " + commandType);
-
-        if (responseType == MedtronicUIResponseType.Data) {
-            postprocessor.postProcessData(this);
-        }
-
-        if (responseType == MedtronicUIResponseType.Invalid) {
-            rxBus.send(new EventRileyLinkDeviceStatusChange(PumpDeviceState.ErrorWhenCommunicating,
-                    "Unsupported command in MedtronicUITask"));
-        } else if (responseType == MedtronicUIResponseType.Error) {
-            rxBus.send(new EventRileyLinkDeviceStatusChange(PumpDeviceState.ErrorWhenCommunicating,
-                    errorDescription));
-        } else {
-            rxBus.send(new EventMedtronicPumpValuesChanged());
-            medtronicPumpStatus.setLastCommunicationToNow();
-        }
-
-        medtronicUtil.setCurrentCommand(null);
-    }
-
-
-    public boolean hasData() {
-        return (responseType == MedtronicUIResponseType.Data);
-    }
-
-
-    Object getParameter(int index) {
-        return parameters[index];
-    }
-
-
-    public MedtronicUIResponseType getResponseType() {
-        return this.responseType;
-    }
-
-}
diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/ui/MedtronicUITask.kt b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/ui/MedtronicUITask.kt
new file mode 100644
index 0000000000..a401e061fa
--- /dev/null
+++ b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/ui/MedtronicUITask.kt
@@ -0,0 +1,178 @@
+package info.nightscout.androidaps.plugins.pump.medtronic.comm.ui
+
+import dagger.android.HasAndroidInjector
+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.common.defs.PumpDeviceState
+import info.nightscout.androidaps.plugins.pump.common.events.EventRileyLinkDeviceStatusChange
+import info.nightscout.androidaps.plugins.pump.medtronic.comm.MedtronicCommunicationManager
+import info.nightscout.androidaps.plugins.pump.medtronic.comm.history.pump.PumpHistoryEntry
+import info.nightscout.androidaps.plugins.pump.medtronic.data.dto.BasalProfile
+import info.nightscout.androidaps.plugins.pump.medtronic.data.dto.TempBasalPair
+import info.nightscout.androidaps.plugins.pump.medtronic.defs.MedtronicCommandType
+import info.nightscout.androidaps.plugins.pump.medtronic.defs.MedtronicUIResponseType
+import info.nightscout.androidaps.plugins.pump.medtronic.driver.MedtronicPumpStatus
+import info.nightscout.androidaps.plugins.pump.medtronic.events.EventMedtronicPumpValuesChanged
+import info.nightscout.androidaps.plugins.pump.medtronic.util.MedtronicUtil
+import org.joda.time.LocalDateTime
+import java.util.*
+import javax.inject.Inject
+
+/**
+ * Created by andy on 6/14/18.
+ */
+class MedtronicUITask {
+
+    @Inject lateinit var rxBus: RxBusWrapper
+    @Inject lateinit var aapsLogger: AAPSLogger
+    @Inject lateinit var medtronicPumpStatus: MedtronicPumpStatus
+    @Inject lateinit var medtronicUtil: MedtronicUtil
+
+    private val injector: HasAndroidInjector
+    var commandType: MedtronicCommandType
+    var result: Any? = null
+    var errorDescription: String? = null
+    var parameters: List<Any?>? = null
+    var responseType: MedtronicUIResponseType? = null
+
+    constructor(injector: HasAndroidInjector, commandType: MedtronicCommandType) {
+        this.injector = injector
+        this.injector.androidInjector().inject(this)
+        this.commandType = commandType
+    }
+
+    constructor(injector: HasAndroidInjector, commandType: MedtronicCommandType, parameters: List<Any>?) {
+        this.injector = injector
+        this.injector.androidInjector().inject(this)
+        this.commandType = commandType
+        this.parameters = parameters //as Array<Any>
+    }
+
+    fun execute(communicationManager: MedtronicCommunicationManager) {
+        aapsLogger.debug(LTag.PUMP, "MedtronicUITask: @@@ In execute. $commandType")
+        when (commandType) {
+            MedtronicCommandType.PumpModel                                   -> {
+                result = communicationManager.getPumpModel()
+            }
+
+            MedtronicCommandType.GetBasalProfileSTD                          -> {
+                result = communicationManager.getBasalProfile()
+            }
+
+            MedtronicCommandType.GetRemainingInsulin                         -> {
+                result = communicationManager.getRemainingInsulin()
+            }
+
+            MedtronicCommandType.GetRealTimeClock                            -> {
+                result = communicationManager.getPumpTime()
+                //medtronicUtil.pumpTime = null
+            }
+
+            MedtronicCommandType.SetRealTimeClock                            -> {
+                result = communicationManager.setPumpTime()
+            }
+
+            MedtronicCommandType.GetBatteryStatus                            -> {
+                result = communicationManager.getRemainingBattery()
+            }
+
+            MedtronicCommandType.SetTemporaryBasal                           -> {
+                val tbr = getTbrSettings()
+                if (tbr != null) {
+                    result = communicationManager.setTemporaryBasal(tbr)
+                }
+            }
+
+            MedtronicCommandType.ReadTemporaryBasal                          -> {
+                result = communicationManager.getTemporaryBasal()
+            }
+
+            MedtronicCommandType.Settings, MedtronicCommandType.Settings_512 -> {
+                result = communicationManager.getPumpSettings()
+            }
+
+            MedtronicCommandType.SetBolus                                    -> {
+                val amount = getDoubleFromParameters(0)
+                if (amount != null) result = communicationManager.setBolus(amount)
+            }
+
+            MedtronicCommandType.CancelTBR                                   -> {
+                result = communicationManager.cancelTBR()
+            }
+
+            MedtronicCommandType.SetBasalProfileSTD,
+            MedtronicCommandType.SetBasalProfileA                            -> {
+                val profile = parameters!![0] as BasalProfile
+                result = communicationManager.setBasalProfile(profile)
+            }
+
+            MedtronicCommandType.GetHistoryData                              -> {
+                result = communicationManager.getPumpHistory(parameters!![0] as PumpHistoryEntry?,
+                    parameters!![1] as LocalDateTime?)
+            }
+
+            else                                                             -> {
+                aapsLogger.warn(LTag.PUMP, String.format(Locale.ENGLISH, "This commandType is not supported (yet) - %s.", commandType))
+                // invalid = true;
+                responseType = MedtronicUIResponseType.Invalid
+            }
+        }
+        if (responseType == null) {
+            if (result == null) {
+                errorDescription = communicationManager.errorResponse
+                responseType = MedtronicUIResponseType.Error
+            } else {
+                responseType = MedtronicUIResponseType.Data
+            }
+        }
+    }
+
+    private fun getTbrSettings(): TempBasalPair? {
+        return TempBasalPair(getDoubleFromParameters(0)!!,  //
+            false,  //
+            getIntegerFromParameters(1))
+    }
+
+    private fun getFloatFromParameters(index: Int): Float {
+        return parameters!![index] as Float
+    }
+
+    fun getDoubleFromParameters(index: Int): Double? {
+        return parameters!![index] as Double?
+    }
+
+    private fun getIntegerFromParameters(index: Int): Int {
+        return parameters!![index] as Int
+    }
+
+    val isReceived: Boolean
+        get() = result != null || errorDescription != null
+
+    fun postProcess(postprocessor: MedtronicUIPostprocessor) {
+        aapsLogger.debug(LTag.PUMP, "MedtronicUITask: @@@ In execute. $commandType")
+        if (responseType === MedtronicUIResponseType.Data) {
+            postprocessor.postProcessData(this)
+        }
+        if (responseType === MedtronicUIResponseType.Invalid) {
+            rxBus.send(EventRileyLinkDeviceStatusChange(PumpDeviceState.ErrorWhenCommunicating,
+                "Unsupported command in MedtronicUITask"))
+        } else if (responseType === MedtronicUIResponseType.Error) {
+            rxBus.send(EventRileyLinkDeviceStatusChange(PumpDeviceState.ErrorWhenCommunicating,
+                errorDescription))
+        } else {
+            rxBus.send(EventMedtronicPumpValuesChanged())
+            medtronicPumpStatus.setLastCommunicationToNow()
+        }
+        medtronicUtil.setCurrentCommand(null)
+    }
+
+    fun hasData(): Boolean {
+        return responseType === MedtronicUIResponseType.Data
+    }
+
+    fun getParameter(index: Int): Any? {
+        return parameters!![index]
+    }
+
+}
\ No newline at end of file
diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/MedtronicHistoryData.java b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/MedtronicHistoryData.java
deleted file mode 100644
index cebbe9cec4..0000000000
--- a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/MedtronicHistoryData.java
+++ /dev/null
@@ -1,1605 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.medtronic.data;
-
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
-
-import org.apache.commons.lang3.StringUtils;
-import org.joda.time.LocalDateTime;
-import org.joda.time.Minutes;
-
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Collections;
-import java.util.GregorianCalendar;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
-import dagger.android.HasAndroidInjector;
-import info.nightscout.androidaps.data.DetailedBolusInfo;
-import info.nightscout.androidaps.db.DbObjectBase;
-import info.nightscout.androidaps.db.ExtendedBolus;
-import info.nightscout.androidaps.db.Source;
-import info.nightscout.androidaps.db.TemporaryBasal;
-import info.nightscout.androidaps.db.Treatment;
-import info.nightscout.androidaps.interfaces.ActivePlugin;
-import info.nightscout.androidaps.interfaces.DatabaseHelperInterface;
-import info.nightscout.androidaps.interfaces.PumpSync;
-import info.nightscout.androidaps.logging.AAPSLogger;
-import info.nightscout.androidaps.logging.LTag;
-import info.nightscout.androidaps.plugins.pump.common.defs.PumpType;
-import info.nightscout.androidaps.plugins.pump.common.utils.DateTimeUtil;
-import info.nightscout.androidaps.plugins.pump.common.utils.StringUtil;
-import info.nightscout.androidaps.plugins.pump.medtronic.comm.history.pump.MedtronicPumpHistoryDecoder;
-import info.nightscout.androidaps.plugins.pump.medtronic.comm.history.pump.PumpHistoryEntry;
-import info.nightscout.androidaps.plugins.pump.medtronic.comm.history.pump.PumpHistoryEntryType;
-import info.nightscout.androidaps.plugins.pump.medtronic.comm.history.pump.PumpHistoryResult;
-import info.nightscout.androidaps.plugins.pump.medtronic.data.dto.BasalProfile;
-import info.nightscout.androidaps.plugins.pump.medtronic.data.dto.BolusDTO;
-import info.nightscout.androidaps.plugins.pump.medtronic.data.dto.BolusWizardDTO;
-import info.nightscout.androidaps.plugins.pump.medtronic.data.dto.ClockDTO;
-import info.nightscout.androidaps.plugins.pump.medtronic.data.dto.DailyTotalsDTO;
-import info.nightscout.androidaps.plugins.pump.medtronic.data.dto.TempBasalPair;
-import info.nightscout.androidaps.plugins.pump.medtronic.data.dto.TempBasalProcessDTO;
-import info.nightscout.androidaps.plugins.pump.medtronic.driver.MedtronicPumpStatus;
-import info.nightscout.androidaps.plugins.pump.medtronic.util.MedtronicConst;
-import info.nightscout.androidaps.plugins.pump.medtronic.util.MedtronicUtil;
-import info.nightscout.androidaps.plugins.treatments.TreatmentUpdateReturn;
-import info.nightscout.androidaps.utils.Round;
-import info.nightscout.androidaps.utils.sharedPreferences.SP;
-
-
-/**
- * Created by andy on 10/12/18.
- */
-
-// TODO: After release we need to refactor how data is retrieved from pump, each entry in history needs to be marked, and sorting
-//  needs to happen according those markings, not on time stamp (since AAPS can change time anytime it drifts away). This
-//  needs to include not returning any records if TZ goes into -x area. To fully support this AAPS would need to take note of
-//  all times that time changed (TZ, DST, etc.). Data needs to be returned in batches (time_changed batches, so that we can
-//  handle it. It would help to assign sort_ids to items (from oldest (1) to newest (x)
-
-// All things marked with "TODO: Fix db code" needs to be updated in new 2.5 database code
-
-@Singleton
-public class MedtronicHistoryData {
-
-    private final HasAndroidInjector injector;
-    private final AAPSLogger aapsLogger;
-    private final SP sp;
-    private final ActivePlugin activePlugin;
-    private final MedtronicUtil medtronicUtil;
-    private final MedtronicPumpHistoryDecoder medtronicPumpHistoryDecoder;
-    private final MedtronicPumpStatus medtronicPumpStatus;
-    private final DatabaseHelperInterface databaseHelper;
-    private final PumpSync pumpSync;
-
-    private final List<PumpHistoryEntry> allHistory;
-    private List<PumpHistoryEntry> newHistory = null;
-
-    private boolean isInit = false;
-
-    private Gson gson; // cannot be initialized in constructor because of injection
-    private Gson gsonCore; // cannot be initialized in constructor because of injection
-
-    private ClockDTO pumpTime;
-
-    private long lastIdUsed = 0;
-
-    /**
-     * Double bolus debug. We seem to have small problem with double Boluses (or sometimes also missing boluses
-     * from history. This flag turns on debugging for that (default is off=false)... Debugging is pretty detailed,
-     * so log files will get bigger.
-     * Note: June 2020. Since this seems to be fixed, I am disabling this per default. I will leave code inside
-     * in case we need it again. Code that turns this on is commented out RileyLinkMedtronicService#verifyConfiguration()
-     */
-    public static final boolean doubleBolusDebug = false;
-
-    @Inject
-    public MedtronicHistoryData(
-            HasAndroidInjector injector,
-            AAPSLogger aapsLogger,
-            SP sp,
-            ActivePlugin activePlugin,
-            MedtronicUtil medtronicUtil,
-            MedtronicPumpHistoryDecoder medtronicPumpHistoryDecoder,
-            MedtronicPumpStatus medtronicPumpStatus,
-            DatabaseHelperInterface databaseHelperInterface,
-            PumpSync pumpSync
-    ) {
-        this.allHistory = new ArrayList<>();
-
-        this.injector = injector;
-        this.aapsLogger = aapsLogger;
-        this.sp = sp;
-        this.activePlugin = activePlugin;
-        this.medtronicUtil = medtronicUtil;
-        this.medtronicPumpHistoryDecoder = medtronicPumpHistoryDecoder;
-        this.medtronicPumpStatus = medtronicPumpStatus;
-        this.databaseHelper = databaseHelperInterface;
-        this.pumpSync = pumpSync;
-    }
-
-    private Gson gson() {
-        if (gson == null) gson = new GsonBuilder().excludeFieldsWithoutExposeAnnotation().create();
-        return gson;
-    }
-
-    private Gson gsonCore() {
-        if (gsonCore == null) gsonCore = new GsonBuilder().create();
-        return gsonCore;
-    }
-
-    /**
-     * Add New History entries
-     *
-     * @param result PumpHistoryResult instance
-     */
-    public void addNewHistory(PumpHistoryResult result) {
-
-        List<PumpHistoryEntry> validEntries = result.getValidEntries();
-
-        List<PumpHistoryEntry> newEntries = new ArrayList<>();
-
-        for (PumpHistoryEntry validEntry : validEntries) {
-
-            if (!this.allHistory.contains(validEntry)) {
-                newEntries.add(validEntry);
-            }
-        }
-
-        this.newHistory = newEntries;
-
-        showLogs("List of history (before filtering): [" + this.newHistory.size() + "]", gson().toJson(this.newHistory));
-    }
-
-
-    private void showLogs(String header, String data) {
-        if (header != null) {
-            aapsLogger.debug(LTag.PUMP, header);
-        }
-
-        if (StringUtils.isNotBlank(data)) {
-            for (final String token : StringUtil.splitString(data, 3500)) {
-                aapsLogger.debug(LTag.PUMP, token);
-            }
-        } else {
-            aapsLogger.debug(LTag.PUMP, "No data.");
-        }
-    }
-
-
-    public List<PumpHistoryEntry> getAllHistory() {
-        return this.allHistory;
-    }
-
-
-    public void filterNewEntries() {
-
-        List<PumpHistoryEntry> newHistory2 = new ArrayList<>();
-        List<PumpHistoryEntry> TBRs = new ArrayList<>();
-        List<PumpHistoryEntry> bolusEstimates = new ArrayList<>();
-        long atechDate = DateTimeUtil.toATechDate(new GregorianCalendar());
-
-        //aapsLogger.debug(LTag.PUMP, "Filter new entries: Before {}", newHistory);
-
-        if (!isCollectionEmpty(newHistory)) {
-
-            for (PumpHistoryEntry pumpHistoryEntry : newHistory) {
-
-                if (!this.allHistory.contains(pumpHistoryEntry)) {
-
-                    PumpHistoryEntryType type = pumpHistoryEntry.getEntryType();
-
-                    if (type == PumpHistoryEntryType.TempBasalRate || type == PumpHistoryEntryType.TempBasalDuration) {
-                        TBRs.add(pumpHistoryEntry);
-                    } else if (type == PumpHistoryEntryType.BolusWizard || type == PumpHistoryEntryType.BolusWizard512) {
-                        bolusEstimates.add(pumpHistoryEntry);
-                        newHistory2.add(pumpHistoryEntry);
-                    } else {
-
-                        if (type == PumpHistoryEntryType.EndResultTotals) {
-                            if (!DateTimeUtil.isSameDay(atechDate, pumpHistoryEntry.atechDateTime)) {
-                                newHistory2.add(pumpHistoryEntry);
-                            }
-                        } else {
-                            newHistory2.add(pumpHistoryEntry);
-                        }
-                    }
-                }
-            }
-
-            TBRs = preProcessTBRs(TBRs);
-
-            if (bolusEstimates.size() > 0) {
-                extendBolusRecords(bolusEstimates, newHistory2);
-            }
-
-            newHistory2.addAll(TBRs);
-
-            this.newHistory = newHistory2;
-
-            sort(this.newHistory);
-        }
-
-        aapsLogger.debug(LTag.PUMP, "New History entries found: " + this.newHistory.size());
-
-        showLogs("List of history (after filtering): [" + this.newHistory.size() + "]", gson().toJson(this.newHistory));
-
-    }
-
-    private void extendBolusRecords(List<PumpHistoryEntry> bolusEstimates, List<PumpHistoryEntry> newHistory2) {
-
-        List<PumpHistoryEntry> boluses = getFilteredItems(newHistory2, PumpHistoryEntryType.Bolus);
-
-        for (PumpHistoryEntry bolusEstimate : bolusEstimates) {
-            for (PumpHistoryEntry bolus : boluses) {
-                if (bolusEstimate.atechDateTime.equals(bolus.atechDateTime)) {
-                    bolus.addDecodedData("Estimate", bolusEstimate.getDecodedData().get("Object"));
-                }
-            }
-        }
-    }
-
-
-    public void finalizeNewHistoryRecords() {
-
-        if ((newHistory == null) || (newHistory.size() == 0))
-            return;
-
-        PumpHistoryEntry pheLast = newHistory.get(0);
-
-        // find last entry
-        for (PumpHistoryEntry pumpHistoryEntry : newHistory) {
-            if (pumpHistoryEntry.atechDateTime != null && pumpHistoryEntry.isAfter(pheLast.atechDateTime)) {
-                pheLast = pumpHistoryEntry;
-            }
-        }
-
-        // add new entries
-        Collections.reverse(newHistory);
-
-        for (PumpHistoryEntry pumpHistoryEntry : newHistory) {
-
-            if (!this.allHistory.contains(pumpHistoryEntry)) {
-                lastIdUsed++;
-                pumpHistoryEntry.id = lastIdUsed;
-                this.allHistory.add(pumpHistoryEntry);
-            }
-
-        }
-
-
-        if (pheLast == null) // if we don't have any valid record we don't do the filtering and setting
-            return;
-
-        this.setLastHistoryRecordTime(pheLast.atechDateTime);
-        sp.putLong(MedtronicConst.Statistics.LastPumpHistoryEntry, pheLast.atechDateTime);
-
-        LocalDateTime dt = null;
-
-        try {
-            dt = DateTimeUtil.toLocalDateTime(pheLast.atechDateTime);
-        } catch (Exception ex) {
-            aapsLogger.error("Problem decoding date from last record: " + pheLast);
-        }
-
-        if (dt != null) {
-
-            dt = dt.minusDays(1); // we keep 24 hours
-
-            long dtRemove = DateTimeUtil.toATechDate(dt);
-
-            List<PumpHistoryEntry> removeList = new ArrayList<>();
-
-            for (PumpHistoryEntry pumpHistoryEntry : allHistory) {
-
-                if (!pumpHistoryEntry.isAfter(dtRemove)) {
-                    removeList.add(pumpHistoryEntry);
-                }
-            }
-
-            this.allHistory.removeAll(removeList);
-
-            this.sort(this.allHistory);
-
-            aapsLogger.debug(LTag.PUMP, String.format(Locale.ENGLISH, "All History records [afterFilterCount=%d, removedItemsCount=%d, newItemsCount=%d]",
-                    allHistory.size(), removeList.size(), newHistory.size()));
-        } else {
-            aapsLogger.error("Since we couldn't determine date, we don't clean full history. This is just workaround.");
-        }
-
-        this.newHistory.clear();
-    }
-
-
-    public boolean hasRelevantConfigurationChanged() {
-        return getStateFromFilteredList( //
-                PumpHistoryEntryType.ChangeBasalPattern, //
-                PumpHistoryEntryType.ClearSettings, //
-                PumpHistoryEntryType.SaveSettings, //
-                PumpHistoryEntryType.ChangeMaxBolus, //
-                PumpHistoryEntryType.ChangeMaxBasal, //
-                PumpHistoryEntryType.ChangeTempBasalType);
-    }
-
-
-    private boolean isCollectionEmpty(List col) {
-        return (col == null || col.isEmpty());
-    }
-
-    private boolean isCollectionNotEmpty(List col) {
-        return (col != null && !col.isEmpty());
-    }
-
-
-    public boolean isPumpSuspended() {
-
-        List<PumpHistoryEntry> items = getDataForPumpSuspends();
-
-        showLogs("isPumpSuspended: ", gson().toJson(items));
-
-        if (isCollectionNotEmpty(items)) {
-
-            PumpHistoryEntryType pumpHistoryEntryType = items.get(0).getEntryType();
-
-            boolean isSuspended = !(pumpHistoryEntryType == PumpHistoryEntryType.TempBasalCombined || //
-                    pumpHistoryEntryType == PumpHistoryEntryType.BasalProfileStart || //
-                    pumpHistoryEntryType == PumpHistoryEntryType.Bolus || //
-                    pumpHistoryEntryType == PumpHistoryEntryType.ResumePump || //
-                    pumpHistoryEntryType == PumpHistoryEntryType.BatteryChange || //
-                    pumpHistoryEntryType == PumpHistoryEntryType.Prime);
-
-            aapsLogger.debug(LTag.PUMP, String.format(Locale.ENGLISH, "isPumpSuspended. Last entry type=%s, isSuspended=%b", pumpHistoryEntryType, isSuspended));
-
-            return isSuspended;
-        } else
-            return false;
-
-    }
-
-
-    private List<PumpHistoryEntry> getDataForPumpSuspends() {
-
-        List<PumpHistoryEntry> newAndAll = new ArrayList<>();
-
-        if (isCollectionNotEmpty(this.allHistory)) {
-            newAndAll.addAll(this.allHistory);
-        }
-
-        if (isCollectionNotEmpty(this.newHistory)) {
-
-            for (PumpHistoryEntry pumpHistoryEntry : newHistory) {
-                if (!newAndAll.contains(pumpHistoryEntry)) {
-                    newAndAll.add(pumpHistoryEntry);
-                }
-            }
-        }
-
-        if (newAndAll.isEmpty())
-            return newAndAll;
-
-        this.sort(newAndAll);
-
-        List<PumpHistoryEntry> newAndAll2 = getFilteredItems(newAndAll, //
-                PumpHistoryEntryType.Bolus, //
-                PumpHistoryEntryType.TempBasalCombined, //
-                PumpHistoryEntryType.Prime, //
-                PumpHistoryEntryType.SuspendPump, //
-                PumpHistoryEntryType.ResumePump, //
-                PumpHistoryEntryType.Rewind, //
-                PumpHistoryEntryType.NoDeliveryAlarm, //
-                PumpHistoryEntryType.BatteryChange, //
-                PumpHistoryEntryType.BasalProfileStart);
-
-        newAndAll2 = filterPumpSuspend(newAndAll2, 10);
-
-        return newAndAll2;
-    }
-
-
-    private List<PumpHistoryEntry> filterPumpSuspend(List<PumpHistoryEntry> newAndAll, int filterCount) {
-
-        if (newAndAll.size() <= filterCount) {
-            return newAndAll;
-        }
-
-        List<PumpHistoryEntry> newAndAllOut = new ArrayList<>();
-
-        for (int i = 0; i < filterCount; i++) {
-            newAndAllOut.add(newAndAll.get(i));
-        }
-
-        return newAndAllOut;
-    }
-
-
-    /**
-     * Process History Data: Boluses(Treatments), TDD, TBRs, Suspend-Resume (or other pump stops: battery, prime)
-     */
-    public void processNewHistoryData() {
-
-        // TODO: Fix db code
-        // Prime (for reseting autosense)
-        List<PumpHistoryEntry> primeRecords = getFilteredItems(PumpHistoryEntryType.Prime);
-
-        aapsLogger.debug(LTag.PUMP, String.format(Locale.ENGLISH, "ProcessHistoryData: Prime [count=%d, items=%s]", primeRecords.size(), gson().toJson(primeRecords)));
-
-        if (isCollectionNotEmpty(primeRecords)) {
-            try {
-                processPrime(primeRecords);
-            } catch (Exception ex) {
-                aapsLogger.error(LTag.PUMP, "ProcessHistoryData: Error processing Prime entries: " + ex.getMessage(), ex);
-                throw ex;
-            }
-        }
-
-        // Rewind (for marking insulin change)
-        List<PumpHistoryEntry> rewindRecords = getFilteredItems(PumpHistoryEntryType.Rewind);
-
-        aapsLogger.debug(LTag.PUMP, String.format(Locale.ENGLISH, "ProcessHistoryData: Rewind [count=%d, items=%s]", rewindRecords.size(), gson().toJson(rewindRecords)));
-
-        if (isCollectionNotEmpty(rewindRecords)) {
-            try {
-                processRewind(rewindRecords);
-            } catch (Exception ex) {
-                aapsLogger.error(LTag.PUMP, "ProcessHistoryData: Error processing Rewind entries: " + ex.getMessage(), ex);
-                throw ex;
-            }
-        }
-
-        // TDD
-        List<PumpHistoryEntry> tdds = getFilteredItems(PumpHistoryEntryType.EndResultTotals, getTDDType());
-
-        aapsLogger.debug(LTag.PUMP, String.format(Locale.ENGLISH, "ProcessHistoryData: TDD [count=%d, items=%s]", tdds.size(), gson().toJson(tdds)));
-
-        if (isCollectionNotEmpty(tdds)) {
-            try {
-                processTDDs(tdds);
-            } catch (Exception ex) {
-                aapsLogger.error("ProcessHistoryData: Error processing TDD entries: " + ex.getMessage(), ex);
-                throw ex;
-            }
-        }
-
-        pumpTime = medtronicUtil.getPumpTime();
-
-        // Bolus
-        List<PumpHistoryEntry> treatments = getFilteredItems(PumpHistoryEntryType.Bolus);
-
-        aapsLogger.debug(LTag.PUMP, String.format(Locale.ENGLISH, "ProcessHistoryData: Bolus [count=%d, items=%s]", treatments.size(), gson().toJson(treatments)));
-
-        if (treatments.size() > 0) {
-            try {
-                processBolusEntries(treatments);
-            } catch (Exception ex) {
-                aapsLogger.error(LTag.PUMP, "ProcessHistoryData: Error processing Bolus entries: " + ex.getMessage(), ex);
-                throw ex;
-            }
-        }
-
-        // TBR
-        List<PumpHistoryEntry> tbrs = getFilteredItems(PumpHistoryEntryType.TempBasalCombined);
-
-        aapsLogger.debug(LTag.PUMP, String.format(Locale.ENGLISH, "ProcessHistoryData: TBRs Processed [count=%d, items=%s]", tbrs.size(), gson().toJson(tbrs)));
-
-        if (tbrs.size() > 0) {
-            try {
-                processTBREntries(tbrs);
-            } catch (Exception ex) {
-                aapsLogger.error(LTag.PUMP, "ProcessHistoryData: Error processing TBR entries: " + ex.getMessage(), ex);
-                throw ex;
-            }
-        }
-
-        // 'Delivery Suspend'
-        List<TempBasalProcessDTO> suspends;
-
-        try {
-            suspends = getSuspends();
-        } catch (Exception ex) {
-            aapsLogger.error("ProcessHistoryData: Error getting Suspend entries: " + ex.getMessage(), ex);
-            throw ex;
-        }
-
-        aapsLogger.debug(LTag.PUMP, String.format(Locale.ENGLISH, "ProcessHistoryData: 'Delivery Suspend' Processed [count=%d, items=%s]", suspends.size(),
-                gson().toJson(suspends)));
-
-        if (isCollectionNotEmpty(suspends)) {
-            try {
-                processSuspends(suspends);
-            } catch (Exception ex) {
-                aapsLogger.error(LTag.PUMP, "ProcessHistoryData: Error processing Suspends entries: " + ex.getMessage(), ex);
-                throw ex;
-            }
-        }
-    }
-
-
-    private void processPrime(List<PumpHistoryEntry> primeRecords) {
-
-        long maxAllowedTimeInPast = DateTimeUtil.getATDWithAddedMinutes(new GregorianCalendar(), -30);
-
-        long lastPrimeRecord = 0L;
-
-        for (PumpHistoryEntry primeRecord : primeRecords) {
-            Object fixedAmount = primeRecord.getDecodedDataEntry("FixedAmount");
-
-            if (fixedAmount != null && ((float) fixedAmount) == 0.0f) {
-                // non-fixed primes are used to prime the tubing
-                // fixed primes are used to prime the cannula
-                // so skip the prime entry if it was not a fixed prime
-                continue;
-            }
-
-            if (primeRecord.atechDateTime > maxAllowedTimeInPast) {
-                if (lastPrimeRecord < primeRecord.atechDateTime) {
-                    lastPrimeRecord = primeRecord.atechDateTime;
-                }
-            }
-        }
-
-        if (lastPrimeRecord != 0L) {
-            long lastPrimeFromAAPS = sp.getLong(MedtronicConst.Statistics.LastPrime, 0L);
-
-            if (lastPrimeRecord != lastPrimeFromAAPS) {
-                uploadCareportalEvent(DateTimeUtil.toMillisFromATD(lastPrimeRecord), DetailedBolusInfo.EventType.CANNULA_CHANGE);
-
-                sp.putLong(MedtronicConst.Statistics.LastPrime, lastPrimeRecord);
-            }
-        }
-    }
-
-    private void processRewind(List<PumpHistoryEntry> rewindRecords) {
-        long maxAllowedTimeInPast = DateTimeUtil.getATDWithAddedMinutes(new GregorianCalendar(), -30);
-        long lastRewindRecord = 0L;
-
-        for (PumpHistoryEntry rewindRecord : rewindRecords) {
-            if (rewindRecord.atechDateTime > maxAllowedTimeInPast) {
-                if (lastRewindRecord < rewindRecord.atechDateTime) {
-                    lastRewindRecord = rewindRecord.atechDateTime;
-                }
-            }
-        }
-
-        if (lastRewindRecord != 0L) {
-            long lastRewindFromAAPS = sp.getLong(MedtronicConst.Statistics.LastRewind, 0L);
-
-            if (lastRewindRecord != lastRewindFromAAPS) {
-                uploadCareportalEvent(DateTimeUtil.toMillisFromATD(lastRewindRecord), DetailedBolusInfo.EventType.INSULIN_CHANGE);
-
-                sp.putLong(MedtronicConst.Statistics.LastRewind, lastRewindRecord);
-            }
-        }
-    }
-
-
-    private void uploadCareportalEvent(long date, DetailedBolusInfo.EventType event) {
-        pumpSync.insertTherapyEventIfNewWithTimestamp(date, event, null, null, medtronicPumpStatus.pumpType, medtronicPumpStatus.serialNumber);
-    }
-
-    private void processTDDs(List<PumpHistoryEntry> tddsIn) {
-
-        List<PumpHistoryEntry> tdds = filterTDDs(tddsIn);
-
-        aapsLogger.debug(LTag.PUMP, String.format(Locale.ENGLISH, getLogPrefix() + "TDDs found: %d.\n%s", tdds.size(), gson().toJson(tdds)));
-
-
-        for (PumpHistoryEntry tdd : tdds) {
-            DailyTotalsDTO totalsDTO = (DailyTotalsDTO) tdd.getDecodedData().get("Object");
-            Boolean result = pumpSync.createOrUpdateTotalDailyDose(
-                    totalsDTO.timestamp(),
-                    totalsDTO.insulinBasal(),
-                    totalsDTO.insulinBolus(),
-                    totalsDTO.insulinTotal(),
-                    null,
-                    medtronicPumpStatus.pumpType,
-                    medtronicPumpStatus.serialNumber
-            );
-            if (result) aapsLogger.debug(LTag.PUMP, "TDD Added/Updated: " + totalsDTO);
-        }
-/*
-        List<TDD> tddsDb = databaseHelper.getTDDsForLastXDays(3);
-
-        for (PumpHistoryEntry tdd : tdds) {
-
-            TDD tddDbEntry = findTDD(tdd.atechDateTime, tddsDb);
-
-            DailyTotalsDTO totalsDTO = (DailyTotalsDTO) tdd.getDecodedData().get("Object");
-
-            //aapsLogger.debug(LTag.PUMP, "DailyTotals: {}", totalsDTO);
-
-            if (tddDbEntry == null) {
-                TDD tddNew = new TDD();
-                totalsDTO.setTDD(tddNew);
-
-                aapsLogger.debug(LTag.PUMP, "TDD Add: " + tddNew);
-
-                databaseHelper.createOrUpdateTDD(tddNew);
-
-            } else {
-
-                if (!totalsDTO.doesEqual(tddDbEntry)) {
-                    totalsDTO.setTDD(tddDbEntry);
-
-                    aapsLogger.debug(LTag.PUMP, "TDD Edit: " + tddDbEntry);
-
-                    databaseHelper.createOrUpdateTDD(tddDbEntry);
-                }
-            }
-        }
-
- */
-    }
-
-
-    private enum ProcessHistoryRecord {
-        Bolus("Bolus"),
-        TBR("TBR"),
-        Suspend("Suspend");
-
-        private final String description;
-
-        ProcessHistoryRecord(String desc) {
-            this.description = desc;
-        }
-
-        public String getDescription() {
-            return this.description;
-        }
-
-    }
-
-
-    private void processBolusEntries(List<PumpHistoryEntry> entryList) {
-
-        long oldestTimestamp = getOldestTimestamp(entryList);
-
-        List<? extends DbObjectBase> entriesFromHistory = getDatabaseEntriesByLastTimestamp(oldestTimestamp, ProcessHistoryRecord.Bolus);
-
-        if (doubleBolusDebug)
-            aapsLogger.debug(LTag.PUMP, String.format(Locale.ENGLISH, "DoubleBolusDebug: List (before filter): %s, FromDb=%s", gson().toJson(entryList),
-                    gsonCore().toJson(entriesFromHistory)));
-
-        filterOutAlreadyAddedEntries(entryList, entriesFromHistory);
-
-        if (entryList.isEmpty()) {
-            if (doubleBolusDebug)
-                aapsLogger.debug(LTag.PUMP, "DoubleBolusDebug: EntryList was filtered out.");
-            return;
-        }
-
-        filterOutNonInsulinEntries(entriesFromHistory);
-
-        if (doubleBolusDebug)
-            aapsLogger.debug(LTag.PUMP, String.format(Locale.ENGLISH, "DoubleBolusDebug: List (after filter): %s, FromDb=%s", gson().toJson(entryList),
-                    gsonCore().toJson(entriesFromHistory)));
-
-        if (isCollectionEmpty(entriesFromHistory)) {
-            for (PumpHistoryEntry treatment : entryList) {
-                aapsLogger.debug(LTag.PUMP, "Add Bolus (no db entry): " + treatment);
-                if (doubleBolusDebug)
-                    aapsLogger.debug(LTag.PUMP, "DoubleBolusDebug: Add Bolus: FromDb=null, Treatment=" + treatment);
-
-                addBolus(treatment, null);
-            }
-        } else {
-            for (PumpHistoryEntry treatment : entryList) {
-                DbObjectBase treatmentDb = findDbEntry(treatment, entriesFromHistory);
-                aapsLogger.debug(LTag.PUMP, String.format(Locale.ENGLISH, "Add Bolus %s - (entryFromDb=%s) ", treatment, treatmentDb));
-                if (doubleBolusDebug)
-                    aapsLogger.debug(LTag.PUMP, String.format(Locale.ENGLISH, "DoubleBolusDebug: Add Bolus: FromDb=%s, Treatment=%s", treatmentDb, treatment));
-
-                addBolus(treatment, (Treatment) treatmentDb);
-            }
-        }
-    }
-
-
-    private void filterOutNonInsulinEntries(List<? extends DbObjectBase> entriesFromHistory) {
-        // when we try to pair PumpHistory with AAPS treatments, we need to ignore all non-insulin entries
-        List<DbObjectBase> removeList = new ArrayList<>();
-
-        for (DbObjectBase dbObjectBase : entriesFromHistory) {
-
-            Treatment treatment = (Treatment) dbObjectBase;
-
-            if (Round.isSame(treatment.insulin, 0d)) {
-                removeList.add(dbObjectBase);
-            }
-        }
-
-        entriesFromHistory.removeAll(removeList);
-    }
-
-
-    private void processTBREntries(List<PumpHistoryEntry> entryList) {
-
-        Collections.reverse(entryList);
-
-        TempBasalPair tbr = (TempBasalPair) entryList.get(0).getDecodedDataEntry("Object");
-
-        boolean readOldItem = false;
-
-        if (tbr.isCancelTBR()) {
-            PumpHistoryEntry oneMoreEntryFromHistory = getOneMoreEntryFromHistory(PumpHistoryEntryType.TempBasalCombined);
-
-            if (oneMoreEntryFromHistory != null) {
-                entryList.add(0, oneMoreEntryFromHistory);
-                readOldItem = true;
-            } else {
-                entryList.remove(0);
-            }
-        }
-
-        long oldestTimestamp = getOldestTimestamp(entryList);
-
-        List<? extends DbObjectBase> entriesFromHistory = getDatabaseEntriesByLastTimestamp(oldestTimestamp, ProcessHistoryRecord.TBR);
-
-        aapsLogger.debug(LTag.PUMP, String.format(Locale.ENGLISH, ProcessHistoryRecord.TBR.getDescription() + " List (before filter): %s, FromDb=%s", gson().toJson(entryList),
-                gson().toJson(entriesFromHistory)));
-
-
-        TempBasalProcessDTO processDTO = null;
-        List<TempBasalProcessDTO> processList = new ArrayList<>();
-
-        for (PumpHistoryEntry treatment : entryList) {
-
-            TempBasalPair tbr2 = (TempBasalPair) treatment.getDecodedDataEntry("Object");
-
-            if (tbr2.isCancelTBR()) {
-
-                if (processDTO != null) {
-                    processDTO.itemTwo = treatment;
-
-                    if (readOldItem) {
-                        processDTO.processOperation = TempBasalProcessDTO.Operation.Edit;
-                        readOldItem = false;
-                    }
-                } else {
-                    aapsLogger.error("processDTO was null - shouldn't happen. ItemTwo=" + treatment);
-                }
-            } else {
-                if (processDTO != null) {
-                    processList.add(processDTO);
-                }
-
-                processDTO = new TempBasalProcessDTO();
-                processDTO.itemOne = treatment;
-                processDTO.processOperation = TempBasalProcessDTO.Operation.Add;
-            }
-        }
-
-        if (processDTO != null) {
-            processList.add(processDTO);
-        }
-
-
-        if (isCollectionNotEmpty(processList)) {
-
-            for (TempBasalProcessDTO tempBasalProcessDTO : processList) {
-
-                if (tempBasalProcessDTO.processOperation == TempBasalProcessDTO.Operation.Edit) {
-                    // edit
-                    TemporaryBasal tempBasal = findTempBasalWithPumpId(tempBasalProcessDTO.itemOne.getPumpId(), entriesFromHistory);
-
-                    if (tempBasal != null) {
-
-                        tempBasal.durationInMinutes = tempBasalProcessDTO.getDuration();
-
-                        databaseHelper.createOrUpdate(tempBasal);
-
-                        aapsLogger.debug(LTag.PUMP, String.format(Locale.ENGLISH, "Edit " + ProcessHistoryRecord.TBR.getDescription() + " - (entryFromDb=%s) ", tempBasal));
-                    } else {
-                        aapsLogger.error(LTag.PUMP, "TempBasal not found. Item: " + tempBasalProcessDTO.itemOne);
-                    }
-
-                } else {
-                    // add
-
-                    PumpHistoryEntry treatment = tempBasalProcessDTO.itemOne;
-
-                    TempBasalPair tbr2 = (TempBasalPair) treatment.getDecodedData().get("Object");
-                    tbr2.setDurationMinutes(tempBasalProcessDTO.getDuration());
-
-                    TemporaryBasal tempBasal = findTempBasalWithPumpId(tempBasalProcessDTO.itemOne.getPumpId(), entriesFromHistory);
-
-                    if (tempBasal == null) {
-                        DbObjectBase treatmentDb = findDbEntry(treatment, entriesFromHistory);
-
-                        aapsLogger.debug(LTag.PUMP, String.format(Locale.ENGLISH, "Add " + ProcessHistoryRecord.TBR.getDescription() + " %s - (entryFromDb=%s) ", treatment, treatmentDb));
-
-                        addTBR(treatment, (TemporaryBasal) treatmentDb);
-                    } else {
-                        // this shouldn't happen
-                        if (tempBasal.durationInMinutes != tempBasalProcessDTO.getDuration()) {
-                            aapsLogger.debug(LTag.PUMP, "Found entry with wrong duration (shouldn't happen)... updating");
-                            tempBasal.durationInMinutes = tempBasalProcessDTO.getDuration();
-                        }
-
-                    }
-                } // if
-            } // for
-
-        } // collection
-    }
-
-
-    private TemporaryBasal findTempBasalWithPumpId(long pumpId, List<? extends DbObjectBase> entriesFromHistory) {
-
-        for (DbObjectBase dbObjectBase : entriesFromHistory) {
-            TemporaryBasal tbr = (TemporaryBasal) dbObjectBase;
-
-            if (tbr.pumpId == pumpId) {
-                return tbr;
-            }
-        }
-
-        TemporaryBasal tempBasal = databaseHelper.findTempBasalByPumpId(pumpId);
-        return tempBasal;
-    }
-
-
-    /**
-     * findDbEntry - finds Db entries in database, while theoretically this should have same dateTime they
-     * don't. Entry on pump is few seconds before treatment in AAPS, and on manual boluses on pump there
-     * is no treatment at all. For now we look fro tratment that was from 0s - 1m59s within pump entry.
-     *
-     * @param treatment          Pump Entry
-     * @param entriesFromHistory entries from history
-     * @return DbObject from AAPS (if found)
-     */
-    private DbObjectBase findDbEntry(PumpHistoryEntry treatment, List<? extends DbObjectBase> entriesFromHistory) {
-
-        long proposedTime = DateTimeUtil.toMillisFromATD(treatment.atechDateTime);
-
-        //proposedTime += (this.pumpTime.timeDifference * 1000);
-
-        if (doubleBolusDebug)
-            aapsLogger.debug(LTag.PUMP, String.format(Locale.ENGLISH, "DoubleBolusDebug: findDbEntry Treatment=%s, FromDb=%s", treatment, gson().toJson(entriesFromHistory)));
-
-        if (entriesFromHistory.size() == 0) {
-            if (doubleBolusDebug)
-                aapsLogger.debug(LTag.PUMP, String.format(Locale.ENGLISH, "DoubleBolusDebug: findDbEntry Treatment=%s, FromDb=null", treatment));
-            return null;
-        } else if (entriesFromHistory.size() == 1) {
-            if (doubleBolusDebug)
-                aapsLogger.debug(LTag.PUMP, String.format(Locale.ENGLISH, "DoubleBolusDebug: findDbEntry Treatment=%s, FromDb=%s. Type=SingleEntry", treatment, entriesFromHistory.get(0)));
-
-            // TODO: Fix db code
-            // if difference is bigger than 2 minutes we discard entry
-            long maxMillisAllowed = DateTimeUtil.getMillisFromATDWithAddedMinutes(treatment.atechDateTime, 2);
-
-            if (doubleBolusDebug)
-                aapsLogger.debug(LTag.PUMP, String.format(Locale.ENGLISH, "DoubleBolusDebug: findDbEntry maxMillisAllowed=%d, AtechDateTime=%d (add 2 minutes). ", maxMillisAllowed, treatment.atechDateTime));
-
-            if (entriesFromHistory.get(0).getDate() > maxMillisAllowed) {
-                if (doubleBolusDebug)
-                    aapsLogger.debug(LTag.PUMP, "DoubleBolusDebug: findDbEntry entry filtered out, returning null. ");
-                return null;
-            }
-
-            return entriesFromHistory.get(0);
-        }
-
-        for (int min = 0; min < 2; min += 1) {
-
-            for (int sec = 0; sec <= 50; sec += 10) {
-
-                if (min == 1 && sec == 50) {
-                    sec = 59;
-                }
-
-                int diff = (sec * 1000);
-
-                List<DbObjectBase> outList = new ArrayList<>();
-
-                for (DbObjectBase treatment1 : entriesFromHistory) {
-
-                    if ((treatment1.getDate() > proposedTime - diff) && (treatment1.getDate() < proposedTime + diff)) {
-                        outList.add(treatment1);
-                    }
-                }
-
-                if (outList.size() == 1) {
-                    if (doubleBolusDebug)
-                        aapsLogger.debug(LTag.PUMP, String.format(Locale.ENGLISH, "DoubleBolusDebug: findDbEntry Treatment={}, FromDb={}. Type=EntrySelected, AtTimeMin={}, AtTimeSec={}", treatment, entriesFromHistory.get(0), min, sec));
-
-                    return outList.get(0);
-                }
-
-                if (min == 0 && sec == 10 && outList.size() > 1) {
-                    aapsLogger.error(String.format(Locale.ENGLISH, "Too many entries (with too small diff): (timeDiff=[min=%d,sec=%d],count=%d,list=%s)",
-                            min, sec, outList.size(), gson().toJson(outList)));
-                    if (doubleBolusDebug)
-                        aapsLogger.debug(LTag.PUMP, String.format(Locale.ENGLISH, "DoubleBolusDebug: findDbEntry Error - Too many entries (with too small diff): (timeDiff=[min=%d,sec=%d],count=%d,list=%s)",
-                                min, sec, outList.size(), gson().toJson(outList)));
-                }
-            }
-        }
-
-        return null;
-    }
-
-
-    private List<? extends DbObjectBase> getDatabaseEntriesByLastTimestamp(long startTimestamp, ProcessHistoryRecord processHistoryRecord) {
-        if (processHistoryRecord == ProcessHistoryRecord.Bolus) {
-            return activePlugin.getActiveTreatments().getTreatmentsFromHistoryAfterTimestamp(startTimestamp);
-        } else {
-            return databaseHelper.getTemporaryBasalsDataFromTime(startTimestamp, true);
-        }
-    }
-
-
-    private void filterOutAlreadyAddedEntries(List<PumpHistoryEntry> entryList, List<? extends DbObjectBase> treatmentsFromHistory) {
-
-        if (isCollectionEmpty(treatmentsFromHistory))
-            return;
-
-        List<DbObjectBase> removeTreatmentsFromHistory = new ArrayList<>();
-        List<PumpHistoryEntry> removeTreatmentsFromPH = new ArrayList<>();
-
-        for (DbObjectBase treatment : treatmentsFromHistory) {
-
-            if (treatment.getPumpId() != 0) {
-
-                PumpHistoryEntry selectedBolus = null;
-
-                for (PumpHistoryEntry bolus : entryList) {
-                    if (bolus.getPumpId() == treatment.getPumpId()) {
-                        selectedBolus = bolus;
-                        break;
-                    }
-                }
-
-                if (selectedBolus != null) {
-                    entryList.remove(selectedBolus);
-
-                    removeTreatmentsFromPH.add(selectedBolus);
-                    removeTreatmentsFromHistory.add(treatment);
-                }
-            }
-        }
-
-        if (doubleBolusDebug)
-            aapsLogger.debug(LTag.PUMP, String.format(Locale.ENGLISH, "DoubleBolusDebug: filterOutAlreadyAddedEntries: PumpHistory=%s, Treatments=%s",
-                    gson().toJson(removeTreatmentsFromPH),
-                    gsonCore().toJson(removeTreatmentsFromHistory)));
-
-        treatmentsFromHistory.removeAll(removeTreatmentsFromHistory);
-    }
-
-
-    private void addBolus(PumpHistoryEntry bolus, Treatment treatment) {
-
-        BolusDTO bolusDTO = (BolusDTO) bolus.getDecodedData().get("Object");
-
-        if (treatment == null) {
-            if (doubleBolusDebug)
-                aapsLogger.debug(LTag.PUMP, "DoubleBolusDebug: addBolus(tretament==null): Bolus=" + bolusDTO);
-
-            switch (bolusDTO.getBolusType()) {
-                case Normal: {
-                    DetailedBolusInfo detailedBolusInfo = new DetailedBolusInfo();
-
-                    detailedBolusInfo.setBolusTimestamp(tryToGetByLocalTime(bolus.atechDateTime));
-                    detailedBolusInfo.setPumpType(PumpType.MEDTRONIC_512_712); // TODO grab real model
-                    detailedBolusInfo.setPumpSerial(medtronicPumpStatus.serialNumber);
-                    detailedBolusInfo.setBolusPumpId(bolus.getPumpId());
-                    detailedBolusInfo.insulin = bolusDTO.getDeliveredAmount();
-
-                    addCarbsFromEstimate(detailedBolusInfo, bolus);
-
-                    if (doubleBolusDebug)
-                        aapsLogger.debug(LTag.PUMP, "DoubleBolusDebug: addBolus(tretament==null): DetailedBolusInfo=" + detailedBolusInfo);
-
-                    boolean newRecord = activePlugin.getActiveTreatments().addToHistoryTreatment(detailedBolusInfo, false);
-
-                    bolus.setLinkedObject(detailedBolusInfo);
-
-                    aapsLogger.debug(LTag.PUMP, String.format(Locale.ENGLISH, "addBolus - [date=%d,pumpId=%d, insulin=%.2f, newRecord=%b]", detailedBolusInfo.timestamp,
-                            detailedBolusInfo.getBolusPumpId(), detailedBolusInfo.insulin, newRecord));
-                }
-                break;
-
-                case Audio:
-                case Extended: {
-                    ExtendedBolus extendedBolus = new ExtendedBolus(injector);
-                    extendedBolus.date = tryToGetByLocalTime(bolus.atechDateTime);
-                    extendedBolus.source = Source.PUMP;
-                    extendedBolus.insulin = bolusDTO.getDeliveredAmount();
-                    extendedBolus.pumpId = bolus.getPumpId();
-                    extendedBolus.isValid = true;
-                    extendedBolus.durationInMinutes = bolusDTO.getDuration();
-
-                    bolus.setLinkedObject(extendedBolus);
-
-                    if (doubleBolusDebug)
-                        aapsLogger.debug(LTag.PUMP, "DoubleBolusDebug: addBolus(tretament==null): ExtendedBolus=" + extendedBolus);
-
-                    activePlugin.getActiveTreatments().addToHistoryExtendedBolus(extendedBolus);
-
-                    aapsLogger.debug(LTag.PUMP, String.format(Locale.ENGLISH, "addBolus - Extended [date=%d,pumpId=%d, insulin=%.3f, duration=%d]", extendedBolus.date,
-                            extendedBolus.pumpId, extendedBolus.insulin, extendedBolus.durationInMinutes));
-
-                }
-                break;
-            }
-
-        } else {
-
-            if (doubleBolusDebug)
-                aapsLogger.debug(LTag.PUMP, String.format(Locale.ENGLISH, "DoubleBolusDebug: addBolus(OldTreatment=%s): Bolus=%s", treatment, bolusDTO));
-
-            treatment.source = Source.PUMP;
-            treatment.pumpId = bolus.getPumpId();
-            treatment.insulin = bolusDTO.getDeliveredAmount();
-
-            TreatmentUpdateReturn updateReturn = activePlugin.getActiveTreatments().createOrUpdateMedtronic(treatment, false);
-
-            if (doubleBolusDebug)
-                aapsLogger.debug(LTag.PUMP, String.format(Locale.ENGLISH, "DoubleBolusDebug: addBolus(tretament!=null): NewTreatment=%s, UpdateReturn=%s", treatment, updateReturn));
-
-            aapsLogger.debug(LTag.PUMP, String.format(Locale.ENGLISH, "editBolus - [date=%d,pumpId=%d, insulin=%.3f, newRecord=%s]", treatment.date,
-                    treatment.pumpId, treatment.insulin, updateReturn.toString()));
-
-            bolus.setLinkedObject(treatment);
-
-        }
-    }
-
-
-    private void addCarbsFromEstimate(DetailedBolusInfo detailedBolusInfo, PumpHistoryEntry bolus) {
-
-        if (bolus.containsDecodedData("Estimate")) {
-
-            BolusWizardDTO bolusWizard = (BolusWizardDTO) bolus.getDecodedData().get("Estimate");
-
-            if (doubleBolusDebug)
-                aapsLogger.debug(LTag.PUMP, String.format(Locale.ENGLISH, "DoubleBolusDebug: addCarbsFromEstimate: Bolus=%s, BolusWizardDTO=%s", bolus, bolusWizard));
-
-            detailedBolusInfo.carbs = bolusWizard.carbs;
-        }
-    }
-
-
-    private void addTBR(PumpHistoryEntry treatment, TemporaryBasal temporaryBasalDbInput) {
-
-        TempBasalPair tbr = (TempBasalPair) treatment.getDecodedData().get("Object");
-
-        TemporaryBasal temporaryBasalDb = temporaryBasalDbInput;
-        String operation = "editTBR";
-
-        if (temporaryBasalDb == null) {
-            temporaryBasalDb = new TemporaryBasal(injector);
-            temporaryBasalDb.date = tryToGetByLocalTime(treatment.atechDateTime);
-
-            operation = "addTBR";
-        }
-
-        temporaryBasalDb.source = Source.PUMP;
-        temporaryBasalDb.pumpId = treatment.getPumpId();
-        temporaryBasalDb.durationInMinutes = tbr.getDurationMinutes();
-        temporaryBasalDb.absoluteRate = tbr.getInsulinRate();
-        temporaryBasalDb.isAbsolute = !tbr.isPercent();
-
-        treatment.setLinkedObject(temporaryBasalDb);
-
-        databaseHelper.createOrUpdate(temporaryBasalDb);
-
-        aapsLogger.debug(LTag.PUMP, String.format(Locale.ENGLISH, operation + " - [date=%d,pumpId=%d, rate=%s %s, duration=%d]", //
-                temporaryBasalDb.date, //
-                temporaryBasalDb.pumpId, //
-                temporaryBasalDb.isAbsolute ? String.format(Locale.ENGLISH, "%.2f", temporaryBasalDb.absoluteRate) :
-                        String.format(Locale.ENGLISH, "%d", temporaryBasalDb.percentRate), //
-                temporaryBasalDb.isAbsolute ? "U/h" : "%", //
-                temporaryBasalDb.durationInMinutes));
-    }
-
-
-    private void processSuspends(List<TempBasalProcessDTO> tempBasalProcessList) {
-
-        for (TempBasalProcessDTO tempBasalProcess : tempBasalProcessList) {
-
-            TemporaryBasal tempBasal = databaseHelper.findTempBasalByPumpId(tempBasalProcess.itemOne.getPumpId());
-
-            if (tempBasal == null) {
-                // add
-                tempBasal = new TemporaryBasal(injector);
-                tempBasal.date = tryToGetByLocalTime(tempBasalProcess.itemOne.atechDateTime);
-
-                tempBasal.source = Source.PUMP;
-                tempBasal.pumpId = tempBasalProcess.itemOne.getPumpId();
-                tempBasal.durationInMinutes = tempBasalProcess.getDuration();
-                tempBasal.absoluteRate = 0.0d;
-                tempBasal.isAbsolute = true;
-
-                tempBasalProcess.itemOne.setLinkedObject(tempBasal);
-                tempBasalProcess.itemTwo.setLinkedObject(tempBasal);
-
-                databaseHelper.createOrUpdate(tempBasal);
-
-            }
-        }
-
-    }
-
-
-    private List<TempBasalProcessDTO> getSuspends() {
-
-        List<TempBasalProcessDTO> outList = new ArrayList<>();
-
-        // suspend/resume
-        outList.addAll(getSuspendResumeRecords());
-        // no_delivery/prime & rewind/prime
-        outList.addAll(getNoDeliveryRewindPrimeRecords());
-
-        return outList;
-    }
-
-    private List<TempBasalProcessDTO> getSuspendResumeRecords() {
-        List<PumpHistoryEntry> filteredItems = getFilteredItems(this.newHistory, //
-                PumpHistoryEntryType.SuspendPump, //
-                PumpHistoryEntryType.ResumePump);
-
-        List<TempBasalProcessDTO> outList = new ArrayList<>();
-
-        if (filteredItems.size() > 0) {
-
-            List<PumpHistoryEntry> filtered2Items = new ArrayList<>();
-
-            if ((filteredItems.size() % 2 == 0) && (filteredItems.get(0).getEntryType() == PumpHistoryEntryType.ResumePump)) {
-                // full resume suspends (S R S R)
-                filtered2Items.addAll(filteredItems);
-            } else if ((filteredItems.size() % 2 == 0) && (filteredItems.get(0).getEntryType() == PumpHistoryEntryType.SuspendPump)) {
-                // not full suspends, need to retrive one more record and discard first one (R S R S) -> ([S] R S R [xS])
-                filteredItems.remove(0);
-
-                PumpHistoryEntry oneMoreEntryFromHistory = getOneMoreEntryFromHistory(PumpHistoryEntryType.SuspendPump);
-                if (oneMoreEntryFromHistory != null) {
-                    filteredItems.add(oneMoreEntryFromHistory);
-                } else {
-                    filteredItems.remove(filteredItems.size() - 1); // remove last (unpaired R)
-                }
-
-                filtered2Items.addAll(filteredItems);
-            } else {
-                if (filteredItems.get(0).getEntryType() == PumpHistoryEntryType.ResumePump) {
-                    // get one more from history (R S R) -> ([S] R S R)
-
-                    PumpHistoryEntry oneMoreEntryFromHistory = getOneMoreEntryFromHistory(PumpHistoryEntryType.SuspendPump);
-                    if (oneMoreEntryFromHistory != null) {
-                        filteredItems.add(oneMoreEntryFromHistory);
-                    } else {
-                        filteredItems.remove(filteredItems.size() - 1); // remove last (unpaired R)
-                    }
-
-                    filtered2Items.addAll(filteredItems);
-                } else {
-                    // remove last and have paired items
-                    filteredItems.remove(0);
-                    filtered2Items.addAll(filteredItems);
-                }
-            }
-
-            if (filtered2Items.size() > 0) {
-                sort(filtered2Items);
-                Collections.reverse(filtered2Items);
-
-                for (int i = 0; i < filtered2Items.size(); i += 2) {
-                    TempBasalProcessDTO dto = new TempBasalProcessDTO();
-
-                    dto.itemOne = filtered2Items.get(i);
-                    dto.itemTwo = filtered2Items.get(i + 1);
-
-                    dto.processOperation = TempBasalProcessDTO.Operation.Add;
-
-                    outList.add(dto);
-                }
-            }
-        }
-
-        return outList;
-    }
-
-
-    private List<TempBasalProcessDTO> getNoDeliveryRewindPrimeRecords() {
-        List<PumpHistoryEntry> primeItems = getFilteredItems(this.newHistory, //
-                PumpHistoryEntryType.Prime);
-
-        List<TempBasalProcessDTO> outList = new ArrayList<>();
-
-        if (primeItems.size() == 0)
-            return outList;
-
-        List<PumpHistoryEntry> filteredItems = getFilteredItems(this.newHistory, //
-                PumpHistoryEntryType.Prime,
-                PumpHistoryEntryType.Rewind,
-                PumpHistoryEntryType.NoDeliveryAlarm,
-                PumpHistoryEntryType.Bolus,
-                PumpHistoryEntryType.TempBasalCombined
-        );
-
-        List<PumpHistoryEntry> tempData = new ArrayList<>();
-        boolean startedItems = false;
-        boolean finishedItems = false;
-
-        for (PumpHistoryEntry filteredItem : filteredItems) {
-            if (filteredItem.getEntryType() == PumpHistoryEntryType.Prime) {
-                startedItems = true;
-            }
-
-            if (startedItems) {
-                if (filteredItem.getEntryType() == PumpHistoryEntryType.Bolus ||
-                        filteredItem.getEntryType() == PumpHistoryEntryType.TempBasalCombined) {
-                    finishedItems = true;
-                    break;
-                }
-
-                tempData.add(filteredItem);
-            }
-        }
-
-
-        if (!finishedItems) {
-
-            List<PumpHistoryEntry> filteredItemsOld = getFilteredItems(this.allHistory, //
-                    PumpHistoryEntryType.Rewind,
-                    PumpHistoryEntryType.NoDeliveryAlarm,
-                    PumpHistoryEntryType.Bolus,
-                    PumpHistoryEntryType.TempBasalCombined
-            );
-
-            for (PumpHistoryEntry filteredItem : filteredItemsOld) {
-
-                if (filteredItem.getEntryType() == PumpHistoryEntryType.Bolus ||
-                        filteredItem.getEntryType() == PumpHistoryEntryType.TempBasalCombined) {
-                    finishedItems = true;
-                    break;
-                }
-
-                tempData.add(filteredItem);
-            }
-        }
-
-
-        if (!finishedItems) {
-            showLogs("NoDeliveryRewindPrimeRecords: Not finished Items: ", gson().toJson(tempData));
-            return outList;
-        }
-
-        showLogs("NoDeliveryRewindPrimeRecords: Records to evaluate: ", gson().toJson(tempData));
-
-        List<PumpHistoryEntry> items = getFilteredItems(tempData, //
-                PumpHistoryEntryType.Prime
-        );
-
-
-        TempBasalProcessDTO processDTO = new TempBasalProcessDTO();
-
-        processDTO.itemTwo = items.get(0);
-
-        items = getFilteredItems(tempData, //
-                PumpHistoryEntryType.NoDeliveryAlarm
-        );
-
-        if (items.size() > 0) {
-
-            processDTO.itemOne = items.get(items.size() - 1);
-            processDTO.processOperation = TempBasalProcessDTO.Operation.Add;
-
-            outList.add(processDTO);
-            return outList;
-        }
-
-
-        items = getFilteredItems(tempData, //
-                PumpHistoryEntryType.Rewind
-        );
-
-        if (items.size() > 0) {
-
-            processDTO.itemOne = items.get(0);
-            processDTO.processOperation = TempBasalProcessDTO.Operation.Add;
-
-            outList.add(processDTO);
-            return outList;
-        }
-
-        return outList;
-    }
-
-
-    private PumpHistoryEntry getOneMoreEntryFromHistory(PumpHistoryEntryType entryType) {
-        List<PumpHistoryEntry> filteredItems = getFilteredItems(this.allHistory, entryType);
-
-        return filteredItems.size() == 0 ? null : filteredItems.get(0);
-    }
-
-
-    private List<PumpHistoryEntry> filterTDDs(List<PumpHistoryEntry> tdds) {
-        List<PumpHistoryEntry> tddsOut = new ArrayList<>();
-
-        for (PumpHistoryEntry tdd : tdds) {
-            if (tdd.getEntryType() != PumpHistoryEntryType.EndResultTotals) {
-                tddsOut.add(tdd);
-            }
-        }
-
-        return tddsOut.size() == 0 ? tdds : tddsOut;
-    }
-
-/*
-    private TDD findTDD(long atechDateTime, List<TDD> tddsDb) {
-
-        for (TDD tdd : tddsDb) {
-
-            if (DateTimeUtil.isSameDayATDAndMillis(atechDateTime, tdd.date)) {
-                return tdd;
-            }
-        }
-
-        return null;
-    }
-*/
-    private long tryToGetByLocalTime(long atechDateTime) {
-        return DateTimeUtil.toMillisFromATD(atechDateTime);
-    }
-
-
-    private int getOldestDateDifference(List<PumpHistoryEntry> treatments) {
-
-        long dt = Long.MAX_VALUE;
-        PumpHistoryEntry currentTreatment = null;
-
-        if (isCollectionEmpty(treatments)) {
-            return 8; // default return of 6 (5 for diif on history reading + 2 for max allowed difference) minutes
-        }
-
-        for (PumpHistoryEntry treatment : treatments) {
-
-            if (treatment.atechDateTime < dt) {
-                dt = treatment.atechDateTime;
-                currentTreatment = treatment;
-            }
-        }
-
-        LocalDateTime oldestEntryTime;
-
-        try {
-
-            oldestEntryTime = DateTimeUtil.toLocalDateTime(dt);
-            oldestEntryTime = oldestEntryTime.minusMinutes(3);
-
-//            if (this.pumpTime.timeDifference < 0) {
-//                oldestEntryTime = oldestEntryTime.plusSeconds(this.pumpTime.timeDifference);
-//            }
-        } catch (Exception ex) {
-            aapsLogger.error("Problem decoding date from last record: " + currentTreatment);
-            return 8; // default return of 6 minutes
-        }
-
-        LocalDateTime now = new LocalDateTime();
-
-        Minutes minutes = Minutes.minutesBetween(oldestEntryTime, now);
-
-        // returns oldest time in history, with calculated time difference between pump and phone, minus 5 minutes
-        aapsLogger.debug(LTag.PUMP, String.format(Locale.ENGLISH, "Oldest entry: %d, pumpTimeDifference=%d, newDt=%s, currentTime=%s, differenceMin=%d", dt,
-                this.pumpTime.timeDifference, oldestEntryTime, now, minutes.getMinutes()));
-
-        return minutes.getMinutes();
-    }
-
-
-    private long getOldestTimestamp(List<PumpHistoryEntry> treatments) {
-
-        long dt = Long.MAX_VALUE;
-        PumpHistoryEntry currentTreatment = null;
-
-        for (PumpHistoryEntry treatment : treatments) {
-
-            if (treatment.atechDateTime < dt) {
-                dt = treatment.atechDateTime;
-                currentTreatment = treatment;
-            }
-        }
-
-        if (doubleBolusDebug)
-            aapsLogger.debug(LTag.PUMP, String.format(Locale.ENGLISH, "DoubleBolusDebug: getOldestTimestamp. Oldest entry found: time=%d, object=%s", dt, currentTreatment));
-
-        try {
-
-            GregorianCalendar oldestEntryTime = DateTimeUtil.toGregorianCalendar(dt);
-            if (doubleBolusDebug)
-                aapsLogger.debug(LTag.PUMP, String.format(Locale.ENGLISH, "DoubleBolusDebug: getOldestTimestamp. oldestEntryTime: %s", DateTimeUtil.toString(oldestEntryTime)));
-            oldestEntryTime.add(Calendar.MINUTE, -2);
-
-            if (doubleBolusDebug)
-                aapsLogger.debug(LTag.PUMP, String.format(Locale.ENGLISH, "DoubleBolusDebug: getOldestTimestamp. oldestEntryTime (-2m): %s, timeInMillis=%d", DateTimeUtil.toString(oldestEntryTime), oldestEntryTime.getTimeInMillis()));
-
-            return oldestEntryTime.getTimeInMillis();
-
-        } catch (Exception ex) {
-            aapsLogger.error("Problem decoding date from last record: " + currentTreatment);
-            return 8; // default return of 6 minutes
-        }
-
-    }
-
-
-    private PumpHistoryEntryType getTDDType() {
-
-        if (medtronicUtil.getMedtronicPumpModel() == null) {
-            return PumpHistoryEntryType.EndResultTotals;
-        }
-
-        switch (medtronicUtil.getMedtronicPumpModel()) {
-
-            case Medtronic_515:
-            case Medtronic_715:
-                return PumpHistoryEntryType.DailyTotals515;
-
-            case Medtronic_522:
-            case Medtronic_722:
-                return PumpHistoryEntryType.DailyTotals522;
-
-            case Medtronic_523_Revel:
-            case Medtronic_723_Revel:
-            case Medtronic_554_Veo:
-            case Medtronic_754_Veo:
-                return PumpHistoryEntryType.DailyTotals523;
-
-            default: {
-                return PumpHistoryEntryType.EndResultTotals;
-            }
-        }
-    }
-
-
-    public boolean hasBasalProfileChanged() {
-
-        List<PumpHistoryEntry> filteredItems = getFilteredItems(PumpHistoryEntryType.ChangeBasalProfile_NewProfile);
-
-        aapsLogger.debug(LTag.PUMP, "hasBasalProfileChanged. Items: " + gson().toJson(filteredItems));
-
-        return (filteredItems.size() > 0);
-    }
-
-
-    public void processLastBasalProfileChange(PumpType pumpType, MedtronicPumpStatus mdtPumpStatus) {
-
-        List<PumpHistoryEntry> filteredItems = getFilteredItems(PumpHistoryEntryType.ChangeBasalProfile_NewProfile);
-
-        aapsLogger.debug(LTag.PUMP, "processLastBasalProfileChange. Items: " + filteredItems);
-
-        PumpHistoryEntry newProfile = null;
-        Long lastDate = null;
-
-        if (filteredItems.size() == 1) {
-            newProfile = filteredItems.get(0);
-        } else if (filteredItems.size() > 1) {
-
-            for (PumpHistoryEntry filteredItem : filteredItems) {
-
-                if (lastDate == null || lastDate < filteredItem.atechDateTime) {
-                    newProfile = filteredItem;
-                    lastDate = newProfile.atechDateTime;
-                }
-            }
-        }
-
-        if (newProfile != null) {
-            aapsLogger.debug(LTag.PUMP, "processLastBasalProfileChange. item found, setting new basalProfileLocally: " + newProfile);
-            BasalProfile basalProfile = (BasalProfile) newProfile.getDecodedData().get("Object");
-
-            mdtPumpStatus.basalsByHour = basalProfile.getProfilesByHour(pumpType);
-        }
-    }
-
-
-    public boolean hasPumpTimeChanged() {
-        return getStateFromFilteredList(PumpHistoryEntryType.NewTimeSet, //
-                PumpHistoryEntryType.ChangeTime);
-    }
-
-
-    public void setLastHistoryRecordTime(Long lastHistoryRecordTime) {
-
-        // this.previousLastHistoryRecordTime = this.lastHistoryRecordTime;
-    }
-
-
-    public void setIsInInit(boolean init) {
-        this.isInit = init;
-    }
-
-
-    // HELPER METHODS
-
-    private void sort(List<PumpHistoryEntry> list) {
-        if (list != null && !list.isEmpty()) {
-            Collections.sort(list, new PumpHistoryEntry.Comparator());
-        }
-    }
-
-
-    private List<PumpHistoryEntry> preProcessTBRs(List<PumpHistoryEntry> TBRs_Input) {
-        List<PumpHistoryEntry> TBRs = new ArrayList<>();
-
-        Map<String, PumpHistoryEntry> map = new HashMap<>();
-
-        for (PumpHistoryEntry pumpHistoryEntry : TBRs_Input) {
-            if (map.containsKey(pumpHistoryEntry.DT)) {
-                medtronicPumpHistoryDecoder.decodeTempBasal(map.get(pumpHistoryEntry.DT), pumpHistoryEntry);
-                pumpHistoryEntry.setEntryType(medtronicUtil.getMedtronicPumpModel(), PumpHistoryEntryType.TempBasalCombined);
-                TBRs.add(pumpHistoryEntry);
-                map.remove(pumpHistoryEntry.DT);
-            } else {
-                map.put(pumpHistoryEntry.DT, pumpHistoryEntry);
-            }
-        }
-
-        return TBRs;
-    }
-
-
-    private List<PumpHistoryEntry> getFilteredItems(PumpHistoryEntryType... entryTypes) {
-        return getFilteredItems(this.newHistory, entryTypes);
-    }
-
-
-    private boolean getStateFromFilteredList(PumpHistoryEntryType... entryTypes) {
-        if (isInit) {
-            return false;
-        } else {
-            List<PumpHistoryEntry> filteredItems = getFilteredItems(entryTypes);
-
-            aapsLogger.debug(LTag.PUMP, "Items: " + filteredItems);
-
-            return filteredItems.size() > 0;
-        }
-    }
-
-
-    private List<PumpHistoryEntry> getFilteredItems(List<PumpHistoryEntry> inList, PumpHistoryEntryType... entryTypes) {
-
-        // aapsLogger.debug(LTag.PUMP, "InList: " + inList.size());
-        List<PumpHistoryEntry> outList = new ArrayList<>();
-
-        if (inList != null && inList.size() > 0) {
-            for (PumpHistoryEntry pumpHistoryEntry : inList) {
-
-                if (!isEmpty(entryTypes)) {
-                    for (PumpHistoryEntryType pumpHistoryEntryType : entryTypes) {
-
-                        if (pumpHistoryEntry.getEntryType() == pumpHistoryEntryType) {
-                            outList.add(pumpHistoryEntry);
-                            break;
-                        }
-                    }
-                } else {
-                    outList.add(pumpHistoryEntry);
-                }
-            }
-        }
-
-        // aapsLogger.debug(LTag.PUMP, "OutList: " + outList.size());
-
-        return outList;
-    }
-
-
-    private boolean isEmpty(PumpHistoryEntryType... entryTypes) {
-        return (entryTypes == null || (entryTypes.length == 1 && entryTypes[0] == null));
-    }
-
-
-    private String getLogPrefix() {
-        return "MedtronicHistoryData::";
-    }
-
-}
diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/MedtronicHistoryData.kt b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/MedtronicHistoryData.kt
new file mode 100644
index 0000000000..e558a22f88
--- /dev/null
+++ b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/MedtronicHistoryData.kt
@@ -0,0 +1,1142 @@
+package info.nightscout.androidaps.plugins.pump.medtronic.data
+
+import com.google.gson.Gson
+import com.google.gson.GsonBuilder
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.data.DetailedBolusInfo
+import info.nightscout.androidaps.interfaces.ActivePlugin
+import info.nightscout.androidaps.interfaces.PumpSync
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.pump.common.defs.PumpType
+import info.nightscout.androidaps.plugins.pump.common.sync.PumpDbEntry
+import info.nightscout.androidaps.plugins.pump.common.sync.PumpDbEntryTBR
+import info.nightscout.androidaps.plugins.pump.common.utils.DateTimeUtil
+import info.nightscout.androidaps.plugins.pump.common.utils.StringUtil
+import info.nightscout.androidaps.plugins.pump.medtronic.comm.history.pump.MedtronicPumpHistoryDecoder
+import info.nightscout.androidaps.plugins.pump.medtronic.comm.history.pump.PumpHistoryEntry
+import info.nightscout.androidaps.plugins.pump.medtronic.comm.history.pump.PumpHistoryEntryType
+import info.nightscout.androidaps.plugins.pump.medtronic.comm.history.pump.PumpHistoryResult
+import info.nightscout.androidaps.plugins.pump.medtronic.data.dto.*
+import info.nightscout.androidaps.plugins.pump.medtronic.defs.MedtronicDeviceType
+import info.nightscout.androidaps.plugins.pump.medtronic.defs.PumpBolusType
+import info.nightscout.androidaps.plugins.pump.medtronic.driver.MedtronicPumpStatus
+import info.nightscout.androidaps.plugins.pump.medtronic.util.MedtronicConst
+import info.nightscout.androidaps.plugins.pump.medtronic.util.MedtronicUtil
+import info.nightscout.androidaps.utils.sharedPreferences.SP
+import org.apache.commons.lang3.StringUtils
+import org.joda.time.LocalDateTime
+import java.util.*
+import javax.inject.Inject
+import javax.inject.Singleton
+
+/**
+ * Created by andy on 10/12/18.
+ */
+// TODO: After release we need to refactor how data is retrieved from pump, each entry in history needs to be marked, and sorting
+//  needs to happen according those markings, not on time stamp (since AAPS can change time anytime it drifts away). This
+//  needs to include not returning any records if TZ goes into -x area. To fully support this AAPS would need to take note of
+//  all times that time changed (TZ, DST, etc.). Data needs to be returned in batches (time_changed batches, so that we can
+//  handle it. It would help to assign sort_ids to items (from oldest (1) to newest (x)
+//
+@Suppress("DEPRECATION")
+@Singleton
+class MedtronicHistoryData @Inject constructor(
+    val injector: HasAndroidInjector,
+    val aapsLogger: AAPSLogger,
+    val sp: SP,
+    val activePlugin: ActivePlugin,
+    val medtronicUtil: MedtronicUtil,
+    val medtronicPumpHistoryDecoder: MedtronicPumpHistoryDecoder,
+    val medtronicPumpStatus: MedtronicPumpStatus,
+    val pumpSync: PumpSync,
+    val pumpSyncStorage: info.nightscout.androidaps.plugins.pump.common.sync.PumpSyncStorage
+) {
+
+    val allHistory: MutableList<PumpHistoryEntry> = mutableListOf()
+    private var allPumpIds: MutableSet<Long> = mutableSetOf()
+    private var newHistory: MutableList<PumpHistoryEntry> = mutableListOf()
+    private var isInit = false
+
+    private var pumpTime: ClockDTO? = null
+    private var lastIdUsed: Long = 0
+    private var gson: Gson = GsonBuilder().excludeFieldsWithoutExposeAnnotation().create()
+    private var gsonCore: Gson = GsonBuilder().create()
+
+    /**
+     * Add New History entries
+     *
+     * @param result PumpHistoryResult instance
+     */
+    fun addNewHistory(result: PumpHistoryResult) {
+        val validEntries: List<PumpHistoryEntry> = result.validEntries
+        val newEntries: MutableList<PumpHistoryEntry> = mutableListOf()
+        for (validEntry in validEntries) {
+            if (!allPumpIds.contains(validEntry.pumpId)) {
+                newEntries.add(validEntry)
+            } else {
+                val entryByPumpId = getEntryByPumpId(validEntry.pumpId)
+
+                if (entryByPumpId != null && entryByPumpId.hasBolusChanged(validEntry)) {
+                    newEntries.add(validEntry)
+                    allHistory.remove(entryByPumpId)
+                    allPumpIds.remove(validEntry.pumpId)
+                }
+            }
+        }
+        newHistory = newEntries
+        showLogs("List of history (before filtering): [" + newHistory.size + "]", gson.toJson(newHistory))
+    }
+
+    private fun getEntryByPumpId(pumpId: Long): PumpHistoryEntry? {
+        val findFirst = this.allHistory.stream()
+            .filter { f -> f.pumpId == pumpId }
+            .findFirst()
+
+        return if (findFirst.isPresent) findFirst.get() else null
+    }
+
+    private fun showLogs(header: String?, data: String) {
+        if (header != null) {
+            aapsLogger.debug(LTag.PUMP, header)
+        }
+        if (StringUtils.isNotBlank(data)) {
+            for (token in StringUtil.splitString(data, 3500)) {
+                aapsLogger.debug(LTag.PUMP, token)
+            }
+        } else {
+            aapsLogger.debug(LTag.PUMP, "No data.")
+        }
+    }
+
+    fun filterNewEntries() {
+        val newHistory2: MutableList<PumpHistoryEntry> = mutableListOf()
+        var tbrs: MutableList<PumpHistoryEntry> = mutableListOf()
+        val bolusEstimates: MutableList<PumpHistoryEntry> = mutableListOf()
+        val atechDate = DateTimeUtil.toATechDate(GregorianCalendar())
+
+        //aapsLogger.debug(LTag.PUMP, "Filter new entries: Before {}", newHistory);
+        if (!isCollectionEmpty(newHistory)) {
+            for (pumpHistoryEntry in newHistory) {
+                if (!allPumpIds.contains(pumpHistoryEntry.pumpId)) {
+                    val type = pumpHistoryEntry.entryType
+                    if (type === PumpHistoryEntryType.TempBasalRate || type === PumpHistoryEntryType.TempBasalDuration) {
+                        tbrs.add(pumpHistoryEntry)
+                    } else if (type === PumpHistoryEntryType.BolusWizard || type === PumpHistoryEntryType.BolusWizard512) {
+                        bolusEstimates.add(pumpHistoryEntry)
+                        newHistory2.add(pumpHistoryEntry)
+                    } else {
+                        if (type === PumpHistoryEntryType.EndResultTotals) {
+                            if (!DateTimeUtil.isSameDay(atechDate, pumpHistoryEntry.atechDateTime)) {
+                                newHistory2.add(pumpHistoryEntry)
+                            }
+                        } else {
+                            newHistory2.add(pumpHistoryEntry)
+                        }
+                    }
+                }
+            }
+            tbrs = preProcessTBRs(tbrs)
+            if (bolusEstimates.size > 0) {
+                extendBolusRecords(bolusEstimates, newHistory2)
+            }
+            newHistory2.addAll(tbrs)
+
+            val newHistory3: MutableList<PumpHistoryEntry> = mutableListOf()
+
+            for (pumpHistoryEntry in newHistory2) {
+                if (!allPumpIds.contains(pumpHistoryEntry.pumpId)) {
+                    newHistory3.add(pumpHistoryEntry)
+                }
+            }
+
+            newHistory = newHistory3
+            sort(newHistory)
+        }
+        aapsLogger.debug(LTag.PUMP, "New History entries found: " + newHistory.size)
+        showLogs("List of history (after filtering): [" + newHistory.size + "]", gson.toJson(newHistory))
+    }
+
+    private fun extendBolusRecords(bolusEstimates: MutableList<PumpHistoryEntry>, newHistory2: MutableList<PumpHistoryEntry>) {
+        val boluses: MutableList<PumpHistoryEntry> = getFilteredItems(newHistory2, PumpHistoryEntryType.Bolus)
+        for (bolusEstimate in bolusEstimates) {
+            for (bolus in boluses) {
+                if (bolusEstimate.atechDateTime == bolus.atechDateTime) {
+                    bolus.addDecodedData("Estimate", bolusEstimate.decodedData["Object"]!!)
+                }
+            }
+        }
+    }
+
+    fun finalizeNewHistoryRecords() {
+        if (newHistory.isEmpty()) return
+        var pheLast = newHistory[0]
+
+        // find last entry
+        for (pumpHistoryEntry in newHistory) {
+            if (pumpHistoryEntry.atechDateTime != 0L && pumpHistoryEntry.isAfter(pheLast.atechDateTime)) {
+                pheLast = pumpHistoryEntry
+            }
+        }
+
+        // add new entries
+        newHistory.reverse()
+        for (pumpHistoryEntry in newHistory) {
+            if (!allPumpIds.contains(pumpHistoryEntry.pumpId)) {
+                lastIdUsed++
+                pumpHistoryEntry.id = lastIdUsed
+                allHistory.add(pumpHistoryEntry)
+                allPumpIds.add(pumpHistoryEntry.pumpId)
+            }
+        }
+
+        sp.putLong(MedtronicConst.Statistics.LastPumpHistoryEntry, pheLast.atechDateTime)
+        var dt: LocalDateTime? = null
+        try {
+            dt = DateTimeUtil.toLocalDateTime(pheLast.atechDateTime)
+        } catch (ex: Exception) {
+            aapsLogger.error("Problem decoding date from last record: $pheLast")
+        }
+        if (dt != null) {
+            dt = dt.minusDays(1) // we keep 24 hours
+            val dtRemove = DateTimeUtil.toATechDate(dt)
+            val removeList: MutableList<PumpHistoryEntry?> = ArrayList()
+            for (pumpHistoryEntry in allHistory) {
+                if (!pumpHistoryEntry.isAfter(dtRemove)) {
+                    removeList.add(pumpHistoryEntry)
+                    allPumpIds.remove(pumpHistoryEntry.pumpId)
+                }
+            }
+            allHistory.removeAll(removeList)
+            this.sort(allHistory)
+            aapsLogger.debug(LTag.PUMP, String.format(Locale.ENGLISH, "All History records [afterFilterCount=%d, removedItemsCount=%d, newItemsCount=%d]",
+                allHistory.size, removeList.size, newHistory.size))
+        } else {
+            aapsLogger.error("Since we couldn't determine date, we don't clean full history. This is just workaround.")
+        }
+        newHistory.clear()
+    }
+
+    fun hasRelevantConfigurationChanged(): Boolean {
+        return getStateFromFilteredList( //
+            setOf(PumpHistoryEntryType.ChangeBasalPattern,  //
+                PumpHistoryEntryType.ClearSettings,  //
+                PumpHistoryEntryType.SaveSettings,  //
+                PumpHistoryEntryType.ChangeMaxBolus,  //
+                PumpHistoryEntryType.ChangeMaxBasal,  //
+                PumpHistoryEntryType.ChangeTempBasalType))
+    }
+
+    private fun isCollectionEmpty(col: List<*>?): Boolean {
+        return col == null || col.isEmpty()
+    }
+
+    private fun isCollectionNotEmpty(col: List<*>?): Boolean {
+        return col != null && !col.isEmpty()
+    }
+
+    fun isPumpSuspended(): Boolean {
+        val items = getDataForPumpSuspends()
+        showLogs("isPumpSuspended: ", gson.toJson(items))
+        return if (isCollectionNotEmpty(items)) {
+            val pumpHistoryEntryType = items[0].entryType
+            val isSuspended = !(pumpHistoryEntryType === PumpHistoryEntryType.TempBasalCombined || //
+                pumpHistoryEntryType === PumpHistoryEntryType.BasalProfileStart || //
+                pumpHistoryEntryType === PumpHistoryEntryType.Bolus || //
+                pumpHistoryEntryType === PumpHistoryEntryType.ResumePump || //
+                pumpHistoryEntryType === PumpHistoryEntryType.BatteryChange || //
+                pumpHistoryEntryType === PumpHistoryEntryType.Prime)
+            aapsLogger.debug(LTag.PUMP, String.format(Locale.ENGLISH, "isPumpSuspended. Last entry type=%s, isSuspended=%b", pumpHistoryEntryType, isSuspended))
+            isSuspended
+        } else false
+    }
+
+    private fun getDataForPumpSuspends(): MutableList<PumpHistoryEntry> {
+        val newAndAll: MutableList<PumpHistoryEntry> = mutableListOf()
+        if (isCollectionNotEmpty(allHistory)) {
+            newAndAll.addAll(allHistory)
+        }
+        if (isCollectionNotEmpty(newHistory)) {
+            for (pumpHistoryEntry in newHistory) {
+                if (!newAndAll.contains(pumpHistoryEntry)) {
+                    newAndAll.add(pumpHistoryEntry)
+                }
+            }
+        }
+        if (newAndAll.isEmpty()) return newAndAll
+        this.sort(newAndAll)
+        var newAndAll2: MutableList<PumpHistoryEntry> = getFilteredItems(newAndAll,  //
+            setOf(PumpHistoryEntryType.Bolus,  //
+                PumpHistoryEntryType.TempBasalCombined,  //
+                PumpHistoryEntryType.Prime,  //
+                PumpHistoryEntryType.SuspendPump,  //
+                PumpHistoryEntryType.ResumePump,  //
+                PumpHistoryEntryType.Rewind,  //
+                PumpHistoryEntryType.NoDeliveryAlarm,  //
+                PumpHistoryEntryType.BatteryChange,  //
+                PumpHistoryEntryType.BasalProfileStart))
+        newAndAll2 = filterPumpSuspend(newAndAll2, 10)
+        return newAndAll2
+    }
+
+    private fun filterPumpSuspend(newAndAll: MutableList<PumpHistoryEntry>, filterCount: Int): MutableList<PumpHistoryEntry> {
+        if (newAndAll.size <= filterCount) {
+            return newAndAll
+        }
+        val newAndAllOut: MutableList<PumpHistoryEntry> = ArrayList()
+        for (i in 0 until filterCount) {
+            newAndAllOut.add(newAndAll[i])
+        }
+        return newAndAllOut
+    }
+
+    /**
+     * Process History Data: Boluses(Treatments), TDD, TBRs, Suspend-Resume (or other pump stops: battery, prime)
+     */
+    fun processNewHistoryData() {
+
+        // Prime (for reseting autosense)
+        val primeRecords: MutableList<PumpHistoryEntry> = getFilteredItems(PumpHistoryEntryType.Prime)
+        aapsLogger.debug(LTag.PUMP, String.format(Locale.ENGLISH, "ProcessHistoryData: Prime [count=%d, items=%s]", primeRecords.size, gson.toJson(primeRecords)))
+        if (isCollectionNotEmpty(primeRecords)) {
+            try {
+                processPrime(primeRecords)
+            } catch (ex: Exception) {
+                aapsLogger.error(LTag.PUMP, "ProcessHistoryData: Error processing Prime entries: " + ex.message, ex)
+                throw ex
+            }
+        }
+
+        // Rewind (for marking insulin change)
+        val rewindRecords: MutableList<PumpHistoryEntry> = getFilteredItems(PumpHistoryEntryType.Rewind)
+        aapsLogger.debug(LTag.PUMP, String.format(Locale.ENGLISH, "ProcessHistoryData: Rewind [count=%d, items=%s]", rewindRecords.size, gson.toJson(rewindRecords)))
+        if (isCollectionNotEmpty(rewindRecords)) {
+            try {
+                processRewind(rewindRecords)
+            } catch (ex: Exception) {
+                aapsLogger.error(LTag.PUMP, "ProcessHistoryData: Error processing Rewind entries: " + ex.message, ex)
+                throw ex
+            }
+        }
+
+        // TDD
+        val tdds: MutableList<PumpHistoryEntry> = getFilteredItems(setOf(PumpHistoryEntryType.EndResultTotals, getTDDType()))
+        aapsLogger.debug(LTag.PUMP, String.format(Locale.ENGLISH, "ProcessHistoryData: TDD [count=%d, items=%s]", tdds.size, gson.toJson(tdds)))
+        if (tdds.isNotEmpty()) {
+            try {
+                processTDDs(tdds)
+            } catch (ex: Exception) {
+                aapsLogger.error("ProcessHistoryData: Error processing TDD entries: " + ex.message, ex)
+                throw ex
+            }
+        }
+        pumpTime = medtronicUtil.pumpTime
+
+        // Bolus
+        val treatments = getFilteredItems(PumpHistoryEntryType.Bolus)
+        aapsLogger.debug(LTag.PUMP, String.format(Locale.ENGLISH, "ProcessHistoryData: Bolus [count=%d, items=%s]", treatments.size, gson.toJson(treatments)))
+        if (treatments.isNotEmpty()) {
+            try {
+                processBolusEntries(treatments)
+            } catch (ex: Exception) {
+                aapsLogger.error(LTag.PUMP, "ProcessHistoryData: Error processing Bolus entries: " + ex.message, ex)
+                throw ex
+            }
+        }
+
+        // TBR
+        val tbrs: MutableList<PumpHistoryEntry> = getFilteredItems(PumpHistoryEntryType.TempBasalCombined)
+        aapsLogger.debug(LTag.PUMP, String.format(Locale.ENGLISH, "ProcessHistoryData: TBRs Processed [count=%d, items=%s]", tbrs.size, gson.toJson(tbrs)))
+        if (tbrs.isNotEmpty()) {
+            try {
+                processTBREntries(tbrs)
+            } catch (ex: Exception) {
+                aapsLogger.error(LTag.PUMP, "ProcessHistoryData: Error processing TBR entries: " + ex.message, ex)
+                throw ex
+            }
+        }
+
+        // 'Delivery Suspend'
+        val suspends: MutableList<TempBasalProcessDTO>
+        suspends = try {
+            getSuspendRecords()
+        } catch (ex: Exception) {
+            aapsLogger.error("ProcessHistoryData: Error getting Suspend entries: " + ex.message, ex)
+            throw ex
+        }
+        aapsLogger.debug(LTag.PUMP, String.format(Locale.ENGLISH, "ProcessHistoryData: 'Delivery Suspend' Processed [count=%d, items=%s]", suspends.size,
+            gson.toJson(suspends)))
+        if (suspends.isNotEmpty()) {
+            try {
+                processSuspends(suspends)  // TODO not tested yet
+            } catch (ex: Exception) {
+                aapsLogger.error(LTag.PUMP, "ProcessHistoryData: Error processing Suspends entries: " + ex.message, ex)
+                throw ex
+            }
+        }
+    }
+
+    private fun processPrime(primeRecords: List<PumpHistoryEntry>) {
+        val maxAllowedTimeInPast = DateTimeUtil.getATDWithAddedMinutes(GregorianCalendar(), -30)
+        var lastPrimeRecordTime = 0L
+        var lastPrimeRecord: PumpHistoryEntry? = null
+        for (primeRecord in primeRecords) {
+            val fixedAmount = primeRecord.getDecodedDataEntry("FixedAmount")
+            if (fixedAmount != null && fixedAmount as Float == 0.0f) {
+                // non-fixed primes are used to prime the tubing
+                // fixed primes are used to prime the cannula
+                // so skip the prime entry if it was not a fixed prime
+                continue
+            }
+            if (primeRecord.atechDateTime > maxAllowedTimeInPast) {
+                if (lastPrimeRecordTime != 0L && lastPrimeRecordTime < primeRecord.atechDateTime) {
+                    lastPrimeRecordTime = primeRecord.atechDateTime
+                    lastPrimeRecord = primeRecord
+                }
+            }
+        }
+        if (lastPrimeRecord != null) {
+            uploadCareportalEventIfFoundInHistory(lastPrimeRecord,
+                MedtronicConst.Statistics.LastPrime,
+                DetailedBolusInfo.EventType.CANNULA_CHANGE)
+        }
+    }
+
+    private fun processRewind(rewindRecords: List<PumpHistoryEntry>) {
+        val maxAllowedTimeInPast = DateTimeUtil.getATDWithAddedMinutes(GregorianCalendar(), -30)
+        var lastRewindRecordTime = 0L
+        var lastRewindRecord: PumpHistoryEntry? = null
+        for (rewindRecord in rewindRecords) {
+            if (rewindRecord.atechDateTime > maxAllowedTimeInPast) {
+                if (lastRewindRecordTime < rewindRecord.atechDateTime) {
+                    lastRewindRecordTime = rewindRecord.atechDateTime
+                    lastRewindRecord = rewindRecord
+                }
+            }
+        }
+        if (lastRewindRecord != null) {
+            uploadCareportalEventIfFoundInHistory(lastRewindRecord,
+                MedtronicConst.Statistics.LastRewind,
+                DetailedBolusInfo.EventType.INSULIN_CHANGE)
+        }
+    }
+
+    private fun uploadCareportalEventIfFoundInHistory(historyRecord: PumpHistoryEntry, eventSP: String, eventType: DetailedBolusInfo.EventType) {
+        val lastPrimeFromAAPS = sp.getLong(eventSP, 0L)
+        if (historyRecord.atechDateTime != lastPrimeFromAAPS) {
+            val result = pumpSync.insertTherapyEventIfNewWithTimestamp(
+                DateTimeUtil.toMillisFromATD(historyRecord.atechDateTime),
+                eventType, null,
+                historyRecord.pumpId,
+                medtronicPumpStatus.pumpType,
+                medtronicPumpStatus.serialNumber)
+
+            aapsLogger.debug(LTag.PUMP, String.format(Locale.ROOT, "insertTherapyEventIfNewWithTimestamp [date=%d, eventType=%s, pumpId=%d, pumpSerial=%s] - Result: %b",
+                historyRecord.atechDateTime, eventType, historyRecord.pumpId,
+                medtronicPumpStatus.serialNumber, result))
+
+            sp.putLong(eventSP, historyRecord.atechDateTime)
+        }
+    }
+
+    private fun processTDDs(tddsIn: MutableList<PumpHistoryEntry>) {
+        val tdds = filterTDDs(tddsIn)
+
+        aapsLogger.debug(LTag.PUMP, String.format(Locale.ENGLISH, logPrefix + "TDDs found: %d.\n%s",
+            tdds.size, gson.toJson(tdds)))
+
+        for (tdd in tdds) {
+            val totalsDTO = tdd.decodedData["Object"] as DailyTotalsDTO
+
+            pumpSync.createOrUpdateTotalDailyDose(
+                DateTimeUtil.toMillisFromATD(tdd.atechDateTime),
+                totalsDTO.insulinBolus,
+                totalsDTO.insulinBasal,
+                totalsDTO.insulinTotal,
+                tdd.pumpId,
+                medtronicPumpStatus.pumpType,
+                medtronicPumpStatus.serialNumber
+            )
+        }
+    }
+
+    private enum class ProcessHistoryRecord(val description: String) {
+        Bolus("Bolus"),
+        TBR("TBR"),
+        Suspend("Suspend");
+    }
+
+    private fun processBolusEntries(entryList: MutableList<PumpHistoryEntry>) {
+
+        val boluses = pumpSyncStorage.getBoluses()
+
+        for (bolus in entryList) {
+
+            val bolusDTO = bolus.decodedData["Object"] as BolusDTO
+            var type: DetailedBolusInfo.BolusType = DetailedBolusInfo.BolusType.NORMAL
+            var multiwave = false
+
+            if (bolusDTO.bolusType == PumpBolusType.Extended) {
+                addExtendedBolus(bolus, bolusDTO, multiwave)
+                continue
+            } else if (bolusDTO.bolusType == PumpBolusType.Multiwave) {
+                multiwave = true
+                aapsLogger.debug(LTag.PUMP, String.format(Locale.ENGLISH, "Multiwave bolus from pump, extended bolus and normal bolus will be added."))
+                addExtendedBolus(bolus, bolusDTO, multiwave)
+            }
+
+            val deliveredAmount: Double = if (multiwave) bolusDTO.immediateAmount!! else bolusDTO.deliveredAmount
+
+            var temporaryId: Long? = null
+
+            if (!multiwave) {
+                val entryWithTempId = findDbEntry(bolus, boluses)
+
+                aapsLogger.debug(LTag.PUMP, "DD: entryWithTempId=$entryWithTempId")
+
+                if (entryWithTempId != null) {
+                    aapsLogger.debug(LTag.PUMP, String.format("DD: entryWithTempId.bolusData=%s", if (entryWithTempId.bolusData == null) "null" else entryWithTempId.bolusData))
+
+                    temporaryId = entryWithTempId.temporaryId
+                    pumpSyncStorage.removeBolusWithTemporaryId(temporaryId)
+                    boluses.remove(entryWithTempId)
+                    type = entryWithTempId.bolusData!!.bolusType
+                }
+            }
+
+            if (temporaryId != null) {
+                val result = pumpSync.syncBolusWithTempId(
+                    tryToGetByLocalTime(bolus.atechDateTime),
+                    deliveredAmount,
+                    temporaryId,
+                    type,
+                    bolus.pumpId,
+                    medtronicPumpStatus.pumpType,
+                    medtronicPumpStatus.serialNumber)
+
+                aapsLogger.debug(LTag.PUMP, String.format(Locale.ENGLISH, "syncBolusWithTempId [date=%d, temporaryId=%d, pumpId=%d, insulin=%.2f, pumpSerial=%s] - Result: %b",
+                    bolus.atechDateTime, temporaryId, bolus.pumpId, deliveredAmount,
+                    medtronicPumpStatus.serialNumber, result))
+            } else {
+                val result = pumpSync.syncBolusWithPumpId(
+                    tryToGetByLocalTime(bolus.atechDateTime),
+                    deliveredAmount,
+                    type,
+                    bolus.pumpId,
+                    medtronicPumpStatus.pumpType,
+                    medtronicPumpStatus.serialNumber)
+
+                aapsLogger.debug(LTag.PUMP, String.format(Locale.ENGLISH, "syncBolusWithPumpId [date=%d, pumpId=%d, insulin=%.2f, pumpSerial=%s] - Result: %b",
+                    bolus.atechDateTime, bolus.pumpId, deliveredAmount,
+                    medtronicPumpStatus.serialNumber, result))
+            }
+
+            addCarbs(bolus)
+        }
+    }
+
+    private fun addExtendedBolus(bolus: PumpHistoryEntry, bolusDTO: BolusDTO, isMultiwave: Boolean) {
+        val durationMs: Long = bolusDTO.duration * 60L * 1000L
+
+        val result = pumpSync.syncExtendedBolusWithPumpId(
+            tryToGetByLocalTime(bolus.atechDateTime),
+            bolusDTO.deliveredAmount,
+            durationMs,
+            false,
+            bolus.pumpId,
+            medtronicPumpStatus.pumpType,
+            medtronicPumpStatus.serialNumber)
+
+        aapsLogger.debug(LTag.PUMP, String.format(Locale.ENGLISH, "syncExtendedBolusWithPumpId [date=%d, amount=%.2f, duration=%d, pumpId=%d, pumpSerial=%s, multiwave=%b] - Result: %b",
+            bolus.atechDateTime, bolusDTO.deliveredAmount, bolusDTO.duration, bolus.pumpId,
+            medtronicPumpStatus.serialNumber, isMultiwave, result))
+    }
+
+    private fun addCarbs(bolus: PumpHistoryEntry) {
+        if (bolus.containsDecodedData("Estimate")) {
+            val bolusWizard = bolus.decodedData["Estimate"] as BolusWizardDTO
+
+            pumpSyncStorage.addCarbs(info.nightscout.androidaps.plugins.pump.common.sync.PumpDbEntryCarbs(
+                tryToGetByLocalTime(bolus.atechDateTime),
+                bolusWizard.carbs.toDouble(),
+                medtronicPumpStatus.pumpType,
+                medtronicPumpStatus.serialNumber,
+                bolus.pumpId
+            ))
+        }
+    }
+
+    private fun processTBREntries(entryList: MutableList<PumpHistoryEntry>) {
+        Collections.reverse(entryList)
+        val tbr = entryList[0].getDecodedDataEntry("Object") as TempBasalPair
+        var readOldItem = false
+        if (tbr.isCancelTBR) {
+            val oneMoreEntryFromHistory = getOneMoreEntryFromHistory(PumpHistoryEntryType.TempBasalCombined)
+            if (oneMoreEntryFromHistory != null) {
+                entryList.add(0, oneMoreEntryFromHistory)
+                readOldItem = true
+            } else {
+                entryList.removeAt(0)
+            }
+        }
+
+        val tbrRecords = pumpSyncStorage.getTBRs()
+        aapsLogger.debug(LTag.PUMP, String.format(Locale.ENGLISH, ProcessHistoryRecord.TBR.description + " List (before filter): %s, FromDb=%s", gson.toJson(entryList),
+            tbrRecords))
+        var processDTO: TempBasalProcessDTO? = null
+        val processList: MutableList<TempBasalProcessDTO> = mutableListOf()
+        for (treatment in entryList) {
+            val tbr2 = treatment.getDecodedDataEntry("Object") as TempBasalPair
+            if (tbr2.isCancelTBR) {
+                if (processDTO != null) {
+                    processDTO.itemTwo = treatment
+                    processDTO.cancelPresent = true
+                    if (readOldItem) {
+                        processDTO.processOperation = TempBasalProcessDTO.Operation.Edit
+                        readOldItem = false
+                    }
+                } else {
+                    aapsLogger.warn(LTag.PUMP, "processDTO was null - shouldn't happen, ignoring item. ItemTwo=$treatment")
+                }
+            } else {
+                if (processDTO != null) {
+                    processList.add(processDTO)
+                }
+                processDTO = TempBasalProcessDTO(
+                    itemOne = treatment,
+                    processOperation = TempBasalProcessDTO.Operation.Add,
+                    aapsLogger = aapsLogger,
+                    objectType = TempBasalProcessDTO.ObjectType.TemporaryBasal
+                )
+            }
+        }
+        if (processDTO != null) {
+            processList.add(processDTO)
+        }
+        if (processList.isNotEmpty()) {
+            for (tempBasalProcessDTO in processList) {
+
+                aapsLogger.debug(LTag.PUMP, "DD: tempBasalProcessDTO.itemOne: " + gson.toJson(tempBasalProcessDTO.itemOne))
+                aapsLogger.debug(LTag.PUMP, "DD: tempBasalProcessDTO.itemTwo: " + (if (tempBasalProcessDTO.itemTwo == null) "null" else gson.toJson(tempBasalProcessDTO.itemTwo!!)))
+
+                val entryWithTempId = findDbEntry(tempBasalProcessDTO.itemOne, tbrRecords)
+
+                aapsLogger.debug(LTag.PUMP, "DD: entryWithTempId: " + (if (entryWithTempId == null) "null" else entryWithTempId.toString()))
+
+                val tbrEntry = tempBasalProcessDTO.itemOneTbr //.getDecodedDataEntry("Object") as TempBasalPair
+
+                aapsLogger.debug(LTag.PUMP, String.format("DD: tbrEntry=%s, tempBasalProcessDTO=%s", gson.toJson(tbrEntry), gson.toJson(tempBasalProcessDTO)))
+
+                if (entryWithTempId != null) {
+
+                    if (tbrEntry != null) {
+                        aapsLogger.debug(LTag.PUMP, "DD: tempIdEntry=${entryWithTempId}, tbrEntry=${tbrEntry}, " +
+                            "tempBasalProcessDTO=${tempBasalProcessDTO}, " +
+                            "pumpType=${medtronicPumpStatus.pumpType}, serial=${medtronicPumpStatus.serialNumber}")
+
+                        aapsLogger.debug(LTag.PUMP, "syncTemporaryBasalWithTempId " +
+                            "[date=${tempBasalProcessDTO.atechDateTime}, dateProcess=${tryToGetByLocalTime(tempBasalProcessDTO.atechDateTime)},  " +
+                            "tbrEntry.insulinRate=${tbrEntry.insulinRate}, " +
+                            "duration=${tempBasalProcessDTO.durationAsSeconds} s, " +
+                            "isAbsolute=${!tbrEntry.isPercent}, temporaryId=${entryWithTempId.temporaryId}, " +
+                            "pumpId=${tempBasalProcessDTO.pumpId}, pumpType=${medtronicPumpStatus.pumpType}, " +
+                            "pumpSerial=${medtronicPumpStatus.serialNumber}]")
+
+                        val result = pumpSync.syncTemporaryBasalWithTempId(
+                            tryToGetByLocalTime(tempBasalProcessDTO.atechDateTime),
+                            tbrEntry.insulinRate,
+                            tempBasalProcessDTO.durationAsSeconds * 1000L,
+                            !tbrEntry.isPercent,
+                            entryWithTempId.temporaryId,
+                            PumpSync.TemporaryBasalType.NORMAL,
+                            tempBasalProcessDTO.pumpId,
+                            medtronicPumpStatus.pumpType,
+                            medtronicPumpStatus.serialNumber)
+
+                        aapsLogger.debug(LTag.PUMP, "syncTemporaryBasalWithTempId - Result: ${result}")
+
+                        pumpSyncStorage.removeTemporaryBasalWithTemporaryId(entryWithTempId.temporaryId)
+                        tbrRecords.remove(entryWithTempId)
+
+                        entryWithTempId.pumpId = tempBasalProcessDTO.pumpId
+                        entryWithTempId.date = tryToGetByLocalTime(tempBasalProcessDTO.atechDateTime)
+
+                        if (isTBRActive(entryWithTempId)) {
+                            medtronicPumpStatus.runningTBR = entryWithTempId
+                        }
+                    } else {
+                        aapsLogger.warn(LTag.PUMP, "tbrEntry (itemOne) is null, shouldn't be.")
+                    }
+
+                } else {
+
+                    if (tbrEntry != null) {
+
+                        aapsLogger.debug(LTag.PUMP, "syncTemporaryBasalWithPumpId [date=${tempBasalProcessDTO.atechDateTime}, " +
+                            "pumpId=${tempBasalProcessDTO.pumpId}, rate=${tbrEntry.insulinRate} U, " +
+                            "duration=${tempBasalProcessDTO.durationAsSeconds} s, pumpSerial=${medtronicPumpStatus.serialNumber}]")
+
+                        val result = pumpSync.syncTemporaryBasalWithPumpId(
+                            tryToGetByLocalTime(tempBasalProcessDTO.atechDateTime),
+                            tbrEntry.insulinRate,
+                            tempBasalProcessDTO.durationAsSeconds * 1000L,
+                            !tbrEntry.isPercent,
+                            PumpSync.TemporaryBasalType.NORMAL,
+                            tempBasalProcessDTO.pumpId,
+                            medtronicPumpStatus.pumpType,
+                            medtronicPumpStatus.serialNumber)
+
+                        aapsLogger.debug(LTag.PUMP, "syncTemporaryBasalWithPumpId - Result: $result")
+
+                        if (medtronicPumpStatus.runningTBR != null) {
+                            if (!isTBRActive(medtronicPumpStatus.runningTBR!!)) {
+                                medtronicPumpStatus.runningTBR = null
+                            }
+                        }
+
+                        if (isTBRActive(startTimestamp = tryToGetByLocalTime(tempBasalProcessDTO.atechDateTime),
+                                durationSeconds = tempBasalProcessDTO.durationAsSeconds)) {
+                            if (medtronicPumpStatus.runningTBR == null) {
+                                medtronicPumpStatus.runningTBR = info.nightscout.androidaps.plugins.pump.common.sync.PumpDbEntry(0L,
+                                    tryToGetByLocalTime(tempBasalProcessDTO.atechDateTime),
+                                    medtronicPumpStatus.pumpType,
+                                    medtronicPumpStatus.serialNumber,
+                                    null,
+                                    PumpDbEntryTBR(rate = tbrEntry.insulinRate,
+                                        isAbsolute = !tbrEntry.isPercent,
+                                        durationInSeconds = tempBasalProcessDTO.durationAsSeconds,
+                                        tbrType = PumpSync.TemporaryBasalType.NORMAL),
+                                    tempBasalProcessDTO.pumpId)
+                            }
+                        }
+                    } else {
+                        aapsLogger.warn(LTag.PUMP, "tbrEntry (itemOne) is null, shouldn't be.")
+                    }
+                }
+            } // for
+        } // collection
+    }
+
+    fun isTBRActive(dbEntry: PumpDbEntry): Boolean {
+        return isTBRActive(
+            startTimestamp = dbEntry.date,
+            durationSeconds = dbEntry.tbrData!!.durationInSeconds)
+    }
+
+    fun isTBRActive(startTimestamp: Long, durationSeconds: Int): Boolean {
+        val endDate = startTimestamp + (durationSeconds * 1000)
+
+        return (endDate > System.currentTimeMillis())
+    }
+
+    /**
+     * findDbEntry - finds Db entries in database, while theoretically this should have same dateTime they
+     * don't. Entry on pump is few seconds before treatment in AAPS, and on manual boluses on pump there
+     * is no treatment at all. For now we look fro tratment that was from 0s - 1m59s within pump entry.
+     *
+     * @param treatment          Pump Entry
+     * @param entriesFromHistory entries from history
+     * @return DbObject from AAPS (if found)
+     */
+
+    /**
+     * Looks at all boluses that have temporaryId and find one that is correct for us (if such entry exists)
+     */
+    private fun findDbEntry(treatment: PumpHistoryEntry, temporaryEntries: MutableList<PumpDbEntry>): PumpDbEntry? {
+
+        if (temporaryEntries.isEmpty()) {
+            return null
+        }
+
+        var proposedTime = DateTimeUtil.toMillisFromATD(treatment.atechDateTime)
+
+        // pumpTime should never be null, but it can theoretically happen if reading of time from pump fails
+        this.pumpTime?.let { proposedTime += (it.timeDifference * 1000) }
+
+        val proposedTimeDiff: LongArray = longArrayOf(proposedTime - (2 * 60 * 1000), proposedTime + (2L * 60L * 1000L))
+        val tempEntriesList: MutableList<info.nightscout.androidaps.plugins.pump.common.sync.PumpDbEntry> = mutableListOf()
+
+        for (temporaryEntry in temporaryEntries) {
+            if (temporaryEntry.date > proposedTimeDiff[0] && temporaryEntry.date < proposedTimeDiff[1]) {
+                tempEntriesList.add(temporaryEntry)
+            }
+        }
+
+        if (tempEntriesList.isEmpty()) {
+            return null
+        } else if (tempEntriesList.size == 1) {
+            return tempEntriesList[0]
+        }
+
+        var min = 0
+        while (min < 2) {
+            var sec = 0
+            while (sec <= 50) {
+                if (min == 1 && sec == 50) {
+                    sec = 59
+                }
+                val diff = sec * 1000
+                val outList: MutableList<info.nightscout.androidaps.plugins.pump.common.sync.PumpDbEntry> = mutableListOf()
+                for (treatment1 in tempEntriesList) {
+                    if (treatment1.date > proposedTime - diff && treatment1.date < proposedTime + diff) {
+                        outList.add(treatment1)
+                    }
+                }
+                if (outList.size == 1) {
+                    if (doubleBolusDebug) aapsLogger.debug(LTag.PUMP, String.format(Locale.ENGLISH, "DoubleBolusDebug: findDbEntry Treatment={}, FromDb={}. Type=EntrySelected, AtTimeMin={}, AtTimeSec={}", treatment, outList[0], min, sec))
+                    return outList[0]
+                }
+                if (min == 0 && sec == 10 && outList.size > 1) {
+                    aapsLogger.error(String.format(Locale.ENGLISH, "Too many entries (with too small diff): (timeDiff=[min=%d,sec=%d],count=%d,list=%s)",
+                        min, sec, outList.size, gson.toJson(outList)))
+                    if (doubleBolusDebug) aapsLogger.debug(LTag.PUMP, String.format(Locale.ENGLISH, "DoubleBolusDebug: findDbEntry Error - Too many entries (with too small diff): (timeDiff=[min=%d,sec=%d],count=%d,list=%s)",
+                        min, sec, outList.size, gson.toJson(outList)))
+                }
+                sec += 10
+            }
+            min += 1
+        }
+        return null
+    }
+
+    private fun processSuspends(tempBasalProcessList: List<TempBasalProcessDTO>) {
+        for (tempBasalProcess in tempBasalProcessList) {
+
+            aapsLogger.debug(LTag.PUMP, "processSuspends::syncTemporaryBasalWithPumpId [date=${tempBasalProcess.itemOne.atechDateTime}, " +
+                "rate=0.0, duration=${tempBasalProcess.durationAsSeconds} s, type=${PumpSync.TemporaryBasalType.PUMP_SUSPEND}, " +
+                "pumpId=${tempBasalProcess.itemOne.pumpId}, " +
+                "pumpSerial=${medtronicPumpStatus.serialNumber}]")
+
+            val result = pumpSync.syncTemporaryBasalWithPumpId(
+                tryToGetByLocalTime(tempBasalProcess.itemOne.atechDateTime),
+                0.0,
+                tempBasalProcess.durationAsSeconds * 1000L,
+                true,
+                PumpSync.TemporaryBasalType.PUMP_SUSPEND,
+                tempBasalProcess.itemOne.pumpId,
+                medtronicPumpStatus.pumpType,
+                medtronicPumpStatus.serialNumber)
+
+            aapsLogger.debug(LTag.PUMP, "syncTemporaryBasalWithPumpId: Result: $result")
+        }
+    }
+
+    // suspend/resume
+    // no_delivery/prime & rewind/prime
+    private fun getSuspendRecords(): MutableList<TempBasalProcessDTO> {
+        val outList: MutableList<TempBasalProcessDTO> = mutableListOf()
+
+        // suspend/resume
+        outList.addAll(getSuspendResumeRecordsList())
+        // no_delivery/prime & rewind/prime
+        outList.addAll(getNoDeliveryRewindPrimeRecordsList())
+        return outList
+    }
+
+    private fun getSuspendResumeRecordsList(): List<TempBasalProcessDTO> {
+        val filteredItems = getFilteredItems(newHistory,  //
+            setOf(PumpHistoryEntryType.SuspendPump, PumpHistoryEntryType.ResumePump))
+
+        aapsLogger.debug(LTag.PUMP, "SuspendResume Records: $filteredItems")
+
+        val outList: MutableList<TempBasalProcessDTO> = mutableListOf()
+        if (filteredItems.size > 0) {
+            val filtered2Items: MutableList<PumpHistoryEntry> = mutableListOf()
+            if (filteredItems.size % 2 == 0 && filteredItems[0].entryType === PumpHistoryEntryType.ResumePump) {
+                // full resume suspends (S R S R)
+                filtered2Items.addAll(filteredItems)
+            } else if (filteredItems.size % 2 == 0 && filteredItems[0].entryType === PumpHistoryEntryType.SuspendPump) {
+                // not full suspends, need to retrive one more record and discard first one (R S R S) -> ([S] R S R [xS])
+                filteredItems.removeAt(0)
+                val oneMoreEntryFromHistory = getOneMoreEntryFromHistory(PumpHistoryEntryType.SuspendPump)
+                if (oneMoreEntryFromHistory != null) {
+                    filteredItems.add(oneMoreEntryFromHistory)
+                } else {
+                    filteredItems.removeAt(filteredItems.size - 1) // remove last (unpaired R)
+                }
+                filtered2Items.addAll(filteredItems)
+            } else {
+                if (filteredItems[0].entryType === PumpHistoryEntryType.ResumePump) {
+                    // get one more from history (R S R) -> ([S] R S R)
+                    val oneMoreEntryFromHistory = getOneMoreEntryFromHistory(PumpHistoryEntryType.SuspendPump)
+                    if (oneMoreEntryFromHistory != null) {
+                        filteredItems.add(oneMoreEntryFromHistory)
+                    } else {
+                        filteredItems.removeAt(filteredItems.size - 1) // remove last (unpaired R)
+                    }
+                    filtered2Items.addAll(filteredItems)
+                } else {
+                    // remove last and have paired items
+                    filteredItems.removeAt(0)
+                    filtered2Items.addAll(filteredItems)
+                }
+            }
+            if (filtered2Items.size > 0) {
+                sort(filtered2Items)
+                Collections.reverse(filtered2Items)
+                var i = 0
+                while (i < filtered2Items.size) {
+                    val tbrProcess = TempBasalProcessDTO(
+                        itemOne = filtered2Items[i],
+                        processOperation = TempBasalProcessDTO.Operation.Add,
+                        aapsLogger = aapsLogger,
+                        objectType = TempBasalProcessDTO.ObjectType.Suspend)
+
+                    tbrProcess.itemTwo = filtered2Items[i + 1]
+
+                    if (tbrProcess.itemTwo != null)
+                        outList.add(tbrProcess)
+
+                    i += 2
+                }
+            }
+        }
+        return outList
+    }
+
+    private fun getNoDeliveryRewindPrimeRecordsList(): List<TempBasalProcessDTO> {
+        val primeItems: MutableList<PumpHistoryEntry> = getFilteredItems(newHistory,  //
+            setOf(PumpHistoryEntryType.Prime))
+
+        aapsLogger.debug(LTag.PUMP, "Prime Records: $primeItems")
+
+        val outList: MutableList<TempBasalProcessDTO> = ArrayList()
+        if (primeItems.size == 0) return outList
+        val filteredItems: MutableList<PumpHistoryEntry> = getFilteredItems(newHistory,  //
+            setOf(PumpHistoryEntryType.Prime,
+                PumpHistoryEntryType.Rewind,
+                PumpHistoryEntryType.NoDeliveryAlarm,
+                PumpHistoryEntryType.Bolus,
+                PumpHistoryEntryType.TempBasalCombined)
+        )
+
+        aapsLogger.debug(LTag.PUMP, "Filtered Records: $filteredItems")
+
+        val tempData: MutableList<PumpHistoryEntry> = mutableListOf()
+        var startedItems = false
+        var finishedItems = false
+        for (filteredItem in filteredItems) {
+            if (filteredItem.entryType === PumpHistoryEntryType.Prime) {
+                startedItems = true
+            }
+            if (startedItems) {
+                if (filteredItem.entryType === PumpHistoryEntryType.Bolus ||
+                    filteredItem.entryType === PumpHistoryEntryType.TempBasalCombined) {
+                    finishedItems = true
+                    break
+                }
+                tempData.add(filteredItem)
+            }
+        }
+        if (!finishedItems) {
+            val filteredItemsOld: MutableList<PumpHistoryEntry> = getFilteredItems(allHistory,  //
+                setOf(PumpHistoryEntryType.Rewind,
+                    PumpHistoryEntryType.NoDeliveryAlarm,
+                    PumpHistoryEntryType.Bolus,
+                    PumpHistoryEntryType.TempBasalCombined)
+            )
+            for (filteredItem in filteredItemsOld) {
+                if (filteredItem.entryType === PumpHistoryEntryType.Bolus ||
+                    filteredItem.entryType === PumpHistoryEntryType.TempBasalCombined) {
+                    finishedItems = true
+                    break
+                }
+                tempData.add(filteredItem)
+            }
+        }
+        if (!finishedItems) {
+            showLogs("NoDeliveryRewindPrimeRecords: Not finished Items: ", gson.toJson(tempData))
+            return outList
+        }
+        showLogs("NoDeliveryRewindPrimeRecords: Records to evaluate: ", gson.toJson(tempData))
+        var items: MutableList<PumpHistoryEntry> = getFilteredItems(tempData, PumpHistoryEntryType.Prime)
+        val itemTwo = items[0]
+
+        items = getFilteredItems(tempData, PumpHistoryEntryType.NoDeliveryAlarm)
+        if (items.size > 0) {
+            val tbrProcess = TempBasalProcessDTO(
+                itemOne = items[items.size - 1],
+                processOperation = TempBasalProcessDTO.Operation.Add,
+                aapsLogger = aapsLogger,
+                objectType = TempBasalProcessDTO.ObjectType.Suspend)
+
+            tbrProcess.itemTwo = itemTwo
+
+            if (tbrProcess.itemTwo != null)
+                outList.add(tbrProcess)
+
+            return outList
+        }
+
+        items = getFilteredItems(tempData, PumpHistoryEntryType.Rewind)
+        if (items.size > 0) {
+            val tbrProcess = TempBasalProcessDTO(
+                itemOne = items[0],
+                processOperation = TempBasalProcessDTO.Operation.Add,
+                aapsLogger = aapsLogger,
+                objectType = TempBasalProcessDTO.ObjectType.Suspend)
+
+            tbrProcess.itemTwo = itemTwo
+
+            if (tbrProcess.itemTwo != null)
+                outList.add(tbrProcess)
+
+            return outList
+        }
+
+        return outList
+    }
+
+    private fun getOneMoreEntryFromHistory(entryType: PumpHistoryEntryType): PumpHistoryEntry? {
+        val filteredItems: List<PumpHistoryEntry?> = getFilteredItems(allHistory, entryType)
+        return if (filteredItems.size == 0) null else filteredItems[0]
+    }
+
+    private fun filterTDDs(tdds: MutableList<PumpHistoryEntry>): MutableList<PumpHistoryEntry> {
+        val tddsOut: MutableList<PumpHistoryEntry> = mutableListOf()
+        for (tdd in tdds) {
+            if (tdd.entryType !== PumpHistoryEntryType.EndResultTotals) {
+                tddsOut.add(tdd)
+            }
+        }
+        return if (tddsOut.size == 0) tdds else tddsOut
+    }
+
+    private fun tryToGetByLocalTime(atechDateTime: Long): Long {
+        return DateTimeUtil.toMillisFromATD(atechDateTime)
+    }
+
+    private fun getTDDType(): PumpHistoryEntryType {
+        return if (!medtronicUtil.isModelSet) {
+            PumpHistoryEntryType.EndResultTotals
+        } else when (medtronicUtil.medtronicPumpModel) {
+            MedtronicDeviceType.Medtronic_515,
+            MedtronicDeviceType.Medtronic_715     -> PumpHistoryEntryType.DailyTotals515
+            MedtronicDeviceType.Medtronic_522,
+            MedtronicDeviceType.Medtronic_722     -> PumpHistoryEntryType.DailyTotals522
+            MedtronicDeviceType.Medtronic_523_Revel,
+            MedtronicDeviceType.Medtronic_723_Revel,
+            MedtronicDeviceType.Medtronic_554_Veo,
+            MedtronicDeviceType.Medtronic_754_Veo -> PumpHistoryEntryType.DailyTotals523
+
+            else                                  -> {
+                PumpHistoryEntryType.EndResultTotals
+            }
+        }
+    }
+
+    fun hasBasalProfileChanged(): Boolean {
+        val filteredItems: List<PumpHistoryEntry?> = getFilteredItems(PumpHistoryEntryType.ChangeBasalProfile_NewProfile)
+        aapsLogger.debug(LTag.PUMP, "hasBasalProfileChanged. Items: " + gson.toJson(filteredItems))
+        return filteredItems.size > 0
+    }
+
+    fun processLastBasalProfileChange(pumpType: PumpType, mdtPumpStatus: MedtronicPumpStatus) {
+        val filteredItems: List<PumpHistoryEntry> = getFilteredItems(PumpHistoryEntryType.ChangeBasalProfile_NewProfile)
+        aapsLogger.debug(LTag.PUMP, "processLastBasalProfileChange. Items: $filteredItems")
+        var newProfile: PumpHistoryEntry? = null
+        var lastDate: Long? = null
+        if (filteredItems.size == 1) {
+            newProfile = filteredItems[0]
+        } else if (filteredItems.size > 1) {
+            for (filteredItem in filteredItems) {
+                if (lastDate == null || lastDate < filteredItem.atechDateTime) {
+                    newProfile = filteredItem
+                    lastDate = newProfile.atechDateTime
+                }
+            }
+        }
+        if (newProfile != null) {
+            aapsLogger.debug(LTag.PUMP, "processLastBasalProfileChange. item found, setting new basalProfileLocally: $newProfile")
+            val basalProfile = newProfile.decodedData["Object"] as BasalProfile
+            mdtPumpStatus.basalsByHour = basalProfile.getProfilesByHour(pumpType)
+        }
+    }
+
+    fun hasPumpTimeChanged(): Boolean {
+        return getStateFromFilteredList(setOf(PumpHistoryEntryType.NewTimeSet,  //
+            PumpHistoryEntryType.ChangeTime))
+    }
+
+    fun setIsInInit(init: Boolean) {
+        isInit = init
+    }
+
+    // HELPER METHODS
+    private fun sort(list: MutableList<PumpHistoryEntry>) {
+        // if (list != null && !list.isEmpty()) {
+        //     Collections.sort(list, PumpHistoryEntry.Comparator())
+        // }
+        list.sortWith(PumpHistoryEntry.Comparator())
+    }
+
+    private fun preProcessTBRs(TBRs_Input: MutableList<PumpHistoryEntry>): MutableList<PumpHistoryEntry> {
+        val TBRs: MutableList<PumpHistoryEntry> = mutableListOf()
+        val map: MutableMap<String?, PumpHistoryEntry?> = HashMap()
+        for (pumpHistoryEntry in TBRs_Input) {
+            if (map.containsKey(pumpHistoryEntry.DT)) {
+                medtronicPumpHistoryDecoder.decodeTempBasal(map[pumpHistoryEntry.DT]!!, pumpHistoryEntry)
+                pumpHistoryEntry.setEntryType(medtronicUtil.medtronicPumpModel, PumpHistoryEntryType.TempBasalCombined)
+                TBRs.add(pumpHistoryEntry)
+                map.remove(pumpHistoryEntry.DT)
+            } else {
+                map[pumpHistoryEntry.DT] = pumpHistoryEntry
+            }
+        }
+        return TBRs
+    }
+
+    private fun getFilteredItems(entryTypes: Set<PumpHistoryEntryType>?): MutableList<PumpHistoryEntry> {
+        return getFilteredItems(newHistory, entryTypes)
+    }
+
+    private fun getFilteredItems(entryType: PumpHistoryEntryType): MutableList<PumpHistoryEntry> {
+        return getFilteredItems(newHistory, setOf(entryType))
+    }
+
+    private fun getStateFromFilteredList(entryTypes: Set<PumpHistoryEntryType>?): Boolean {
+        return if (isInit) {
+            false
+        } else {
+            val filteredItems: List<PumpHistoryEntry?> = getFilteredItems(entryTypes)
+            aapsLogger.debug(LTag.PUMP, "Items: $filteredItems")
+            filteredItems.size > 0
+        }
+    }
+
+    private fun getFilteredItems(inList: MutableList<PumpHistoryEntry>?, entryType: PumpHistoryEntryType): MutableList<PumpHistoryEntry> {
+        return getFilteredItems(inList, setOf(entryType))
+    }
+
+    private fun getFilteredItems(inList: MutableList<PumpHistoryEntry>?, entryTypes: Set<PumpHistoryEntryType>?): MutableList<PumpHistoryEntry> {
+        val outList: MutableList<PumpHistoryEntry> = mutableListOf()
+        if (!inList.isNullOrEmpty()) {
+            for (pumpHistoryEntry in inList) {
+                if (entryTypes.isNullOrEmpty()) {
+                    outList.add(pumpHistoryEntry)
+                } else {
+                    if (entryTypes.contains(pumpHistoryEntry.entryType)) {
+                        outList.add(pumpHistoryEntry)
+                    }
+                }
+            }
+        }
+        return outList
+    }
+
+    private val logPrefix: String
+        get() = "MedtronicHistoryData::"
+
+    companion object {
+
+        /**
+         * Double bolus debug. We seem to have small problem with double Boluses (or sometimes also missing boluses
+         * from history. This flag turns on debugging for that (default is off=false)... Debugging is pretty detailed,
+         * so log files will get bigger.
+         * Note: June 2020. Since this seems to be fixed, I am disabling this per default. I will leave code inside
+         * in case we need it again. Code that turns this on is commented out RileyLinkMedtronicService#verifyConfiguration()
+         */
+        const val doubleBolusDebug = false
+    }
+
+}
\ No newline at end of file
diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/BasalProfile.java b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/BasalProfile.java
deleted file mode 100644
index 3cbd03f20d..0000000000
--- a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/BasalProfile.java
+++ /dev/null
@@ -1,384 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.medtronic.data.dto;
-
-import androidx.annotation.NonNull;
-
-import com.google.gson.annotations.Expose;
-
-import org.joda.time.Instant;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Locale;
-
-import info.nightscout.androidaps.logging.AAPSLogger;
-import info.nightscout.androidaps.logging.LTag;
-import info.nightscout.androidaps.plugins.pump.common.defs.PumpType;
-import info.nightscout.androidaps.plugins.pump.common.utils.ByteUtil;
-import info.nightscout.androidaps.plugins.pump.medtronic.util.MedtronicUtil;
-
-/**
- * Created by geoff on 6/1/15.
- * <p>
- * There are three basal profiles stored on the pump. (722 only?) They are all parsed the same, the user just has 3 to
- * choose from: Standard, A, and B
- * <p>
- * The byte array is 48 times three byte entries long, plus a zero? If the profile is completely empty, it should have
- * one entry: [0,0,0x3F]. The first entry of [0,0,0] marks the end of the used entries.
- * <p>
- * Each entry is assumed to span from the specified start time to the start time of the next entry, or to midnight if
- * there are no more entries.
- * <p>
- * Individual entries are of the form [r,z,m] where r is the rate (in 0.025 U increments) z is zero (?) m is the start
- * time-of-day for the basal rate period (in 30 minute increments)
- */
-public class BasalProfile {
-
-    private final AAPSLogger aapsLogger;
-
-    public static final int MAX_RAW_DATA_SIZE = (48 * 3) + 1;
-    private static final boolean DEBUG_BASALPROFILE = false;
-    @Expose
-    private byte[] mRawData; // store as byte array to make transport (via parcel) easier
-    private List<BasalProfileEntry> listEntries;
-
-
-    public BasalProfile(AAPSLogger aapsLogger) {
-        this.aapsLogger = aapsLogger;
-        init();
-    }
-
-
-    public BasalProfile(AAPSLogger aapsLogger, byte[] data) {
-        this.aapsLogger = aapsLogger;
-        setRawData(data);
-    }
-
-
-    // this asUINT8 should be combined with Record.asUINT8, and placed in a new util class.
-    private static int readUnsignedByte(byte b) {
-        return (b < 0) ? b + 256 : b;
-    }
-
-
-    public void init() {
-        mRawData = new byte[MAX_RAW_DATA_SIZE];
-        mRawData[0] = 0;
-        mRawData[1] = 0;
-        mRawData[2] = 0x3f;
-    }
-
-
-    private boolean setRawData(byte[] data) {
-        if (data == null) {
-            aapsLogger.error(LTag.PUMPCOMM, "setRawData: buffer is null!");
-            return false;
-        }
-
-        // if we have just one entry through all day it looks like just length 1
-        if (data.length == 1) {
-            data = MedtronicUtil.createByteArray(data[0], (byte) 0, (byte) 0);
-        }
-
-        if (data.length == MAX_RAW_DATA_SIZE) {
-            mRawData = data;
-        } else {
-            int len = Math.min(MAX_RAW_DATA_SIZE, data.length);
-            mRawData = new byte[MAX_RAW_DATA_SIZE];
-            System.arraycopy(data, 0, mRawData, 0, len);
-        }
-
-        return true;
-    }
-
-
-    public boolean setRawDataFromHistory(byte[] data) {
-        if (data == null) {
-            aapsLogger.error(LTag.PUMPCOMM, "setRawData: buffer is null!");
-            return false;
-        }
-
-        mRawData = new byte[MAX_RAW_DATA_SIZE];
-        int item = 0;
-
-        for (int i = 0; i < data.length - 2; i += 3) {
-
-            if ((data[i] == 0) && (data[i + 1] == 0) && (data[i + 2] == 0)) {
-                mRawData[i] = 0;
-                mRawData[i + 1] = 0;
-                mRawData[i + 2] = 0;
-            }
-
-            mRawData[i] = data[i + 1];
-            mRawData[i + 1] = data[i + 2];
-            mRawData[i + 2] = data[i];
-        }
-
-        return true;
-    }
-
-
-    public void dumpBasalProfile() {
-        aapsLogger.debug(LTag.PUMPCOMM, "Basal Profile entries:");
-        List<BasalProfileEntry> entries = getEntries();
-        for (int i = 0; i < entries.size(); i++) {
-            BasalProfileEntry entry = entries.get(i);
-            String startString = entry.startTime.toString("HH:mm");
-            // this doesn't work
-            aapsLogger.debug(LTag.PUMPCOMM, String.format(Locale.ENGLISH, "Entry %d, rate=%.3f (%s), start=%s (0x%02X)", i + 1, entry.rate,
-                    ByteUtil.getHex(entry.rate_raw), startString, entry.startTime_raw));
-
-        }
-    }
-
-
-    public String getBasalProfileAsString() {
-        StringBuffer sb = new StringBuffer("Basal Profile entries:\n");
-        List<BasalProfileEntry> entries = getEntries();
-        for (int i = 0; i < entries.size(); i++) {
-            BasalProfileEntry entry = entries.get(i);
-            String startString = entry.startTime.toString("HH:mm");
-
-            sb.append(String.format(Locale.ENGLISH, "Entry %d, rate=%.3f, start=%s\n", i + 1, entry.rate, startString));
-        }
-
-        return sb.toString();
-    }
-
-    public String basalProfileToStringError() {
-        return "Basal Profile [rawData=" + ByteUtil.shortHexString(this.getRawData()) + "]";
-    }
-
-
-    public String basalProfileToString() {
-        StringBuffer sb = new StringBuffer("Basal Profile [");
-        List<BasalProfileEntry> entries = getEntries();
-        for (int i = 0; i < entries.size(); i++) {
-            BasalProfileEntry entry = entries.get(i);
-            String startString = entry.startTime.toString("HH:mm");
-
-            sb.append(String.format(Locale.ENGLISH, "%s=%.3f, ", startString, entry.rate));
-        }
-
-        sb.append("]");
-
-        return sb.toString();
-    }
-
-
-    // TODO: this function must be expanded to include changes in which profile is in use.
-    // and changes to the profiles themselves.
-    public BasalProfileEntry getEntryForTime(Instant when) {
-        BasalProfileEntry rval = new BasalProfileEntry();
-        List<BasalProfileEntry> entries = getEntries();
-        if (entries.size() == 0) {
-            aapsLogger.warn(LTag.PUMPCOMM, String.format(Locale.ENGLISH, "getEntryForTime(%s): table is empty",
-                    when.toDateTime().toLocalTime().toString("HH:mm")));
-            return rval;
-        }
-        // Log.w(TAG,"Assuming first entry");
-        rval = entries.get(0);
-        if (entries.size() == 1) {
-            aapsLogger.debug(LTag.PUMPCOMM, "getEntryForTime: Only one entry in profile");
-            return rval;
-        }
-
-        int localMillis = when.toDateTime().toLocalTime().getMillisOfDay();
-        boolean done = false;
-        int i = 1;
-        while (!done) {
-            BasalProfileEntry entry = entries.get(i);
-            if (DEBUG_BASALPROFILE) {
-                aapsLogger.debug(LTag.PUMPCOMM, String.format(Locale.ENGLISH, "Comparing 'now'=%s to entry 'start time'=%s", when.toDateTime().toLocalTime()
-                        .toString("HH:mm"), entry.startTime.toString("HH:mm")));
-            }
-            if (localMillis >= entry.startTime.getMillisOfDay()) {
-                rval = entry;
-                if (DEBUG_BASALPROFILE)
-                    aapsLogger.debug(LTag.PUMPCOMM, "Accepted Entry");
-            } else {
-                // entry at i has later start time, keep older entry
-                if (DEBUG_BASALPROFILE)
-                    aapsLogger.debug(LTag.PUMPCOMM, "Rejected Entry");
-                done = true;
-            }
-            i++;
-            if (i >= entries.size()) {
-                done = true;
-            }
-        }
-        if (DEBUG_BASALPROFILE) {
-            aapsLogger.debug(LTag.PUMPCOMM, String.format(Locale.ENGLISH, "getEntryForTime(%s): Returning entry: rate=%.3f (%s), start=%s (%d)", when
-                            .toDateTime().toLocalTime().toString("HH:mm"), rval.rate, ByteUtil.getHex(rval.rate_raw),
-                    rval.startTime.toString("HH:mm"), rval.startTime_raw));
-        }
-        return rval;
-    }
-
-
-    public List<BasalProfileEntry> getEntries() {
-        List<BasalProfileEntry> entries = new ArrayList<>();
-
-        if (mRawData == null || mRawData[2] == 0x3f) {
-            aapsLogger.warn(LTag.PUMPCOMM, "Raw Data is empty.");
-            return entries; // an empty list
-        }
-        int r, st;
-
-        for (int i = 0; i < mRawData.length - 2; i += 3) {
-
-            if ((mRawData[i] == 0) && (mRawData[i + 1] == 0) && (mRawData[i + 2] == 0))
-                break;
-
-            if ((mRawData[i] == 0) && (mRawData[i + 1] == 0) && (mRawData[i + 2] == 0x3f))
-                break;
-
-            r = MedtronicUtil.makeUnsignedShort(mRawData[i + 1], mRawData[i]); // readUnsignedByte(mRawData[i]);
-            st = readUnsignedByte(mRawData[i + 2]);
-
-            try {
-                entries.add(new BasalProfileEntry(aapsLogger, r, st));
-            } catch (Exception ex) {
-                aapsLogger.error(LTag.PUMPCOMM, "Error decoding basal profile from bytes: " + ByteUtil.shortHexString(mRawData));
-                throw ex;
-            }
-
-        }
-
-        return entries;
-    }
-
-
-    /**
-     * This is used to prepare new profile
-     *
-     * @param entry
-     */
-    public void addEntry(BasalProfileEntry entry) {
-        if (listEntries == null)
-            listEntries = new ArrayList<>();
-
-        listEntries.add(entry);
-    }
-
-
-    public void generateRawDataFromEntries() {
-
-        List<Byte> outData = new ArrayList<>();
-
-        for (BasalProfileEntry profileEntry : listEntries) {
-
-            byte[] strokes = MedtronicUtil.getBasalStrokes(profileEntry.rate, true);
-
-            outData.add(profileEntry.rate_raw[0]);
-            outData.add(profileEntry.rate_raw[1]);
-            outData.add(profileEntry.startTime_raw);
-        }
-
-        this.setRawData(MedtronicUtil.createByteArray(outData));
-
-        // return this.mRawData;
-    }
-
-
-    public Double[] getProfilesByHour(PumpType pumpType) {
-
-        List<BasalProfileEntry> entries = null;
-
-        try {
-            entries = getEntries();
-        } catch (Exception ex) {
-            aapsLogger.error(LTag.PUMPCOMM, "=============================================================================");
-            aapsLogger.error(LTag.PUMPCOMM, "  Error generating entries. Ex.: " + ex, ex);
-            aapsLogger.error(LTag.PUMPCOMM, "  rawBasalValues: " + ByteUtil.shortHexString(this.getRawData()));
-            aapsLogger.error(LTag.PUMPCOMM, "=============================================================================");
-
-            //FabricUtil.createEvent("MedtronicBasalProfileGetByHourError", null);
-        }
-
-        if (entries == null || entries.size() == 0) {
-            Double[] basalByHour = new Double[24];
-
-            for (int i = 0; i < 24; i++) {
-                basalByHour[i] = 0.0d;
-            }
-
-            return basalByHour;
-        }
-
-        Double[] basalByHour = new Double[24];
-
-        for (int i = 0; i < entries.size(); i++) {
-            BasalProfileEntry current = entries.get(i);
-
-            int currentTime = (current.startTime_raw % 2 == 0) ? current.startTime_raw : current.startTime_raw - 1;
-
-            currentTime = (currentTime * 30) / 60;
-
-            int lastHour;
-            if ((i + 1) == entries.size()) {
-                lastHour = 24;
-            } else {
-                BasalProfileEntry basalProfileEntry = entries.get(i + 1);
-
-                int rawTime = (basalProfileEntry.startTime_raw % 2 == 0) ? basalProfileEntry.startTime_raw
-                        : basalProfileEntry.startTime_raw - 1;
-
-                lastHour = (rawTime * 30) / 60;
-            }
-
-            // System.out.println("Current time: " + currentTime + " Next Time: " + lastHour);
-
-            for (int j = currentTime; j < lastHour; j++) {
-                if (pumpType == null)
-                    basalByHour[j] = current.rate;
-                else
-                    basalByHour[j] = pumpType.determineCorrectBasalSize(current.rate);
-            }
-        }
-
-        return basalByHour;
-    }
-
-
-    public static String getProfilesByHourToString(Double[] data) {
-
-        StringBuilder stringBuilder = new StringBuilder();
-
-        for (Double value : data) {
-            stringBuilder.append(String.format("%.3f", value));
-            stringBuilder.append(" ");
-        }
-
-        return stringBuilder.toString();
-
-    }
-
-
-    public byte[] getRawData() {
-        return this.mRawData;
-    }
-
-
-    @NonNull public String toString() {
-        return basalProfileToString();
-    }
-
-
-    public boolean verify(PumpType pumpType) {
-
-        try {
-            getEntries();
-        } catch (Exception ex) {
-            return false;
-        }
-
-        Double[] profilesByHour = getProfilesByHour(pumpType);
-
-        for (Double aDouble : profilesByHour) {
-            if (aDouble > 35.0d)
-                return false;
-        }
-
-        return true;
-    }
-}
diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/BasalProfile.kt b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/BasalProfile.kt
new file mode 100644
index 0000000000..881a7ed6f6
--- /dev/null
+++ b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/BasalProfile.kt
@@ -0,0 +1,321 @@
+package info.nightscout.androidaps.plugins.pump.medtronic.data.dto
+
+import com.google.gson.annotations.Expose
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.pump.common.defs.PumpType
+import info.nightscout.androidaps.plugins.pump.common.utils.ByteUtil
+import info.nightscout.androidaps.plugins.pump.medtronic.util.MedtronicUtil
+import org.joda.time.Instant
+import java.util.*
+
+/**
+ * Created by geoff on 6/1/15.
+ *
+ *
+ * There are three basal profiles stored on the pump. (722 only?) They are all parsed the same, the user just has 3 to
+ * choose from: Standard, A, and B
+ *
+ *
+ * The byte array is 48 times three byte entries long, plus a zero? If the profile is completely empty, it should have
+ * one entry: [0,0,0x3F]. The first entry of [0,0,0] marks the end of the used entries.
+ *
+ *
+ * Each entry is assumed to span from the specified start time to the start time of the next entry, or to midnight if
+ * there are no more entries.
+ *
+ *
+ * Individual entries are of the form [r,z,m] where r is the rate (in 0.025 U increments) z is zero (?) m is the start
+ * time-of-day for the basal rate period (in 30 minute increments)
+ */
+class BasalProfile {
+
+    private val aapsLogger: AAPSLogger
+
+    @Expose
+    lateinit var rawData: ByteArray // store as byte array to make transport (via parcel) easier
+        private set
+
+    private var listEntries: MutableList<BasalProfileEntry>? = null
+
+    constructor(aapsLogger: AAPSLogger) {
+        this.aapsLogger = aapsLogger
+        init()
+    }
+
+    constructor(aapsLogger: AAPSLogger, data: ByteArray) {
+        this.aapsLogger = aapsLogger
+        setRawData(data)
+    }
+
+    fun init() {
+        rawData = byteArrayOf(0, 0, 0x3f)
+    }
+
+    private fun setRawData(data: ByteArray): Boolean {
+        var dataInternal: ByteArray = data
+        // if (dataInternal == null) {
+        //     aapsLogger.error(LTag.PUMPCOMM, "setRawData: buffer is null!")
+        //     return false
+        // }
+
+        // if we have just one entry through all day it looks like just length 1
+        if (dataInternal.size == 1) {
+            dataInternal = byteArrayOf(dataInternal[0], 0, 0)
+        }
+        if (dataInternal.size == MAX_RAW_DATA_SIZE) {
+            rawData = dataInternal
+        } else {
+            val len = Math.min(MAX_RAW_DATA_SIZE, data.size)
+            rawData = ByteArray(MAX_RAW_DATA_SIZE)
+            System.arraycopy(data, 0, rawData, 0, len)
+        }
+        return true
+    }
+
+    fun setRawDataFromHistory(data: ByteArray?): Boolean {
+        if (data == null) {
+            aapsLogger.error(LTag.PUMPCOMM, "setRawData: buffer is null!")
+            return false
+        }
+        rawData = ByteArray(MAX_RAW_DATA_SIZE)
+        var i = 0
+        while (i < data.size - 2) {
+            if (data[i] == 0.toByte() && data[i + 1] == 0.toByte() && data[i + 2] == 0.toByte()) {
+                rawData[i] = 0
+                rawData[i + 1] = 0
+                rawData[i + 2] = 0
+            }
+            rawData[i] = data[i + 1]
+            rawData[i + 1] = data[i + 2]
+            rawData[i + 2] = data[i]
+            i += 3
+        }
+        return true
+    }
+
+    fun dumpBasalProfile() {
+        aapsLogger.debug(LTag.PUMPCOMM, "Basal Profile entries:")
+        val entries = getEntries()
+        for (i in entries.indices) {
+            val entry = entries[i]
+            val startString = entry.startTime!!.toString("HH:mm")
+            // this doesn't work
+            aapsLogger.debug(LTag.PUMPCOMM, String.format(Locale.ENGLISH, "Entry %d, rate=%.3f (%s), start=%s (0x%02X)", i + 1, entry.rate,
+                ByteUtil.getHex(entry.rate_raw), startString, entry.startTime_raw))
+        }
+    }
+
+    val basalProfileAsString: String
+        get() {
+            val sb = StringBuffer("Basal Profile entries:\n")
+            val entries = getEntries()
+            for (i in entries.indices) {
+                val entry = entries[i]
+                val startString = entry.startTime!!.toString("HH:mm")
+                sb.append(String.format(Locale.ENGLISH, "Entry %d, rate=%.3f, start=%s\n", i + 1, entry.rate, startString))
+            }
+            return sb.toString()
+        }
+
+    fun basalProfileToStringError(): String {
+        return "Basal Profile [rawData=" + ByteUtil.shortHexString(rawData) + "]"
+    }
+
+    fun basalProfileToString(): String {
+        val sb = StringBuffer("Basal Profile [")
+        val entries = getEntries()
+        for (i in entries.indices) {
+            val entry = entries[i]
+            val startString = entry.startTime!!.toString("HH:mm")
+            sb.append(String.format(Locale.ENGLISH, "%s=%.3f, ", startString, entry.rate))
+        }
+        sb.append("]")
+        return sb.toString()
+    }
+
+    // TODO: this function must be expanded to include changes in which profile is in use.
+    // and changes to the profiles themselves.
+    fun getEntryForTime(`when`: Instant): BasalProfileEntry {
+        var rval = BasalProfileEntry()
+        val entries = getEntries()
+        if (entries.size == 0) {
+            aapsLogger.warn(LTag.PUMPCOMM, String.format(Locale.ENGLISH, "getEntryForTime(%s): table is empty",
+                `when`.toDateTime().toLocalTime().toString("HH:mm")))
+            return rval
+        }
+        // Log.w(TAG,"Assuming first entry");
+        rval = entries[0]
+        if (entries.size == 1) {
+            aapsLogger.debug(LTag.PUMPCOMM, "getEntryForTime: Only one entry in profile")
+            return rval
+        }
+        val localMillis = `when`.toDateTime().toLocalTime().millisOfDay
+        var done = false
+        var i = 1
+        while (!done) {
+            val entry = entries[i]
+            if (DEBUG_BASALPROFILE) {
+                aapsLogger.debug(LTag.PUMPCOMM, String.format(Locale.ENGLISH, "Comparing 'now'=%s to entry 'start time'=%s", `when`.toDateTime().toLocalTime()
+                    .toString("HH:mm"), entry.startTime!!.toString("HH:mm")))
+            }
+            if (localMillis >= entry.startTime!!.millisOfDay) {
+                rval = entry
+                if (DEBUG_BASALPROFILE) aapsLogger.debug(LTag.PUMPCOMM, "Accepted Entry")
+            } else {
+                // entry at i has later start time, keep older entry
+                if (DEBUG_BASALPROFILE) aapsLogger.debug(LTag.PUMPCOMM, "Rejected Entry")
+                done = true
+            }
+            i++
+            if (i >= entries.size) {
+                done = true
+            }
+        }
+        if (DEBUG_BASALPROFILE) {
+            aapsLogger.debug(LTag.PUMPCOMM, String.format(Locale.ENGLISH, "getEntryForTime(%s): Returning entry: rate=%.3f (%s), start=%s (%d)", `when`
+                .toDateTime().toLocalTime().toString("HH:mm"), rval.rate, ByteUtil.getHex(rval.rate_raw),
+                rval.startTime!!.toString("HH:mm"), rval.startTime_raw))
+        }
+        return rval
+    }// readUnsignedByte(mRawData[i]);
+
+    // an empty list
+    fun getEntries(): List<BasalProfileEntry> {
+        val entries: MutableList<BasalProfileEntry> = ArrayList()
+        if (rawData[2] == 0x3f.toByte()) {
+            aapsLogger.warn(LTag.PUMPCOMM, "Raw Data is empty.")
+            return entries // an empty list
+        }
+        var r: Int
+        var st: Int
+        var i = 0
+        while (i < rawData.size - 2) {
+            if (rawData[i] == 0.toByte() && rawData[i + 1] == 0.toByte() && rawData[i + 2] == 0.toByte()) break
+            if (rawData[i] == 0.toByte() && rawData[i + 1] == 0.toByte() && rawData[i + 2] == 0x3f.toByte()) break
+            r = MedtronicUtil.makeUnsignedShort(rawData[i + 1].toInt(), rawData[i].toInt()) // readUnsignedByte(mRawData[i]);
+            st = readUnsignedByte(rawData[i + 2])
+            try {
+                entries.add(BasalProfileEntry(aapsLogger, r, st))
+            } catch (ex: Exception) {
+                aapsLogger.error(LTag.PUMPCOMM, "Error decoding basal profile from bytes: " + ByteUtil.shortHexString(rawData))
+                throw ex
+            }
+            i += 3
+        }
+        return entries
+    }
+
+    /**
+     * This is used to prepare new profile
+     *
+     * @param entry
+     */
+    fun addEntry(entry: BasalProfileEntry) {
+        if (listEntries == null) listEntries = ArrayList()
+        listEntries!!.add(entry)
+    }
+
+    fun generateRawDataFromEntries() {
+        val outData: MutableList<Byte> = ArrayList()
+        for (profileEntry in listEntries!!) {
+            //val strokes = MedtronicUtil.getBasalStrokes(profileEntry.rate, true)
+            outData.add(profileEntry.rate_raw[0])
+            outData.add(profileEntry.rate_raw[1])
+            outData.add(profileEntry.startTime_raw)
+        }
+        setRawData(MedtronicUtil.createByteArray(outData))
+
+        // return this.mRawData;
+    }
+
+    fun getProfilesByHour(pumpType: PumpType): DoubleArray {
+        var entriesCopy: List<BasalProfileEntry>? = null
+        try {
+            entriesCopy = getEntries()
+        } catch (ex: Exception) {
+            aapsLogger.error(LTag.PUMPCOMM, "=============================================================================")
+            aapsLogger.error(LTag.PUMPCOMM, "  Error generating entries. Ex.: $ex", ex)
+            aapsLogger.error(LTag.PUMPCOMM, "  rawBasalValues: " + ByteUtil.shortHexString(rawData))
+            aapsLogger.error(LTag.PUMPCOMM, "=============================================================================")
+            //FabricUtil.createEvent("MedtronicBasalProfileGetByHourError", null);
+        }
+
+        val basalByHour = DoubleArray(24)
+
+        if (entriesCopy == null || entriesCopy.size == 0) {
+            for (i in 0..23) {
+                basalByHour[i] = 0.0
+            }
+            return basalByHour
+        }
+
+        for (i in entriesCopy.indices) {
+            val current = entriesCopy[i]
+            var currentTime = if (current.startTime_raw % 2 == 0) current.startTime_raw.toInt() else current.startTime_raw - 1
+            currentTime = currentTime * 30 / 60
+            var lastHour: Int
+            lastHour = if (i + 1 == entriesCopy.size) {
+                24
+            } else {
+                val basalProfileEntry = entriesCopy[i + 1]
+                val rawTime = if (basalProfileEntry.startTime_raw % 2 == 0) basalProfileEntry.startTime_raw.toInt() else basalProfileEntry.startTime_raw - 1
+                rawTime * 30 / 60
+            }
+
+            // System.out.println("Current time: " + currentTime + " Next Time: " + lastHour);
+            for (j in currentTime until lastHour) {
+                // if (pumpType == null)
+                //     basalByHour[j] = current.rate
+                // else
+                basalByHour[j] = pumpType.determineCorrectBasalSize(current.rate)
+            }
+        }
+        return basalByHour
+    }
+
+    override fun toString(): String {
+        return basalProfileToString()
+    }
+
+    fun verify(pumpType: PumpType): Boolean {
+        try {
+            getEntries()
+        } catch (ex: Exception) {
+            return false
+        }
+        val profilesByHour = getProfilesByHour(pumpType)
+        for (aDouble in profilesByHour) {
+            if (aDouble > 35.0) return false
+        }
+        return true
+    }
+
+    companion object {
+
+        const val MAX_RAW_DATA_SIZE = 48 * 3 + 1
+        private const val DEBUG_BASALPROFILE = false
+
+        private fun readUnsignedByte(b: Byte): Int {
+            return if (b < 0) b + 256 else b.toInt()
+        }
+
+        fun getProfilesByHourToString(data: DoubleArray): String {
+            val stringBuilder = StringBuilder()
+            for (value in data) {
+                stringBuilder.append(String.format("%.3f", value))
+                stringBuilder.append(" ")
+            }
+            return stringBuilder.toString()
+        }
+
+        fun isBasalProfileByHourUndefined(basalByHour: DoubleArray): Boolean {
+            for (i in 0..23) {
+                if (basalByHour[i] > 0.0) {
+                    return false
+                }
+            }
+            return true
+        }
+    }
+}
\ No newline at end of file
diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/BasalProfileEntry.java b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/BasalProfileEntry.java
deleted file mode 100644
index da2a7181c0..0000000000
--- a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/BasalProfileEntry.java
+++ /dev/null
@@ -1,81 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.medtronic.data.dto;
-
-import org.joda.time.LocalTime;
-
-import java.util.Locale;
-
-import info.nightscout.androidaps.logging.AAPSLogger;
-import info.nightscout.androidaps.logging.LTag;
-import info.nightscout.androidaps.plugins.pump.medtronic.util.MedtronicUtil;
-
-/**
- * Created by geoff on 6/1/15.
- * This is a helper class for BasalProfile, only used for interpreting the contents of BasalProfile
- * - fixed rate is not one bit but two
- */
-public class BasalProfileEntry {
-
-    byte[] rate_raw;
-    public double rate;
-    byte startTime_raw;
-    public LocalTime startTime; // Just a "time of day"
-
-    public BasalProfileEntry() {
-        rate = -9.999E6;
-        rate_raw = MedtronicUtil.getByteArrayFromUnsignedShort(0xFF, true);
-        startTime = new LocalTime(0);
-        startTime_raw = (byte) 0xFF;
-    }
-
-    public BasalProfileEntry(double rate, int hour, int minutes) {
-        byte[] data = MedtronicUtil.getBasalStrokes(rate, true);
-
-        rate_raw = new byte[2];
-        rate_raw[0] = data[1];
-        rate_raw[1] = data[0];
-
-        int interval = hour * 2;
-
-        if (minutes == 30) {
-            interval++;
-        }
-
-        startTime_raw = (byte) interval;
-        startTime = new LocalTime(hour, minutes == 30 ? 30 : 0);
-    }
-
-    BasalProfileEntry(AAPSLogger aapsLogger, int rateStrokes, int startTimeInterval) {
-        // rateByte is insulin delivery rate, U/hr, in 0.025 U increments
-        // startTimeByte is time-of-day, in 30 minute increments
-        rate_raw = MedtronicUtil.getByteArrayFromUnsignedShort(rateStrokes, true);
-        rate = rateStrokes * 0.025;
-        startTime_raw = (byte) startTimeInterval;
-
-        try {
-            startTime = new LocalTime(startTimeInterval / 2, (startTimeInterval % 2) * 30);
-        } catch (Exception ex) {
-            aapsLogger.error(LTag.PUMPCOMM,
-                    String.format(Locale.ENGLISH, "Error creating BasalProfileEntry: startTimeInterval=%d, startTime_raw=%d, hours=%d, rateStrokes=%d",
-                            startTimeInterval, startTime_raw, startTimeInterval / 2, rateStrokes));
-            throw ex;
-        }
-
-    }
-
-    BasalProfileEntry(byte rateByte, int startTimeByte) {
-        // rateByte is insulin delivery rate, U/hr, in 0.025 U increments
-        // startTimeByte is time-of-day, in 30 minute increments
-        rate_raw = MedtronicUtil.getByteArrayFromUnsignedShort(rateByte, true);
-        rate = rateByte * 0.025;
-        startTime_raw = (byte) startTimeByte;
-        startTime = new LocalTime(startTimeByte / 2, (startTimeByte % 2) * 30);
-    }
-
-    public void setStartTime(LocalTime localTime) {
-        this.startTime = localTime;
-    }
-
-    public void setRate(double rate) {
-        this.rate = rate;
-    }
-}
diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/BasalProfileEntry.kt b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/BasalProfileEntry.kt
new file mode 100644
index 0000000000..a8d188e3df
--- /dev/null
+++ b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/BasalProfileEntry.kt
@@ -0,0 +1,67 @@
+package info.nightscout.androidaps.plugins.pump.medtronic.data.dto
+
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.pump.medtronic.util.MedtronicUtil
+import org.joda.time.LocalTime
+import java.util.*
+
+/**
+ * Created by geoff on 6/1/15.
+ * This is a helper class for BasalProfile, only used for interpreting the contents of BasalProfile
+ * - fixed rate is not one bit but two
+ */
+class BasalProfileEntry {
+
+    var rate_raw: ByteArray
+    var rate = 0.0
+
+    var startTime_raw: Byte
+    var startTime : LocalTime? = null // Just a "time of day"
+
+    constructor() {
+        rate = -9.999E6
+        rate_raw = MedtronicUtil.getByteArrayFromUnsignedShort(0xFF, true)
+        startTime = LocalTime(0)
+        startTime_raw = 0xFF.toByte()
+    }
+
+    constructor(rate: Double, hour: Int, minutes: Int) {
+        val data = MedtronicUtil.getBasalStrokes(rate, true)
+        rate_raw = ByteArray(2)
+        rate_raw[0] = data[1]
+        rate_raw[1] = data[0]
+        var interval = hour * 2
+        if (minutes == 30) {
+            interval++
+        }
+        startTime_raw = interval.toByte()
+        startTime = LocalTime(hour, if (minutes == 30) 30 else 0)
+    }
+
+    internal constructor(aapsLogger: AAPSLogger, rateStrokes: Int, startTimeInterval: Int) {
+        // rateByte is insulin delivery rate, U/hr, in 0.025 U increments
+        // startTimeByte is time-of-day, in 30 minute increments
+        rate_raw = MedtronicUtil.getByteArrayFromUnsignedShort(rateStrokes, true)
+        rate = rateStrokes * 0.025
+        startTime_raw = startTimeInterval.toByte()
+        startTime = try {
+            LocalTime(startTimeInterval / 2, startTimeInterval % 2 * 30)
+        } catch (ex: Exception) {
+            aapsLogger.error(LTag.PUMPCOMM, String.format(Locale.ENGLISH, "Error creating BasalProfileEntry: startTimeInterval=%d, startTime_raw=%d, hours=%d, rateStrokes=%d",
+                startTimeInterval, startTime_raw, startTimeInterval / 2, rateStrokes))
+            throw ex
+        }
+    }
+
+    internal constructor(rateByte: Byte, startTimeByte: Int) {
+        // rateByte is insulin delivery rate, U/hr, in 0.025 U increments
+        // startTimeByte is time-of-day, in 30 minute increments
+        rate_raw = MedtronicUtil.getByteArrayFromUnsignedShort(rateByte.toInt(), true)
+        rate = rateByte * 0.025
+        startTime_raw = startTimeByte.toByte()
+        startTime = LocalTime(startTimeByte / 2, startTimeByte % 2 * 30)
+    }
+
+
+}
\ No newline at end of file
diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/BatteryStatusDTO.java b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/BatteryStatusDTO.java
deleted file mode 100644
index 835d43c072..0000000000
--- a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/BatteryStatusDTO.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.medtronic.data.dto;
-
-import com.google.gson.annotations.Expose;
-
-import androidx.annotation.NonNull;
-
-import java.util.Locale;
-
-import info.nightscout.androidaps.plugins.pump.medtronic.defs.BatteryType;
-
-/**
- * Created by andy on 6/14/18.
- */
-
-public class BatteryStatusDTO {
-
-    @Expose
-    public BatteryStatusType batteryStatusType;
-    @Expose
-    public Double voltage;
-
-    public boolean extendedDataReceived = false;
-
-
-    public int getCalculatedPercent(BatteryType batteryType) {
-        if (voltage == null || batteryType == BatteryType.None) {
-            return (batteryStatusType == BatteryStatusType.Low || batteryStatusType == BatteryStatusType.Unknown) ? 18 : 70;
-        }
-
-        double percent = (voltage - batteryType.lowVoltage) / (batteryType.highVoltage - batteryType.lowVoltage);
-
-        int percentInt = (int) (percent * 100.0d);
-
-        if (percentInt < 0)
-            percentInt = 1;
-
-        if (percentInt > 100)
-            percentInt = 100;
-
-        return percentInt;
-    }
-
-
-    @NonNull public String toString() {
-        return String.format(Locale.ENGLISH, "BatteryStatusDTO [voltage=%.2f, alkaline=%d, lithium=%d, niZn=%d, nimh=%d]",
-                voltage == null ? 0.0f : voltage,
-                getCalculatedPercent(BatteryType.Alkaline),
-                getCalculatedPercent(BatteryType.Lithium),
-                getCalculatedPercent(BatteryType.NiZn),
-                getCalculatedPercent(BatteryType.NiMH));
-    }
-
-
-    public enum BatteryStatusType {
-        Normal,
-        Low,
-        Unknown
-    }
-
-}
diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/BatteryStatusDTO.kt b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/BatteryStatusDTO.kt
new file mode 100644
index 0000000000..60128d51a5
--- /dev/null
+++ b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/BatteryStatusDTO.kt
@@ -0,0 +1,46 @@
+package info.nightscout.androidaps.plugins.pump.medtronic.data.dto
+
+import com.google.gson.annotations.Expose
+import info.nightscout.androidaps.plugins.pump.medtronic.defs.BatteryType
+import java.util.*
+
+/**
+ * Created by andy on 6/14/18.
+ */
+class BatteryStatusDTO {
+
+    @Expose
+    var batteryStatusType: BatteryStatusType? = null
+    @Expose
+    var voltage: Double? = null
+
+    var extendedDataReceived = false
+
+
+    fun getCalculatedPercent(batteryType: BatteryType): Int {
+        if (voltage == null || batteryType === BatteryType.None) {
+            return if (batteryStatusType == BatteryStatusType.Low || batteryStatusType == BatteryStatusType.Unknown) 18 else 70
+        }
+        val percent = (voltage!! - batteryType.lowVoltage) / (batteryType.highVoltage - batteryType.lowVoltage)
+        var percentInt = (percent * 100.0).toInt()
+        if (percentInt < 0) percentInt = 1
+        if (percentInt > 100) percentInt = 100
+        return percentInt
+    }
+
+
+    override fun toString(): String {
+        return String.format(Locale.ENGLISH, "BatteryStatusDTO [voltage=%.2f, alkaline=%d, lithium=%d, niZn=%d, nimh=%d]",
+            if (voltage == null) 0.0f else voltage,
+            getCalculatedPercent(BatteryType.Alkaline),
+            getCalculatedPercent(BatteryType.Lithium),
+            getCalculatedPercent(BatteryType.NiZn),
+            getCalculatedPercent(BatteryType.NiMH))
+    }
+
+    enum class BatteryStatusType {
+        Normal,
+        Low,
+        Unknown
+    }
+}
\ No newline at end of file
diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/BolusDTO.java b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/BolusDTO.java
deleted file mode 100644
index 8574bd831a..0000000000
--- a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/BolusDTO.java
+++ /dev/null
@@ -1,160 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.medtronic.data.dto;
-
-import com.google.gson.annotations.Expose;
-
-import info.nightscout.androidaps.plugins.pump.common.utils.StringUtil;
-import info.nightscout.androidaps.plugins.pump.medtronic.defs.PumpBolusType;
-
-/**
- * Application: GGC - GNU Gluco Control
- * Plug-in: Pump Tool (support for Pump devices)
- * <p>
- * See AUTHORS for copyright information.
- * <p>
- * This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public
- * License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later
- * version.
- * <p>
- * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
- * <p>
- * You should have received a copy of the GNU General Public License along with this program; if not, write to the Free
- * Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- * <p>
- * Filename: BolusDTO Description: Bolus DTO
- * <p>
- * Author: Andy {andy@atech-software.com}
- */
-
-public class BolusDTO extends PumpTimeStampedRecord {
-
-    @Expose
-    private Double requestedAmount;
-    @Expose
-    private Double deliveredAmount;
-    @Expose
-    private Double immediateAmount; // when Multiwave this is used
-    @Expose
-    private Integer duration;
-    @Expose
-    private PumpBolusType bolusType;
-    private Double insulinOnBoard;
-
-
-    public BolusDTO() {
-        // this.decimalPrecission = 2;
-    }
-
-
-    public Double getRequestedAmount() {
-        return requestedAmount;
-    }
-
-
-    public void setRequestedAmount(Double requestedAmount) {
-        this.requestedAmount = requestedAmount;
-    }
-
-
-    public Double getDeliveredAmount() {
-        return deliveredAmount;
-    }
-
-
-    public void setDeliveredAmount(Double deliveredAmount) {
-        this.deliveredAmount = deliveredAmount;
-    }
-
-
-    public Integer getDuration() {
-        return duration;
-    }
-
-
-    public void setDuration(Integer duration) {
-        this.duration = duration;
-    }
-
-
-    public PumpBolusType getBolusType() {
-        return bolusType;
-    }
-
-
-    public void setBolusType(PumpBolusType bolusType) {
-        this.bolusType = bolusType;
-    }
-
-
-    public Double getInsulinOnBoard() {
-        return insulinOnBoard;
-    }
-
-
-    public void setInsulinOnBoard(Double insulinOnBoard) {
-        this.insulinOnBoard = insulinOnBoard;
-    }
-
-
-    private String getDurationString() {
-        int minutes = this.duration;
-
-        int h = minutes / 60;
-
-        minutes -= (h * 60);
-
-        return StringUtil.getLeadingZero(h, 2) + ":" + StringUtil.getLeadingZero(minutes, 2);
-    }
-
-
-    public String getValue() {
-        if ((bolusType == PumpBolusType.Normal) || (bolusType == PumpBolusType.Audio)) {
-            return getFormattedDecimal(this.deliveredAmount);
-        } else if (bolusType == PumpBolusType.Extended) {
-            return String.format("AMOUNT_SQUARE=%s;DURATION=%s", getFormattedDecimal(this.deliveredAmount),
-                    getDurationString());
-        } else {
-            return String.format("AMOUNT=%s;AMOUNT_SQUARE=%s;DURATION=%s", getFormattedDecimal(this.immediateAmount),
-                    getFormattedDecimal(this.deliveredAmount), getDurationString());
-        }
-    }
-
-
-    public String getDisplayableValue() {
-        String value = getValue();
-
-        value = value.replace("AMOUNT_SQUARE=", "Amount Square: ");
-        value = value.replace("AMOUNT=", "Amount: ");
-        value = value.replace("DURATION=", "Duration: ");
-
-        return value;
-    }
-
-
-    public Double getImmediateAmount() {
-        return immediateAmount;
-    }
-
-
-    public void setImmediateAmount(Double immediateAmount) {
-        this.immediateAmount = immediateAmount;
-    }
-
-
-    public String getFormattedDecimal(double value) {
-        return StringUtil.getFormatedValueUS(value, 2);
-    }
-
-
-    public String getBolusKey() {
-        return "Bolus_" + this.bolusType.name();
-
-    }
-
-
-    @Override
-    public String toString() {
-        return "BolusDTO [type=" + bolusType.name() + ", " + getValue() + "]";
-    }
-
-}
diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/BolusDTO.kt b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/BolusDTO.kt
new file mode 100644
index 0000000000..2b738c34f0
--- /dev/null
+++ b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/BolusDTO.kt
@@ -0,0 +1,85 @@
+package info.nightscout.androidaps.plugins.pump.medtronic.data.dto
+
+import com.google.gson.annotations.Expose
+import info.nightscout.androidaps.plugins.pump.common.utils.StringUtil
+import info.nightscout.androidaps.plugins.pump.medtronic.defs.PumpBolusType
+
+/**
+ * Application: GGC - GNU Gluco Control
+ * Plug-in: Pump Tool (support for Pump devices)
+ *
+ *
+ * See AUTHORS for copyright information.
+ *
+ *
+ * This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later
+ * version.
+ *
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+ *
+ *
+ * You should have received a copy of the GNU General Public License along with this program; if not, write to the Free
+ * Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ *
+ * Filename: BolusDTO Description: Bolus DTO
+ *
+ *
+ * Author: Andy {andy@atech-software.com}
+ */
+class BolusDTO constructor(atechDateTime: Long,
+                           @Expose var requestedAmount: Double,
+                           @Expose var deliveredAmount: Double,
+                           @Expose var duration: Int = 0
+) : PumpTimeStampedRecord(atechDateTime) {
+
+    @Expose
+    var immediateAmount: Double? = null // when Multiwave this is used
+
+    @Expose
+    lateinit var bolusType: PumpBolusType
+
+    var insulinOnBoard: Double? = null
+
+    private val durationString: String
+        get() {
+            var minutes = duration
+            val h = minutes / 60
+            minutes -= h * 60
+            return StringUtil.getLeadingZero(h, 2) + ":" + StringUtil.getLeadingZero(minutes, 2)
+        }
+
+    val value: String
+        get() = if (bolusType === PumpBolusType.Normal || bolusType === PumpBolusType.Audio) {
+            getFormattedDecimal(deliveredAmount)
+        } else if (bolusType === PumpBolusType.Extended) {
+            String.format("AMOUNT_SQUARE=%s;DURATION=%s", getFormattedDecimal(deliveredAmount),
+                durationString)
+        } else {
+            String.format("AMOUNT=%s;AMOUNT_SQUARE=%s;DURATION=%s", getFormattedDecimal(immediateAmount!!),
+                getFormattedDecimal(deliveredAmount), durationString)
+        }
+
+    val displayableValue: String
+        get() {
+            var valueTemp = value
+            valueTemp = valueTemp.replace("AMOUNT_SQUARE=", "Amount Square: ")
+            valueTemp = valueTemp.replace("AMOUNT=", "Amount: ")
+            valueTemp = valueTemp.replace("DURATION=", "Duration: ")
+            return valueTemp
+        }
+
+    override fun getFormattedDecimal(value: Double): String {
+        return StringUtil.getFormatedValueUS(value, 2)
+    }
+
+    val bolusKey: String
+        get() = "Bolus_" + bolusType.name
+
+    override fun toString(): String {
+        return "BolusDTO [type=" + bolusType.name + ", " + value + "]"
+    }
+}
\ No newline at end of file
diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/BolusWizardDTO.java b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/BolusWizardDTO.java
deleted file mode 100644
index 24b63015c4..0000000000
--- a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/BolusWizardDTO.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.medtronic.data.dto;
-
-import java.util.Locale;
-
-import info.nightscout.androidaps.plugins.pump.common.utils.DateTimeUtil;
-
-/**
- * Created by andy on 18.05.15.
- */
-public class BolusWizardDTO extends PumpTimeStampedRecord {
-
-    // bloodGlucose and bgTarets are in mg/dL
-    public Integer bloodGlucose = 0; // mg/dL
-    public Integer carbs = 0;
-    public String chUnit = "g";
-
-    public Float carbRatio = 0.0f;
-    public Float insulinSensitivity = 0.0f;
-    public Integer bgTargetLow = 0;
-    public Integer bgTargetHigh = 0;
-    public Float bolusTotal = 0.0f;
-    public Float correctionEstimate = 0.0f;
-    public Float foodEstimate = 0.0f;
-    public Float unabsorbedInsulin = 0.0f;
-
-
-    // public LocalDateTime localDateTime;
-    // public long atechDateTime;
-
-    public String getValue() {
-        return String.format(Locale.ENGLISH, "BG=%d;CH=%d;CH_UNIT=%s;CH_INS_RATIO=%5.3f;BG_INS_RATIO=%5.3f;"
-                        + "BG_TARGET_LOW=%d;BG_TARGET_HIGH=%d;BOLUS_TOTAL=%5.3f;"
-                        + "BOLUS_CORRECTION=%5.3f;BOLUS_FOOD=%5.3f;UNABSORBED_INSULIN=%5.3f", //
-                bloodGlucose, carbs, chUnit, carbRatio, insulinSensitivity, bgTargetLow, //
-                bgTargetHigh, bolusTotal, correctionEstimate, foodEstimate, unabsorbedInsulin);
-    }
-
-    public String getDisplayableValue() {
-        return String.format(Locale.ENGLISH, "Bg=%d, CH=%d %s, Ch/Ins Ratio=%5.3f, Bg/Ins Ratio=%5.3f;"
-                        + "Bg Target(L/H)=%d/%d, Bolus: Total=%5.3f, "
-                        + "Correction=%5.3f, Food=%5.3f, IOB=%5.3f", //
-                bloodGlucose, carbs, chUnit, carbRatio, insulinSensitivity, bgTargetLow, //
-                bgTargetHigh, bolusTotal, correctionEstimate, foodEstimate, unabsorbedInsulin);
-    }
-
-
-    public String toString() {
-        return "BolusWizardDTO [dateTime=" + DateTimeUtil.toString(atechDateTime) + ", " + getValue() + "]";
-    }
-}
diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/BolusWizardDTO.kt b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/BolusWizardDTO.kt
new file mode 100644
index 0000000000..cf73a0506d
--- /dev/null
+++ b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/BolusWizardDTO.kt
@@ -0,0 +1,44 @@
+package info.nightscout.androidaps.plugins.pump.medtronic.data.dto
+
+import info.nightscout.androidaps.plugins.pump.common.utils.DateTimeUtil
+import java.util.*
+
+/**
+ * Created by andy on 18.05.15.
+ */
+class BolusWizardDTO : PumpTimeStampedRecord() {
+
+    // bloodGlucose and bgTarets are in mg/dL
+    var bloodGlucose = 0 // mg/dL
+    var carbs = 0
+    var chUnit = "g"
+    var carbRatio = 0.0f
+    var insulinSensitivity = 0.0f
+    var bgTargetLow = 0
+    var bgTargetHigh = 0
+    var bolusTotal = 0.0f
+    var correctionEstimate = 0.0f
+    var foodEstimate = 0.0f
+    var unabsorbedInsulin = 0.0f//
+
+
+    val value: String
+        get() = String.format(Locale.ENGLISH, "BG=%d;CH=%d;CH_UNIT=%s;CH_INS_RATIO=%5.3f;BG_INS_RATIO=%5.3f;"
+            + "BG_TARGET_LOW=%d;BG_TARGET_HIGH=%d;BOLUS_TOTAL=%5.3f;"
+            + "BOLUS_CORRECTION=%5.3f;BOLUS_FOOD=%5.3f;UNABSORBED_INSULIN=%5.3f",  //
+            bloodGlucose, carbs, chUnit, carbRatio, insulinSensitivity, bgTargetLow,  //
+            bgTargetHigh, bolusTotal, correctionEstimate, foodEstimate, unabsorbedInsulin)
+
+    //
+    //
+    val displayableValue: String
+        get() = String.format(Locale.ENGLISH, "Bg=%d, CH=%d %s, Ch/Ins Ratio=%5.3f, Bg/Ins Ratio=%5.3f;"
+            + "Bg Target(L/H)=%d/%d, Bolus: Total=%5.3f, "
+            + "Correction=%5.3f, Food=%5.3f, IOB=%5.3f",  //
+            bloodGlucose, carbs, chUnit, carbRatio, insulinSensitivity, bgTargetLow,  //
+            bgTargetHigh, bolusTotal, correctionEstimate, foodEstimate, unabsorbedInsulin)
+
+    override fun toString(): String {
+        return "BolusWizardDTO [dateTime=" + DateTimeUtil.toString(atechDateTime) + ", " + value + "]"
+    }
+}
\ No newline at end of file
diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/ClockDTO.java b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/ClockDTO.java
deleted file mode 100644
index 1623e03ff5..0000000000
--- a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/ClockDTO.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.medtronic.data.dto;
-
-import org.joda.time.LocalDateTime;
-
-/**
- * Created by andy on 2/27/19.
- */
-
-public class ClockDTO {
-
-    public LocalDateTime localDeviceTime;
-
-    public LocalDateTime pumpTime;
-
-    public int timeDifference; // s (pump -> local)
-}
diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/ClockDTO.kt b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/ClockDTO.kt
new file mode 100644
index 0000000000..be99c3b34f
--- /dev/null
+++ b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/ClockDTO.kt
@@ -0,0 +1,13 @@
+package info.nightscout.androidaps.plugins.pump.medtronic.data.dto
+
+import org.joda.time.LocalDateTime
+
+/**
+ * Created by andy on 2/27/19.
+ */
+class ClockDTO constructor(var localDeviceTime: LocalDateTime,
+                           var pumpTime: LocalDateTime) {
+    // var localDeviceTime: LocalDateTime? = null
+    // var pumpTime: LocalDateTime? = null
+    var timeDifference = 0
+}
\ No newline at end of file
diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/DailyTotalsDTO.java b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/DailyTotalsDTO.java
deleted file mode 100644
index af12ac6962..0000000000
--- a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/DailyTotalsDTO.java
+++ /dev/null
@@ -1,258 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.medtronic.data.dto;
-
-import androidx.annotation.NonNull;
-
-import com.google.gson.annotations.Expose;
-
-import org.apache.commons.lang3.builder.ToStringBuilder;
-
-import java.util.Locale;
-
-import info.nightscout.androidaps.plugins.pump.common.utils.ByteUtil;
-import info.nightscout.androidaps.plugins.pump.common.utils.DateTimeUtil;
-import info.nightscout.androidaps.plugins.pump.common.utils.StringUtil;
-import info.nightscout.androidaps.plugins.pump.medtronic.comm.history.pump.PumpHistoryEntry;
-
-/**
- * Created by andy on 11/3/18.
- */
-
-/**
- * NOTE: Decoding is only done for insulin part, everything else is pretty must left undecoded.
- */
-
-public class DailyTotalsDTO {
-
-    // bg avg, bg low hi, number Bgs,
-    // Sen Avg, Sen Lo/Hi, Sens Cal/Data = 0/0,
-    // Insulin=19.8[8,9], Basal[10,11], Bolus[13,14], Carbs,
-    // Bolus=1.7, Fodd, Corr, Manual=1.7,
-    // Num bOlus=1, food/corr, Food+corr, manual bolus=1
-    private Double bgAvg;
-    private Double bgLow;
-    private Double bgHigh;
-    private Integer bgCount;
-
-    private Double sensorAvg;
-    private Double sensorMin;
-    private Double sensorMax;
-    private Integer sensorCalcCount;
-    private Integer sensorDataCount;
-
-    @Expose
-    private Double insulinTotal = 0.0d;
-    @Expose
-    private Double insulinBasal = 0.0d;
-    @Expose
-    private Double insulinBolus = 0.0d;
-    private Double insulinCarbs;
-
-    private Double bolusTotal;
-    private Double bolusFood;
-    private Double bolusFoodAndCorr;
-    private Double bolusCorrection;
-    private Double bolusManual;
-
-    private Integer bolusCount;
-    private Integer bolusCountFoodOrCorr;
-    // Integer bolusCountCorr;
-    Integer bolusCountFoodAndCorr;
-    Integer bolusCountManual;
-    private Integer bolusCountFood;
-    private Integer bolusCountCorr;
-
-    PumpHistoryEntry entry;
-
-
-    public DailyTotalsDTO(PumpHistoryEntry entry) {
-        this.entry = entry;
-
-        switch (entry.getEntryType()) {
-            case EndResultTotals:
-                decodeEndResultsTotals(entry);
-                break;
-
-            case DailyTotals515:
-                decodeDailyTotals515(entry.getBody());
-                break;
-
-            case DailyTotals522:
-                decodeDailyTotals522(entry.getBody());
-                break;
-
-            case DailyTotals523:
-                decodeDailyTotals523(entry.getBody());
-                break;
-
-            default:
-                break;
-        }
-
-        setDisplayable();
-    }
-
-
-    private void setDisplayable() {
-
-        if (this.insulinBasal == null) {
-            this.entry.setDisplayableValue("Total Insulin: " + StringUtil.getFormatedValueUS(this.insulinTotal, 2));
-        } else {
-            this.entry.setDisplayableValue("Basal Insulin: " + StringUtil.getFormatedValueUS(this.insulinBasal, 2)
-                    + ", Total Insulin: " + StringUtil.getFormatedValueUS(this.insulinTotal, 2));
-        }
-
-    }
-
-
-    private void decodeEndResultsTotals(PumpHistoryEntry entry) {
-        double totals = ByteUtil.toInt((int) entry.getHead()[0], (int) entry.getHead()[1], (int) entry.getHead()[2],
-                (int) entry.getHead()[3], ByteUtil.BitConversion.BIG_ENDIAN) * 0.025d;
-
-        this.insulinTotal = totals;
-
-        entry.addDecodedData("Totals", totals);
-    }
-
-
-    private void testDecode(byte[] data) {
-
-        // Daily
-
-        byte[] body = data; // entry.getBody();
-        //System.out.println("Totals 522");
-
-        for (int i = 0; i < body.length - 2; i++) {
-
-            int j = ByteUtil.toInt(body[i], body[i + 1]);
-            int k = ByteUtil.toInt(body[i], body[i + 1], body[i + 2]);
-
-            int j1 = ByteUtil.toInt(body[i + 1], body[i]);
-            int k1 = ByteUtil.toInt(body[i + 2], body[i + 1], body[i]);
-
-            System.out.println(String.format(Locale.ENGLISH,
-                    "index: %d, number=%d, del/40=%.3f, del/10=%.3f, singular=%d, sing_hex=%s", i, j, j / 40.0d, j / 10.0d,
-                    body[i], ByteUtil.shortHexString(body[i])));
-
-            System.out.println(String.format(Locale.ENGLISH, "     number[k,j1,k1]=%d / %d /%d, del/40=%.3f, del/40=%.3f, del/40=%.3f",
-                    k, j1, k1, k / 40.0d, j1 / 40.0d, k1 / 40.0d));
-
-        }
-    }
-
-
-    private void decodeDailyTotals515(byte[] data) {
-        // LOG.debug("Can't decode DailyTotals515: Body={}", ByteUtil.getHex(data));
-
-        this.insulinTotal = ByteUtil.toInt(data[8], data[9]) / 40.0d;
-        this.insulinBasal = ByteUtil.toInt(data[10], data[11]) / 40.0d;
-        this.insulinBolus = ByteUtil.toInt(data[13], data[14]) / 40.0d;
-
-        // Delivery Stats: BG AVG: Bg Low/Hi=none,Number BGs=0
-        // Delivery Stats: INSULIN: Basal 22.30, Bolus=4.20, Catbs = 0g (26.5)
-        // Delivery Stats: BOLUS: Food=0.00, Corr=0.00, Manual=4.20
-        // Delivery Stats: NUM BOLUS: Food/Corr=0,Food+Corr=0, Manual=3
-
-        //LOG.debug("515: {}", toString());
-    }
-
-
-    private void decodeDailyTotals522(byte[] data) {
-
-        this.insulinTotal = ByteUtil.toInt(data[8], data[9]) / 40.0d;
-        this.insulinBasal = ByteUtil.toInt(data[10], data[11]) / 40.0d;
-        this.insulinBolus = ByteUtil.toInt(data[13], data[14]) / 40.0d;
-
-        this.bolusTotal = ByteUtil.toInt(data[17], data[18], data[19]) / 40.0d;
-        this.bolusFood = ByteUtil.toInt(data[21], data[22]) / 40.0d;
-        this.bolusCorrection = ByteUtil.toInt(data[23], data[24], data[25]) / 40.0d;
-        this.bolusManual = ByteUtil.toInt(data[26], data[27], data[28]) / 40.0d;
-
-        bolusCount = ByteUtil.asUINT8(data[30]);
-        bolusCountFoodOrCorr = ByteUtil.asUINT8(data[31]);
-        bolusCountFoodAndCorr = ByteUtil.asUINT8(data[32]);
-        bolusCountManual = ByteUtil.asUINT8(data[33]);
-
-        // bg avg, bg low hi, number Bgs,
-        // Sen Avg, Sen Lo/Hi, Sens Cal/Data = 0/0,
-        // Insulin=19.8[8,9], Basal[10,11], Bolus[13,14], Carbs,
-        // Bolus=1.7[18,19], Fodd, Corr, Manual=1.7[27,28],
-        // Num bOlus=1, food/corr, Food+corr, manual bolus=1
-
-        //LOG.debug("522: {}", toString());
-    }
-
-
-    private void decodeDailyTotals523(byte[] data) {
-
-        this.insulinTotal = ByteUtil.toInt(data[8], data[9]) / 40.0d;
-        this.insulinBasal = ByteUtil.toInt(data[10], data[11]) / 40.0d;
-        this.insulinBolus = ByteUtil.toInt(data[13], data[14]) / 40.0d;
-        this.insulinCarbs = ByteUtil.toInt(data[16], data[17]) * 1.0d;
-
-        this.bolusFood = ByteUtil.toInt(data[18], data[19]) / 40.0d;
-        this.bolusCorrection = ByteUtil.toInt(data[20], data[21]) / 40.0d;
-        this.bolusFoodAndCorr = ByteUtil.toInt(data[22], data[23]) / 40.0d;
-        this.bolusManual = ByteUtil.toInt(data[24], data[25]) / 40.0d;
-
-        this.bolusCountFood = ByteUtil.asUINT8(data[26]);
-        this.bolusCountCorr = ByteUtil.asUINT8(data[27]);
-        this.bolusCountFoodAndCorr = ByteUtil.asUINT8(data[28]);
-        this.bolusCountManual = ByteUtil.asUINT8(data[29]); // +
-
-        // Delivery Stats: Carbs=11, Total Insulin=3.850, Basal=2.000
-        // Delivery Stats: Basal 52,Bolus 1.850, Bolus=48%o
-        // Delivery Stats: Food only=0.9, Food only#=1, Corr only = 0.0
-        // Delivery Stats: #Corr_only=0,Food+Corr=0.000, #Food+Corr=0
-        // Delivery Stats: Manual = 0.95, #Manual=5
-
-        //LOG.debug("523: {}", toString());
-    }
-
-    @Override @NonNull
-    public String toString() {
-        return new ToStringBuilder(this)
-                .append("bgAvg", bgAvg)
-                .append("bgLow", bgLow)
-                .append("bgHigh", bgHigh)
-                .append("bgCount", bgCount)
-                .append("sensorAvg", sensorAvg)
-                .append("sensorMin", sensorMin)
-                .append("sensorMax", sensorMax)
-                .append("sensorCalcCount", sensorCalcCount)
-                .append("sensorDataCount", sensorDataCount)
-                .append("insulinTotal", insulinTotal)
-                .append("insulinBasal", insulinBasal)
-                .append("insulinBolus", insulinBolus)
-                .append("insulinCarbs", insulinCarbs)
-                .append("bolusTotal", bolusTotal)
-                .append("bolusFood", bolusFood)
-                .append("bolusFoodAndCorr", bolusFoodAndCorr)
-                .append("bolusCorrection", bolusCorrection)
-                .append("bolusManual", bolusManual)
-                .append("bolusCount", bolusCount)
-                .append("bolusCountFoodOrCorr", bolusCountFoodOrCorr)
-                .append("bolusCountFoodAndCorr", bolusCountFoodAndCorr)
-                .append("bolusCountManual", bolusCountManual)
-                .append("bolusCountFood", bolusCountFood)
-                .append("bolusCountCorr", bolusCountCorr)
-                .append("entry", entry)
-                .toString();
-    }
-
-    public long timestamp() {
-        return DateTimeUtil.toMillisFromATD(this.entry.atechDateTime);
-    }
-
-    public double insulinBasal() {
-        return insulinBasal;
-    }
-
-    public double insulinBolus() {
-        return insulinBolus;
-    }
-    public double insulinTotal() {
-        return insulinTotal;
-    }
-
-
-}
diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/DailyTotalsDTO.kt b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/DailyTotalsDTO.kt
new file mode 100644
index 0000000000..a295c76aff
--- /dev/null
+++ b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/DailyTotalsDTO.kt
@@ -0,0 +1,191 @@
+package info.nightscout.androidaps.plugins.pump.medtronic.data.dto
+
+//import info.nightscout.androidaps.db.TDD
+import com.google.gson.annotations.Expose
+import info.nightscout.androidaps.plugins.pump.common.utils.ByteUtil
+import info.nightscout.androidaps.plugins.pump.common.utils.StringUtil
+import info.nightscout.androidaps.plugins.pump.medtronic.comm.history.pump.PumpHistoryEntry
+import info.nightscout.androidaps.plugins.pump.medtronic.comm.history.pump.PumpHistoryEntryType
+import org.apache.commons.lang3.builder.ToStringBuilder
+import java.util.*
+
+/**
+ * Created by andy on 11/3/18.
+ */
+/**
+ * NOTE: Decoding is only done for insulin part, everything else is pretty must left undecoded.
+ */
+class DailyTotalsDTO(var entry: PumpHistoryEntry) {
+
+    // bg avg, bg low hi, number Bgs,
+    // Sen Avg, Sen Lo/Hi, Sens Cal/Data = 0/0,
+    // Insulin=19.8[8,9], Basal[10,11], Bolus[13,14], Carbs,
+    // Bolus=1.7, Fodd, Corr, Manual=1.7,
+    // Num bOlus=1, food/corr, Food+corr, manual bolus=1
+    private val bgAvg: Double? = null
+    private val bgLow: Double? = null
+    private val bgHigh: Double? = null
+    private val bgCount: Int? = null
+    private val sensorAvg: Double? = null
+    private val sensorMin: Double? = null
+    private val sensorMax: Double? = null
+    private val sensorCalcCount: Int? = null
+    private val sensorDataCount: Int? = null
+
+    @Expose
+    var insulinTotal = 0.0
+
+    @Expose
+    var insulinBasal: Double = 0.0
+
+    @Expose
+    var insulinBolus = 0.0
+    private var insulinCarbs: Double? = null
+    private var bolusTotal: Double? = null
+    private var bolusFood: Double? = null
+    private var bolusFoodAndCorr: Double? = null
+    private var bolusCorrection: Double? = null
+    private var bolusManual: Double? = null
+    private var bolusCount: Int? = null
+    private var bolusCountFoodOrCorr: Int? = null
+
+    // Integer bolusCountCorr;
+    var bolusCountFoodAndCorr: Int? = null
+    var bolusCountManual: Int? = null
+    private var bolusCountFood: Int? = null
+    private var bolusCountCorr: Int? = null
+    private fun setDisplayable() {
+        if (insulinBasal == 0.0) {
+            entry.displayableValue = "Total Insulin: " + StringUtil.getFormatedValueUS(insulinTotal, 2)
+        } else {
+            entry.displayableValue = ("Basal Insulin: " + StringUtil.getFormatedValueUS(insulinBasal, 2)
+                + ", Total Insulin: " + StringUtil.getFormatedValueUS(insulinTotal, 2))
+        }
+    }
+
+    private fun decodeEndResultsTotals(entry: PumpHistoryEntry) {
+        val totals = ByteUtil.toInt(entry.head[0].toInt(), entry.head[1].toInt(), entry.head[2].toInt(),
+            entry.head[3].toInt(), ByteUtil.BitConversion.BIG_ENDIAN) * 0.025
+        insulinTotal = totals
+        entry.addDecodedData("Totals", totals)
+    }
+
+    private fun testDecode(data: ByteArray) {
+
+        // Daily
+        //System.out.println("Totals 522");
+        for (i in 0 until data.size - 2) {
+            val j = ByteUtil.toInt(data[i], data[i + 1])
+            val k: Int = ByteUtil.toInt(data[i], data[i + 1], data[i + 2])
+            val j1 = ByteUtil.toInt(data[i + 1], data[i])
+            val k1: Int = ByteUtil.toInt(data[i + 2], data[i + 1], data[i])
+            println(String.format(Locale.ENGLISH,
+                "index: %d, number=%d, del/40=%.3f, del/10=%.3f, singular=%d, sing_hex=%s", i, j, j / 40.0, j / 10.0,
+                data[i], ByteUtil.shortHexString(data[i])))
+            println(String.format(Locale.ENGLISH, "     number[k,j1,k1]=%d / %d /%d, del/40=%.3f, del/40=%.3f, del/40=%.3f",
+                k, j1, k1, k / 40.0, j1 / 40.0, k1 / 40.0))
+        }
+    }
+
+    private fun decodeDailyTotals515(data: ByteArray) {
+        // LOG.debug("Can't decode DailyTotals515: Body={}", ByteUtil.getHex(data));
+        insulinTotal = ByteUtil.toInt(data[8], data[9]) / 40.0
+        insulinBasal = ByteUtil.toInt(data[10], data[11]) / 40.0
+        insulinBolus = ByteUtil.toInt(data[13], data[14]) / 40.0
+
+        // Delivery Stats: BG AVG: Bg Low/Hi=none,Number BGs=0
+        // Delivery Stats: INSULIN: Basal 22.30, Bolus=4.20, Catbs = 0g (26.5)
+        // Delivery Stats: BOLUS: Food=0.00, Corr=0.00, Manual=4.20
+        // Delivery Stats: NUM BOLUS: Food/Corr=0,Food+Corr=0, Manual=3
+
+        //LOG.debug("515: {}", toString());
+    }
+
+    private fun decodeDailyTotals522(data: ByteArray) {
+        insulinTotal = ByteUtil.toInt(data[8], data[9]) / 40.0
+        insulinBasal = ByteUtil.toInt(data[10], data[11]) / 40.0
+        insulinBolus = ByteUtil.toInt(data[13], data[14]) / 40.0
+        bolusTotal = ByteUtil.toInt(data[17], data[18], data[19]) / 40.0
+        bolusFood = ByteUtil.toInt(data[21], data[22]) / 40.0
+        bolusCorrection = ByteUtil.toInt(data[23], data[24], data[25]) / 40.0
+        bolusManual = ByteUtil.toInt(data[26], data[27], data[28]) / 40.0
+        bolusCount = ByteUtil.asUINT8(data[30])
+        bolusCountFoodOrCorr = ByteUtil.asUINT8(data[31])
+        bolusCountFoodAndCorr = ByteUtil.asUINT8(data[32])
+        bolusCountManual = ByteUtil.asUINT8(data[33])
+
+        // bg avg, bg low hi, number Bgs,
+        // Sen Avg, Sen Lo/Hi, Sens Cal/Data = 0/0,
+        // Insulin=19.8[8,9], Basal[10,11], Bolus[13,14], Carbs,
+        // Bolus=1.7[18,19], Fodd, Corr, Manual=1.7[27,28],
+        // Num bOlus=1, food/corr, Food+corr, manual bolus=1
+
+        //LOG.debug("522: {}", toString());
+    }
+
+    private fun decodeDailyTotals523(data: ByteArray) {
+        insulinTotal = ByteUtil.toInt(data[8], data[9]) / 40.0
+        insulinBasal = ByteUtil.toInt(data[10], data[11]) / 40.0
+        insulinBolus = ByteUtil.toInt(data[13], data[14]) / 40.0
+        insulinCarbs = ByteUtil.toInt(data[16], data[17]) * 1.0
+        bolusFood = ByteUtil.toInt(data[18], data[19]) / 40.0
+        bolusCorrection = ByteUtil.toInt(data[20], data[21]) / 40.0
+        bolusFoodAndCorr = ByteUtil.toInt(data[22], data[23]) / 40.0
+        bolusManual = ByteUtil.toInt(data[24], data[25]) / 40.0
+        bolusCountFood = ByteUtil.asUINT8(data[26])
+        bolusCountCorr = ByteUtil.asUINT8(data[27])
+        bolusCountFoodAndCorr = ByteUtil.asUINT8(data[28])
+        bolusCountManual = ByteUtil.asUINT8(data[29]) // +
+
+        // Delivery Stats: Carbs=11, Total Insulin=3.850, Basal=2.000
+        // Delivery Stats: Basal 52,Bolus 1.850, Bolus=48%o
+        // Delivery Stats: Food only=0.9, Food only#=1, Corr only = 0.0
+        // Delivery Stats: #Corr_only=0,Food+Corr=0.000, #Food+Corr=0
+        // Delivery Stats: Manual = 0.95, #Manual=5
+
+        //LOG.debug("523: {}", toString());
+    }
+
+    override fun toString(): String {
+        return ToStringBuilder(this)
+            .append("bgAvg", bgAvg)
+            .append("bgLow", bgLow)
+            .append("bgHigh", bgHigh)
+            .append("bgCount", bgCount)
+            .append("sensorAvg", sensorAvg)
+            .append("sensorMin", sensorMin)
+            .append("sensorMax", sensorMax)
+            .append("sensorCalcCount", sensorCalcCount)
+            .append("sensorDataCount", sensorDataCount)
+            .append("insulinTotal", insulinTotal)
+            .append("insulinBasal", insulinBasal)
+            .append("insulinBolus", insulinBolus)
+            .append("insulinCarbs", insulinCarbs)
+            .append("bolusTotal", bolusTotal)
+            .append("bolusFood", bolusFood)
+            .append("bolusFoodAndCorr", bolusFoodAndCorr)
+            .append("bolusCorrection", bolusCorrection)
+            .append("bolusManual", bolusManual)
+            .append("bolusCount", bolusCount)
+            .append("bolusCountFoodOrCorr", bolusCountFoodOrCorr)
+            .append("bolusCountFoodAndCorr", bolusCountFoodAndCorr)
+            .append("bolusCountManual", bolusCountManual)
+            .append("bolusCountFood", bolusCountFood)
+            .append("bolusCountCorr", bolusCountCorr)
+            .append("entry", entry)
+            .toString()
+    }
+
+    init {
+        when (entry.entryType) {
+            PumpHistoryEntryType.EndResultTotals -> decodeEndResultsTotals(entry)
+            PumpHistoryEntryType.DailyTotals515  -> decodeDailyTotals515(entry.body)
+            PumpHistoryEntryType.DailyTotals522  -> decodeDailyTotals522(entry.body)
+            PumpHistoryEntryType.DailyTotals523  -> decodeDailyTotals523(entry.body)
+
+            else                                 -> {
+            }
+        }
+        setDisplayable()
+    }
+}
\ No newline at end of file
diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/PumpSettingDTO.java b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/PumpSettingDTO.java
deleted file mode 100644
index 1868064d8b..0000000000
--- a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/PumpSettingDTO.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.medtronic.data.dto;
-
-import info.nightscout.androidaps.plugins.pump.medtronic.defs.PumpConfigurationGroup;
-
-/**
- * Created by andy on 6/6/18.
- */
-
-public class PumpSettingDTO {
-
-    public String key;
-    public String value;
-
-    PumpConfigurationGroup configurationGroup;
-
-
-    public PumpSettingDTO(String key, String value, PumpConfigurationGroup configurationGroup) {
-        this.key = key;
-        this.value = value;
-        this.configurationGroup = configurationGroup;
-    }
-
-
-    @Override
-    public String toString() {
-        return "PumpSettingDTO [key=" + key + ",value=" + value + ",group=" + configurationGroup.name() + "]";
-    }
-
-}
diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/PumpSettingDTO.kt b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/PumpSettingDTO.kt
new file mode 100644
index 0000000000..824151320e
--- /dev/null
+++ b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/PumpSettingDTO.kt
@@ -0,0 +1,14 @@
+package info.nightscout.androidaps.plugins.pump.medtronic.data.dto
+
+import info.nightscout.androidaps.plugins.pump.medtronic.defs.PumpConfigurationGroup
+
+/**
+ * Created by andy on 6/6/18.
+ */
+class PumpSettingDTO(var key: String, var value: String, var configurationGroup: PumpConfigurationGroup) {
+
+    override fun toString(): String {
+        return "PumpSettingDTO [key=" + key + ",value=" + value + ",group=" + configurationGroup.name + "]"
+    }
+
+}
\ No newline at end of file
diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/PumpTimeStampedRecord.java b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/PumpTimeStampedRecord.java
deleted file mode 100644
index 84ad0914b3..0000000000
--- a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/PumpTimeStampedRecord.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.medtronic.data.dto;
-
-import info.nightscout.androidaps.plugins.pump.common.utils.StringUtil;
-
-/**
- * Created by andy on 6/2/18.
- */
-public class PumpTimeStampedRecord {
-
-    protected int decimalPrecission = 2;
-    public long atechDateTime;
-
-
-    public long getAtechDateTime() {
-        return this.atechDateTime;
-    }
-
-
-    public void setAtechDateTime(long atechDateTime) {
-        this.atechDateTime = atechDateTime;
-    }
-
-
-    public String getFormattedDecimal(double value) {
-        return StringUtil.getFormatedValueUS(value, this.decimalPrecission);
-    }
-
-}
diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/PumpTimeStampedRecord.kt b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/PumpTimeStampedRecord.kt
new file mode 100644
index 0000000000..1f5cf7db0a
--- /dev/null
+++ b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/PumpTimeStampedRecord.kt
@@ -0,0 +1,16 @@
+package info.nightscout.androidaps.plugins.pump.medtronic.data.dto
+
+import info.nightscout.androidaps.plugins.pump.common.utils.StringUtil
+
+/**
+ * Created by andy on 6/2/18.
+ */
+open class PumpTimeStampedRecord constructor(var atechDateTime: Long = 0) {
+
+    var decimalPrecission = 2
+    // var atechDateTime: Long = 0
+
+    open fun getFormattedDecimal(value: Double): String? {
+        return StringUtil.getFormatedValueUS(value, decimalPrecission)
+    }
+}
\ No newline at end of file
diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/RLHistoryItemMedtronic.java b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/RLHistoryItemMedtronic.java
deleted file mode 100644
index b171f5a061..0000000000
--- a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/RLHistoryItemMedtronic.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.medtronic.data.dto;
-
-import org.joda.time.LocalDateTime;
-
-import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.data.RLHistoryItem;
-import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.defs.RileyLinkTargetDevice;
-import info.nightscout.androidaps.plugins.pump.medtronic.defs.MedtronicCommandType;
-import info.nightscout.androidaps.utils.resources.ResourceHelper;
-
-public class RLHistoryItemMedtronic extends RLHistoryItem {
-
-    private final MedtronicCommandType medtronicCommandType;
-
-    public RLHistoryItemMedtronic(MedtronicCommandType medtronicCommandType) {
-        super(new LocalDateTime(), RLHistoryItemSource.MedtronicCommand, RileyLinkTargetDevice.MedtronicPump);
-        this.medtronicCommandType = medtronicCommandType;
-    }
-
-    @Override
-    public String getDescription(ResourceHelper resourceHelper) {
-        if (RLHistoryItemSource.MedtronicCommand.equals(source)) {
-            return medtronicCommandType.name();
-        }
-
-        return super.getDescription(resourceHelper);
-    }
-
-}
diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/RLHistoryItemMedtronic.kt b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/RLHistoryItemMedtronic.kt
new file mode 100644
index 0000000000..4a99585508
--- /dev/null
+++ b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/RLHistoryItemMedtronic.kt
@@ -0,0 +1,18 @@
+package info.nightscout.androidaps.plugins.pump.medtronic.data.dto
+
+import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.data.RLHistoryItem
+import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.defs.RileyLinkTargetDevice
+import info.nightscout.androidaps.plugins.pump.medtronic.defs.MedtronicCommandType
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import org.joda.time.LocalDateTime
+
+class RLHistoryItemMedtronic(private val medtronicCommandType: MedtronicCommandType) :
+    RLHistoryItem(LocalDateTime(), RLHistoryItemSource.MedtronicCommand, RileyLinkTargetDevice.MedtronicPump) {
+
+    override fun getDescription(resourceHelper: ResourceHelper): String {
+        return if (RLHistoryItemSource.MedtronicCommand == source) {
+            medtronicCommandType.name
+        } else super.getDescription(resourceHelper)
+    }
+
+}
\ No newline at end of file
diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/TempBasalPair.java b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/TempBasalPair.java
deleted file mode 100644
index 418770d4b6..0000000000
--- a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/TempBasalPair.java
+++ /dev/null
@@ -1,145 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.medtronic.data.dto;
-
-import androidx.annotation.NonNull;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Locale;
-
-import info.nightscout.androidaps.logging.AAPSLogger;
-import info.nightscout.androidaps.logging.LTag;
-import info.nightscout.androidaps.plugins.pump.common.utils.ByteUtil;
-import info.nightscout.androidaps.plugins.pump.medtronic.util.MedtronicUtil;
-
-/**
- * Created by geoff on 5/29/15.
- * <p>
- * Just need a class to keep the pair together, for parcel transport.
- */
-public class TempBasalPair extends info.nightscout.androidaps.plugins.pump.common.defs.TempBasalPair {
-
-    /**
-     * This constructor is for use with PumpHistoryDecoder
-     *
-     * @param rateByte
-     * @param startTimeByte
-     * @param isPercent
-     */
-    public TempBasalPair(byte rateByte, int startTimeByte, boolean isPercent) {
-        super();
-        int rateInt = ByteUtil.asUINT8(rateByte);
-
-        if (isPercent)
-            this.setInsulinRate(rateByte);
-        else
-            this.setInsulinRate(rateInt * 0.025);
-        this.setDurationMinutes(startTimeByte * 30);
-        this.setPercent(isPercent);
-    }
-
-
-    /**
-     * This constructor is for use with PumpHistoryDecoder
-     *
-     * @param rateByte0
-     * @param startTimeByte
-     * @param isPercent
-     */
-    public TempBasalPair(byte rateByte0, byte rateByte1, int startTimeByte, boolean isPercent) {
-        if (isPercent) {
-            this.setInsulinRate(rateByte0);
-        } else {
-            this.setInsulinRate(ByteUtil.toInt(rateByte1, rateByte0) * 0.025);
-        }
-        this.setDurationMinutes(startTimeByte * 30);
-        this.setPercent(isPercent);
-    }
-
-    public TempBasalPair(AAPSLogger aapsLogger, byte[] response) {
-        super();
-
-        aapsLogger.debug(LTag.PUMPBTCOMM, "Received TempBasal response: " + ByteUtil.getHex(response));
-
-        setPercent(response[0] == 1);
-
-        if (isPercent()) {
-            setInsulinRate(response[1]);
-        } else {
-            int strokes = MedtronicUtil.makeUnsignedShort(response[2], response[3]);
-
-            setInsulinRate(strokes / 40.0d);
-        }
-
-        if (response.length < 6) {
-            setDurationMinutes(ByteUtil.asUINT8(response[4]));
-        } else {
-            setDurationMinutes(MedtronicUtil.makeUnsignedShort(response[4], response[5]));
-        }
-
-        aapsLogger.warn(LTag.PUMPBTCOMM, String.format(Locale.ENGLISH, "TempBasalPair (with %d byte response): %s", response.length, toString()));
-
-    }
-
-
-    public TempBasalPair(double insulinRate, boolean isPercent, int durationMinutes) {
-        super(insulinRate, isPercent, durationMinutes);
-    }
-
-
-    public byte[] getAsRawData() {
-
-        List<Byte> list = new ArrayList<>();
-
-        list.add((byte) 5);
-
-        byte[] insulinRate = MedtronicUtil.getBasalStrokes(this.getInsulinRate(), true);
-        byte timeMin = (byte) MedtronicUtil.getIntervalFromMinutes(getDurationMinutes());
-
-        // list.add((byte) 0); // ?
-
-        // list.add((byte) 0); // is_absolute
-
-        if (insulinRate.length == 1)
-            list.add((byte) 0x00);
-        else
-            list.add(insulinRate[0]);
-
-        list.add(insulinRate[1]);
-        // list.add((byte) 0); // percent amount
-
-        list.add(timeMin); // 3 (time) - OK
-
-        if (insulinRate.length == 1)
-            list.add((byte) 0x00);
-        else
-            list.add(insulinRate[0]);
-
-        list.add(insulinRate[1]);
-
-        return MedtronicUtil.createByteArray(list);
-    }
-
-    public boolean isCancelTBR() {
-        return (MedtronicUtil.isSame(getInsulinRate(), 0.0d) && getDurationMinutes() == 0);
-    }
-
-
-    public String getDescription() {
-        if (isCancelTBR()) {
-            return "Cancel TBR";
-        }
-
-        if (isPercent()) {
-            return String.format(Locale.ENGLISH, "Rate: %.0f%%, Duration: %d min", getInsulinRate(), getDurationMinutes());
-        } else {
-            return String.format(Locale.ENGLISH, "Rate: %.3f U, Duration: %d min", getInsulinRate(), getDurationMinutes());
-        }
-    }
-
-
-    @NonNull @Override
-    public String toString() {
-        return "TempBasalPair [" + "Rate=" + getInsulinRate() + ", DurationMinutes=" + getDurationMinutes() + ", IsPercent="
-                + isPercent() + "]";
-    }
-}
diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/TempBasalPair.kt b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/TempBasalPair.kt
new file mode 100644
index 0000000000..fcc7e71996
--- /dev/null
+++ b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/TempBasalPair.kt
@@ -0,0 +1,110 @@
+package info.nightscout.androidaps.plugins.pump.medtronic.data.dto
+
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.pump.common.defs.TempBasalPair
+import info.nightscout.androidaps.plugins.pump.common.utils.ByteUtil
+import info.nightscout.androidaps.plugins.pump.medtronic.util.MedtronicUtil
+import java.util.*
+
+/**
+ * Created by geoff on 5/29/15.
+ *
+ * Just need a class to keep the pair together, for parcel transport.
+ */
+class TempBasalPair : TempBasalPair {
+
+    /**
+     * This constructor is for use with PumpHistoryDecoder
+     *
+     * @param rateByte
+     * @param startTimeByte
+     * @param isPercent
+     */
+    constructor(rateByte: Byte, startTimeByte: Int, isPercent: Boolean) : super() {
+        val rateInt = ByteUtil.asUINT8(rateByte)
+        if (isPercent) insulinRate = rateByte.toDouble() else insulinRate = rateInt * 0.025
+        durationMinutes = startTimeByte * 30
+        this.isPercent = isPercent
+    }
+
+    /**
+     * This constructor is for use with PumpHistoryDecoder
+     *
+     * @param rateByte0
+     * @param startTimeByte
+     * @param isPercent
+     */
+    constructor(rateByte0: Byte, rateByte1: Byte, startTimeByte: Int, isPercent: Boolean) {
+        if (isPercent) {
+            insulinRate = rateByte0.toDouble()
+        } else {
+            insulinRate = ByteUtil.toInt(rateByte1.toInt(), rateByte0.toInt()) * 0.025
+        }
+        durationMinutes = startTimeByte * 30
+        this.isPercent = isPercent
+    }
+
+    constructor(aapsLogger: AAPSLogger, response: ByteArray) : super() {
+        aapsLogger.debug(LTag.PUMPBTCOMM, "Received TempBasal response: " + ByteUtil.getHex(response))
+        isPercent = response[0] == 1.toByte()
+        insulinRate = if (isPercent) {
+            response[1].toDouble()
+        } else {
+            val strokes = MedtronicUtil.makeUnsignedShort(response[2].toInt(), response[3].toInt())
+            strokes / 40.0
+        }
+        durationMinutes = if (response.size < 6) {
+            ByteUtil.asUINT8(response[4])
+        } else {
+            MedtronicUtil.makeUnsignedShort(response[4].toInt(), response[5].toInt())
+        }
+        aapsLogger.warn(LTag.PUMPBTCOMM, String.format(Locale.ENGLISH, "TempBasalPair (with %d byte response): %s", response.size, toString()))
+    }
+
+    constructor(insulinRate: Double, isPercent: Boolean, durationMinutes: Int) : super(insulinRate, isPercent, durationMinutes)
+
+    // list.add((byte) 0); // ?
+
+    // list.add((byte) 0); // is_absolute
+    // list.add((byte) 0); // percent amount
+    // 3 (time) - OK
+    val asRawData: ByteArray
+        get() {
+            val list: MutableList<Byte> = ArrayList()
+            list.add(5.toByte())
+            val insulinRate = MedtronicUtil.getBasalStrokes(insulinRate, true)
+            val timeMin = MedtronicUtil.getIntervalFromMinutes(durationMinutes).toByte()
+
+            // list.add((byte) 0); // ?
+
+            // list.add((byte) 0); // is_absolute
+            if (insulinRate.size == 1) list.add(0x00.toByte()) else list.add(insulinRate[0])
+            list.add(insulinRate[1])
+            // list.add((byte) 0); // percent amount
+            list.add(timeMin) // 3 (time) - OK
+            if (insulinRate.size == 1) list.add(0x00.toByte()) else list.add(insulinRate[0])
+            list.add(insulinRate[1])
+            return MedtronicUtil.createByteArray(list)
+        }
+
+    val isCancelTBR: Boolean
+        get() = MedtronicUtil.isSame(insulinRate, 0.0) && durationMinutes == 0
+
+    val description: String
+        get() {
+            if (isCancelTBR) {
+                return "Cancel TBR"
+            }
+            return if (isPercent) {
+                String.format(Locale.ENGLISH, "Rate: %.0f%%, Duration: %d min", insulinRate, durationMinutes)
+            } else {
+                String.format(Locale.ENGLISH, "Rate: %.3f U, Duration: %d min", insulinRate, durationMinutes)
+            }
+        }
+
+    override fun toString(): String {
+        return ("TempBasalPair [" + "Rate=" + insulinRate + ", DurationMinutes=" + durationMinutes + ", IsPercent="
+            + isPercent + "]")
+    }
+}
\ No newline at end of file
diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/TempBasalProcessDTO.java b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/TempBasalProcessDTO.java
deleted file mode 100644
index 86cba28184..0000000000
--- a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/TempBasalProcessDTO.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.medtronic.data.dto;
-
-import info.nightscout.androidaps.plugins.pump.common.utils.DateTimeUtil;
-import info.nightscout.androidaps.plugins.pump.medtronic.comm.history.pump.PumpHistoryEntry;
-
-public class TempBasalProcessDTO {
-
-    public PumpHistoryEntry itemOne;
-    public PumpHistoryEntry itemTwo;
-
-    public Operation processOperation = Operation.None;
-
-    public int getDuration() {
-        if (itemTwo == null) {
-            TempBasalPair tbr = (TempBasalPair) itemOne.getDecodedDataEntry("Object");
-            return tbr.getDurationMinutes();
-        } else {
-            int difference = DateTimeUtil.getATechDateDiferenceAsMinutes(itemOne.atechDateTime, itemTwo.atechDateTime);
-            return difference;
-        }
-    }
-
-
-    public enum Operation {
-        None,
-        Add,
-        Edit
-    }
-
-
-}
diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/TempBasalProcessDTO.kt b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/TempBasalProcessDTO.kt
new file mode 100644
index 0000000000..a0ce5241de
--- /dev/null
+++ b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/TempBasalProcessDTO.kt
@@ -0,0 +1,78 @@
+package info.nightscout.androidaps.plugins.pump.medtronic.data.dto
+
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.pump.common.utils.DateTimeUtil
+import info.nightscout.androidaps.plugins.pump.medtronic.comm.history.pump.PumpHistoryEntry
+
+class TempBasalProcessDTO constructor(var itemOne: PumpHistoryEntry,
+                                      var processOperation: Operation = Operation.None,
+                                      var aapsLogger: AAPSLogger,
+                                      var objectType: ObjectType = ObjectType.TemporaryBasal) {
+
+    var itemTwo: PumpHistoryEntry? = null
+        set(value) {
+            field = value
+            if (objectType == ObjectType.TemporaryBasal) {
+                itemTwoTbr = value!!.getDecodedDataEntry("Object") as TempBasalPair
+            }
+        }
+
+    var itemOneTbr: TempBasalPair? = null
+    var itemTwoTbr: TempBasalPair? = null
+
+    var cancelPresent: Boolean = false
+
+    val atechDateTime: Long
+        get() = itemOne.atechDateTime
+
+    val pumpId: Long
+        get() = itemOne.pumpId
+
+    val durationAsSeconds: Int
+        get() {
+            aapsLogger.debug(LTag.PUMP, "durationAsSeconds: [objectType=$objectType]")
+            if (objectType == ObjectType.TemporaryBasal) {
+                if (itemTwo == null) {
+                    if (itemOneTbr != null) {
+                        aapsLogger.debug("TemporaryBasalPair - itemOneSingle: $itemOneTbr")
+                        return itemOneTbr!!.durationMinutes * 60
+                    } else {
+                        aapsLogger.error("Couldn't find TempBasalPair in entry: $itemOne")
+                        return 0
+                    }
+                } else {
+                    aapsLogger.debug(LTag.PUMP, "Found 2 items for duration: itemOne=$itemOne, itemTwo=$itemTwo")
+                    val secondsDiff = DateTimeUtil.getATechDateDiferenceAsSeconds(itemOne.atechDateTime, itemTwo!!.atechDateTime)
+                    aapsLogger.debug(LTag.PUMP, "Difference in seconds: $secondsDiff")
+                    return secondsDiff
+                }
+            } else {
+                aapsLogger.debug(LTag.PUMP, "Found 2 items for duration (in SuspendMode): itemOne=$itemOne, itemTwo=$itemTwo")
+                val secondsDiff = DateTimeUtil.getATechDateDiferenceAsSeconds(itemOne.atechDateTime, itemTwo!!.atechDateTime)
+                aapsLogger.debug(LTag.PUMP, "Difference in seconds: $secondsDiff")
+                return secondsDiff
+            }
+        }
+
+    init {
+        if (objectType == ObjectType.TemporaryBasal) {
+            itemOneTbr = itemOne.getDecodedDataEntry("Object") as TempBasalPair
+        }
+    }
+
+    override fun toString(): String {
+        return "ItemOne: $itemOne, ItemTwo: $itemTwo, Duration: $durationAsSeconds, Operation: $processOperation, ObjectType: $objectType"
+    }
+
+    enum class Operation {
+        None,
+        Add,
+        Edit
+    }
+
+    enum class ObjectType {
+        TemporaryBasal,
+        Suspend,
+    }
+}
\ No newline at end of file
diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/BasalProfileStatus.java b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/BasalProfileStatus.java
deleted file mode 100644
index 0710e6ca4c..0000000000
--- a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/BasalProfileStatus.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.medtronic.defs;
-
-/**
- * Created by andy on 1/20/19.
- */
-
-public enum BasalProfileStatus {
-
-    NotInitialized, //
-    ProfileOK, //
-    ProfileChanged, //
-    ;
-
-}
diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/BasalProfileStatus.kt b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/BasalProfileStatus.kt
new file mode 100644
index 0000000000..5bce7a4d71
--- /dev/null
+++ b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/BasalProfileStatus.kt
@@ -0,0 +1,12 @@
+package info.nightscout.androidaps.plugins.pump.medtronic.defs
+
+/**
+ * Created by andy on 1/20/19.
+ */
+enum class BasalProfileStatus {
+
+    NotInitialized,  //
+    ProfileOK,  //
+    ProfileChanged
+    //
+}
\ No newline at end of file
diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/BatteryType.java b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/BatteryType.java
deleted file mode 100644
index 503074e640..0000000000
--- a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/BatteryType.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.medtronic.defs;
-
-import androidx.annotation.StringRes;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import info.nightscout.androidaps.plugins.pump.medtronic.R;
-
-
-/**
- * Created by andy on 6/4/18.
- */
-
-public enum BatteryType {
-
-    None(R.string.key_medtronic_pump_battery_no, 0, 0),
-    Alkaline(R.string.key_medtronic_pump_battery_alkaline, 1.20d, 1.47d), //
-    Lithium(R.string.key_medtronic_pump_battery_lithium, 1.22d, 1.64d), //
-    NiZn(R.string.key_medtronic_pump_battery_nizn, 1.40d, 1.70d), //
-    NiMH(R.string.key_medtronic_pump_battery_nimh, 1.10d, 1.40d) //
-    ;
-
-    public final @StringRes int description;
-    public final double lowVoltage;
-    public final double highVoltage;
-
-
-    BatteryType(int resId, double lowVoltage, double highVoltage) {
-        this.description = resId;
-        this.lowVoltage = lowVoltage;
-        this.highVoltage = highVoltage;
-    }
-}
diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/BatteryType.kt b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/BatteryType.kt
new file mode 100644
index 0000000000..a1c0aad63b
--- /dev/null
+++ b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/BatteryType.kt
@@ -0,0 +1,18 @@
+package info.nightscout.androidaps.plugins.pump.medtronic.defs
+
+import androidx.annotation.StringRes
+import info.nightscout.androidaps.plugins.pump.medtronic.R
+
+/**
+ * Created by andy on 6/4/18.
+ */
+enum class BatteryType(@field:StringRes val description: Int, val lowVoltage: Double, val highVoltage: Double) {
+
+    None(R.string.key_medtronic_pump_battery_no, 0.0, 0.0),
+    Alkaline(R.string.key_medtronic_pump_battery_alkaline, 1.20, 1.47),  //
+    Lithium(R.string.key_medtronic_pump_battery_lithium, 1.22, 1.64),  //
+    NiZn(R.string.key_medtronic_pump_battery_nizn, 1.40, 1.70),  //
+    NiMH(R.string.key_medtronic_pump_battery_nimh, 1.10, 1.40 //
+    );
+
+}
\ No newline at end of file
diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/CommandValueDefinitionMDTType.java b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/CommandValueDefinitionMDTType.java
deleted file mode 100644
index f061b860cf..0000000000
--- a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/CommandValueDefinitionMDTType.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.medtronic.defs;
-
-import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.defs.CommandValueDefinitionType;
-
-/**
- * Created by andy on 4/5/19.
- */
-
-public enum CommandValueDefinitionMDTType implements CommandValueDefinitionType {
-    GetModel, //
-    TuneUp, //
-    GetProfile, //
-    GetTBR, //
-    ;
-
-    @Override
-    public String getName() {
-        return this.name();
-    }
-
-
-    @Override
-    public String getDescription() {
-        return null;
-    }
-
-
-    @Override
-    public String commandAction() {
-        return null;
-    }
-
-}
diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/MedtronicCommandType.java b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/MedtronicCommandType.java
deleted file mode 100755
index 0c14ac42f8..0000000000
--- a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/MedtronicCommandType.java
+++ /dev/null
@@ -1,453 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.medtronic.defs;
-
-import java.io.Serializable;
-import java.util.HashMap;
-import java.util.Map;
-
-import info.nightscout.androidaps.plugins.pump.medtronic.R;
-import info.nightscout.androidaps.plugins.pump.medtronic.comm.message.MessageBody;
-import info.nightscout.androidaps.plugins.pump.medtronic.comm.message.PumpAckMessageBody;
-import info.nightscout.androidaps.plugins.pump.medtronic.comm.message.UnknownMessageBody;
-
-/**
- * Taken from GNU Gluco Control diabetes management software (ggc.sourceforge.net)
- * <p>
- * Description: Medtronic Commands (Pump and CGMS) for all 512 and later models (just 5xx)
- * <p>
- * Link to original/unmodified file:
- * https://sourceforge.net/p/ggc/code/HEAD/tree/trunk/ggc-plugins/ggc-plugins-base/src/
- * main/java/ggc/plugin/device/impl/minimed/enums/MinimedCommandType.java
- * <p>
- * A lot of stuff has been removed because it is not needed anymore (historical stuff from CareLink
- * and Carelink USB communication.
- * <p>
- * Author: Andy {andy@atech-software.com}
- */
-public enum MedtronicCommandType implements Serializable // , MinimedCommandTypeInterface
-{
-    InvalidCommand(0, "Invalid Command", null, null), //
-
-    // Pump Responses (9)
-    CommandACK(0x06, "ACK - Acknowledge", MedtronicDeviceType.All, MinimedCommandParameterType.NoParameters), //
-    CommandNAK(0x15, "NAK - Not Acknowledged", MedtronicDeviceType.All, MinimedCommandParameterType.NoParameters), //
-
-    // All (8)
-    PushAck(91, "Push ACK", MedtronicDeviceType.All, MinimedCommandParameterType.FixedParameters, getByteArray(2)), //
-
-    PushEsc(91, "Push Esc", MedtronicDeviceType.All, MinimedCommandParameterType.FixedParameters, getByteArray(1)), //
-
-    PushButton(0x5b, "Push Button", MedtronicDeviceType.All, MinimedCommandParameterType.NoParameters), // 91
-
-    RFPowerOn(93, "RF Power On", MedtronicDeviceType.All, MinimedCommandParameterType.FixedParameters, getByteArray(
-            1, 10)), //
-
-    RFPowerOff(93, "RF Power Off", MedtronicDeviceType.All, MinimedCommandParameterType.FixedParameters, getByteArray(
-            0, 0)), //
-
-    // SetSuspend(77, "Set Suspend", MinimedTargetType.InitCommand, MedtronicDeviceType.All,
-    // MinimedCommandParameterType.FixedParameters, getByteArray(1)), //
-
-    // CancelSuspend(77, "Cancel Suspend", MinimedTargetType.InitCommand, MedtronicDeviceType.All,
-    // MinimedCommandParameterType.FixedParameters, getByteArray(0)), //
-
-    PumpState(131, "Pump State", MedtronicDeviceType.All, MinimedCommandParameterType.NoParameters), //
-
-    ReadPumpErrorStatus(117, "Pump Error Status", MedtronicDeviceType.All, MinimedCommandParameterType.NoParameters), //
-
-    // 511 (InitCommand = 2, Config 7, Data = 1(+3)
-//    DetectBolus(75, "Detect Bolus", MedtronicDeviceType.Medtronic_511, MinimedCommandParameterType.FixedParameters, getByteArray(
-//        0, 0, 0)), //
-
-    // RemoteControlIds(118, "Remote Control Ids", MinimedTargetType.PumpConfiguration_NA, MedtronicDeviceType.All,
-    // MinimedCommandParameterType.NoParameters), //
-
-    // FirmwareVersion(116, "Firmware Version", MinimedTargetType.InitCommand, MedtronicDeviceType.All,
-    // MinimedCommandParameterType.NoParameters), //
-
-    // PumpId(113, "Pump Id", MinimedTargetType.PumpConfiguration, MedtronicDeviceType.All,
-    // MinimedCommandParameterType.NoParameters), // init
-
-    SetRealTimeClock(0x40, "Set Pump Time", MedtronicDeviceType.All, MinimedCommandParameterType.NoParameters, //
-            0), //
-
-    GetRealTimeClock(112, "Get Pump Time", MedtronicDeviceType.All, MinimedCommandParameterType.NoParameters, //
-            7, R.string.medtronic_cmd_desc_get_time), // 0x70
-
-    GetBatteryStatus(0x72, "Get Battery Status", MedtronicDeviceType.All, MinimedCommandParameterType.NoParameters), //
-    // GetBattery((byte) 0x72), //
-
-    GetRemainingInsulin(0x73, "Read Remaining Insulin", MedtronicDeviceType.All, MinimedCommandParameterType.NoParameters, 2), // 115
-
-    SetBolus(0x42, "Set Bolus", MedtronicDeviceType.All, MinimedCommandParameterType.NoParameters, //
-            0, R.string.medtronic_cmd_desc_set_bolus), // 66
-
-    // 512
-    ReadTemporaryBasal(0x98, "Read Temporary Basal", MedtronicDeviceType.Medtronic_512andHigher, MinimedCommandParameterType.NoParameters, //
-            5, R.string.medtronic_cmd_desc_get_tbr), // 152
-
-    SetTemporaryBasal(76, "Set Temporay Basal", MedtronicDeviceType.Medtronic_512andHigher, MinimedCommandParameterType.NoParameters, //
-            0, R.string.medtronic_cmd_desc_set_tbr),
-
-    // 512 Config
-    PumpModel(141, "Pump Model", MedtronicDeviceType.Medtronic_512andHigher, MinimedCommandParameterType.NoParameters, //
-            5, R.string.medtronic_cmd_desc_get_model), // 0x8D
-
-    // BGTargets_512(140, "BG Targets", MinimedTargetType.PumpConfiguration, MedtronicDeviceType.Medtronic_512_712,
-    // MinimedCommandParameterType.NoParameters), //
-
-    // BGUnits(137, "BG Units", MinimedTargetType.PumpConfiguration, MedtronicDeviceType.Medtronic_512andHigher,
-    // MinimedCommandParameterType.NoParameters), //
-
-    // Language(134, "Language", MinimedTargetType.PumpConfiguration, MedtronicDeviceType.Medtronic_512andHigher,
-    // MinimedCommandParameterType.NoParameters), //
-
-    Settings_512(145, "Configuration", MedtronicDeviceType.Medtronic_512_712, MinimedCommandParameterType.NoParameters, //
-            64, 1, 18, R.string.medtronic_cmd_desc_get_settings), //
-
-    // BGAlarmClocks(142, "BG Alarm Clocks", MinimedTargetType.PumpConfiguration,
-    // MedtronicDeviceType.Medtronic_512andHigher, MinimedCommandParameterType.NoParameters), //
-
-    // BGAlarmEnable(151, "BG Alarm Enable", MinimedTargetType.PumpConfiguration,
-    // MedtronicDeviceType.Medtronic_512andHigher, MinimedCommandParameterType.NoParameters), //
-
-    // BGReminderEnable(144, "BG Reminder Enable", MinimedTargetType.PumpConfiguration,
-    // MedtronicDeviceType.Medtronic_512andHigher, MinimedCommandParameterType.NoParameters), //
-
-    // ReadInsulinSensitivities(0x8b, "Read Insulin Sensitivities", MinimedTargetType.PumpConfiguration,
-    // MedtronicDeviceType.Medtronic_512andHigher, MinimedCommandParameterType.NoParameters), // 139
-
-    // 512 Data
-    GetHistoryData(128, "Get History", MedtronicDeviceType.Medtronic_512andHigher, MinimedCommandParameterType.SubCommands, //
-            1024, 16, 1024, R.string.medtronic_cmd_desc_get_history), // 0x80
-
-    GetBasalProfileSTD(146, "Get Profile Standard", MedtronicDeviceType.Medtronic_512andHigher, MinimedCommandParameterType.NoParameters, //
-            64, 3, 192, R.string.medtronic_cmd_desc_get_basal_profile), // 146
-
-    GetBasalProfileA(147, "Get Profile A", MedtronicDeviceType.Medtronic_512andHigher, MinimedCommandParameterType.NoParameters, //
-            64, 3, 192, R.string.medtronic_cmd_desc_get_basal_profile),
-
-    GetBasalProfileB(148, "Get Profile B", MedtronicDeviceType.Medtronic_512andHigher, MinimedCommandParameterType.NoParameters, //
-            64, 3, 192, R.string.medtronic_cmd_desc_get_basal_profile), // 148
-
-    SetBasalProfileSTD(0x6f, "Set Profile Standard", MedtronicDeviceType.Medtronic_512andHigher, MinimedCommandParameterType.NoParameters, //
-            64, 3, 192, R.string.medtronic_cmd_desc_set_basal_profile), // 111
-
-    SetBasalProfileA(0x30, "Set Profile A", MedtronicDeviceType.Medtronic_512andHigher, MinimedCommandParameterType.NoParameters, //
-            64, 3, 192, R.string.medtronic_cmd_desc_set_basal_profile), // 48
-
-    SetBasalProfileB(0x31, "Set Profile B", MedtronicDeviceType.Medtronic_512andHigher, MinimedCommandParameterType.NoParameters, //
-            64, 3, 192, R.string.medtronic_cmd_desc_set_basal_profile), // 49
-
-    // 515
-    PumpStatus(206, "Pump Status", MedtronicDeviceType.Medtronic_515andHigher, MinimedCommandParameterType.NoParameters), // PumpConfiguration
-
-    Settings(192, "Configuration", MedtronicDeviceType.Medtronic_515andHigher, MinimedCommandParameterType.NoParameters, //
-            64, 1, 21, R.string.medtronic_cmd_desc_get_settings), //
-
-    // 522
-    SensorSettings_522(153, "Sensor Configuration", MedtronicDeviceType.Medtronic_522andHigher, MinimedCommandParameterType.NoParameters), //
-
-    GlucoseHistory(154, "Glucose History", MedtronicDeviceType.Medtronic_522andHigher, MinimedCommandParameterType.SubCommands, 1024, 32, 0, null), //
-
-    // 523
-    SensorSettings(207, "Sensor Configuration", MedtronicDeviceType.Medtronic_523andHigher, MinimedCommandParameterType.NoParameters), //
-
-    // 553
-    // 554
-
-    // var MESSAGES = {
-    // READ_TIME : 0x70,
-    // READ_BATTERY_STATUS: 0x72,
-    // READ_HISTORY : 0x80,
-    // READ_CARB_RATIOS : 0x8A,
-    // READ_INSULIN_SENSITIVITIES: 0x8B,
-    // READ_MODEL : 0x8D,
-    // READ_PROFILE_STD : 0x92,
-    // READ_PROFILE_A : 0x93,
-    // READ_PROFILE_B : 0x94,
-    // READ_CBG_HISTORY: 0x9A,
-    // READ_ISIG_HISTORY: 0x9B,
-    // READ_CURRENT_PAGE : 0x9D,
-    // READ_BG_TARGETS : 0x9F,
-    // READ_SETTINGS : 0xC0, 192
-    // READ_CURRENT_CBG_PAGE : 0xCD
-    // };
-
-    // Fake Commands
-
-    CancelTBR(),
-    ;
-
-    static Map<Byte, MedtronicCommandType> mapByCode;
-
-    static {
-        MedtronicCommandType.RFPowerOn.maxAllowedTime = 17000;
-        MedtronicCommandType.RFPowerOn.allowedRetries = 0;
-        MedtronicCommandType.RFPowerOn.recordLength = 0;
-        MedtronicCommandType.RFPowerOn.minimalBufferSizeToStartReading = 1;
-
-        mapByCode = new HashMap<>();
-
-        for (MedtronicCommandType medtronicCommandType : values()) {
-            mapByCode.put(medtronicCommandType.getCommandCode(), medtronicCommandType);
-        }
-    }
-
-    public byte commandCode = 0;
-    public String commandDescription = "";
-    public byte[] commandParameters = null;
-    public int commandParametersCount = 0;
-    public int maxRecords = 1;
-    private Integer resourceId;
-    public int command_type = 0;
-    public int allowedRetries = 2;
-    public int maxAllowedTime = 2000;
-    public MinimedCommandParameterType parameterType;
-    public int minimalBufferSizeToStartReading = 14;
-    public int expectedLength = 0;
-    //MinimedTargetType targetType;
-    MedtronicDeviceType devices;
-    private int recordLength = 64;
-
-
-    MedtronicCommandType() {
-        // this is for "fake" commands needed by AAPS MedtronicUITask
-    }
-
-
-    //    MedtronicCommandType(int code, String description, MedtronicDeviceType devices,
-//            MinimedCommandParameterType parameterType) {
-//        this(code, description, devices, parameterType, 64, 1, 0, 0, 0, 0);
-//    }
-//
-//
-//    MedtronicCommandType(int code, String description, MedtronicDeviceType devices,
-//            MinimedCommandParameterType parameterType, int expectedLength) {
-//        this(code, description, devices, parameterType, 64, 1, 0, 0, 0, expectedLength);
-//    }
-//
-//
-//    MedtronicCommandType(int code, String description, MedtronicDeviceType devices,
-//            MinimedCommandParameterType parameterType, int recordLength, int maxRecords, int commandType) {
-//        this(code, description, devices, parameterType, recordLength, maxRecords, 0, 0, commandType, 0);
-//    }
-//
-//
-//    MedtronicCommandType(int code, String description, MedtronicDeviceType devices,
-//            MinimedCommandParameterType parameterType, int recordLength, int maxRecords, int commandType,
-//            int expectedLength) {
-//        this(code, description, devices, parameterType, recordLength, maxRecords, 0, 0, commandType,
-//            expectedLength);
-//    }
-//
-//
-    MedtronicCommandType(int code, String description, MedtronicDeviceType devices,
-                         MinimedCommandParameterType parameterType, byte[] cmd_params) {
-        this(code, description, devices, parameterType, 0, 1, 0, 0, 11, 0);
-
-        this.commandParameters = cmd_params;
-        this.commandParametersCount = cmd_params.length;
-    }
-
-
-    MedtronicCommandType(int code, String description, MedtronicDeviceType devices, //
-                         MinimedCommandParameterType parameterType) {
-
-        this(code, description, devices, parameterType, 64, 1, 0, null);
-    }
-
-
-    // NEW
-    MedtronicCommandType(int code, String description, MedtronicDeviceType devices,
-                         MinimedCommandParameterType parameterType, int recordLength, int maxRecords, int commandType) {
-        this(code, description, devices, parameterType, recordLength, maxRecords, 0, null);
-    }
-
-
-    // NEW
-    MedtronicCommandType(int code, String description, MedtronicDeviceType devices, //
-                         MinimedCommandParameterType parameterType, int expectedLength) {
-        this(code, description, devices, parameterType, 64, 1, expectedLength, null);
-    }
-
-
-    // NEW
-    MedtronicCommandType(int code, String description, MedtronicDeviceType devices, //
-                         MinimedCommandParameterType parameterType, int expectedLength, int resourceId) {
-        this(code, description, devices, parameterType, 64, 1, expectedLength, resourceId);
-    }
-
-
-    // NEW
-    MedtronicCommandType(int code, String description,
-                         MedtronicDeviceType devices, //
-                         MinimedCommandParameterType parameterType, int recordLength, int max_recs, int expectedLength,
-                         Integer resourceId) {
-        this.commandCode = (byte) code;
-        this.commandDescription = description;
-        this.devices = devices;
-        this.recordLength = recordLength;
-        this.maxRecords = max_recs;
-        this.resourceId = resourceId;
-
-        this.commandParametersCount = 0;
-        this.allowedRetries = 2;
-        this.parameterType = parameterType;
-        this.expectedLength = expectedLength;
-
-        if (this.parameterType == MinimedCommandParameterType.SubCommands) {
-            this.minimalBufferSizeToStartReading = 200;
-        }
-    }
-
-
-    @Deprecated
-    MedtronicCommandType(int code, String description, MedtronicDeviceType devices, //
-                         MinimedCommandParameterType parameterType, int recordLength, int max_recs, int addy, //
-                         int addy_len, int cmd_type, int expectedLength) {
-        this.commandCode = (byte) code;
-        this.commandDescription = description;
-        //this.targetType = targetType;
-        this.devices = devices;
-        this.recordLength = recordLength;
-        this.maxRecords = max_recs;
-
-        this.command_type = cmd_type;
-        this.commandParametersCount = 0;
-        this.allowedRetries = 2;
-        this.parameterType = parameterType;
-        this.expectedLength = expectedLength;
-
-        if (this.parameterType == MinimedCommandParameterType.SubCommands) {
-            this.minimalBufferSizeToStartReading = 200;
-        }
-
-    }
-
-
-    private static HashMap<MedtronicDeviceType, String> getDeviceTypesArray(MedtronicDeviceType... types) {
-        HashMap<MedtronicDeviceType, String> hashMap = new HashMap<MedtronicDeviceType, String>();
-
-        for (MedtronicDeviceType type : types) {
-            hashMap.put(type, null);
-        }
-
-        return hashMap;
-    }
-
-
-    private static byte[] getByteArray(int... data) {
-        byte[] array = new byte[data.length];
-
-        for (int i = 0; i < data.length; i++) {
-            array[i] = (byte) data[i];
-        }
-
-        return array;
-    }
-
-
-    private static int[] getIntArray(int... data) {
-        return data;
-    }
-
-
-    public static MedtronicCommandType getByCode(byte code) {
-        if (mapByCode.containsKey(code)) {
-            return mapByCode.get(code);
-        } else {
-            return MedtronicCommandType.InvalidCommand;
-        }
-    }
-
-
-    public static MessageBody constructMessageBody(MedtronicCommandType messageType, byte[] bodyData) {
-        switch (messageType) {
-            case CommandACK:
-                return new PumpAckMessageBody(bodyData);
-            default:
-                return new UnknownMessageBody(bodyData);
-        }
-    }
-
-
-    public static MedtronicCommandType getSettings(MedtronicDeviceType medtronicPumpModel) {
-        if (MedtronicDeviceType.isSameDevice(medtronicPumpModel, MedtronicDeviceType.Medtronic_512_712))
-            return MedtronicCommandType.Settings_512;
-        else
-            return MedtronicCommandType.Settings;
-    }
-
-
-    /**
-     * Get Full Command Description
-     *
-     * @return command description
-     */
-    public String getFullCommandDescription() {
-        return "Command [name=" + this.name() + ", id=" + this.commandCode + ",description=" + this.commandDescription
-                + "] ";
-    }
-
-
-    public boolean canReturnData() {
-        System.out.println("CanReturnData: ]id=" + this.name() + "max=" + this.maxRecords + "recLen=" + recordLength);
-        return (this.maxRecords * this.recordLength) > 0;
-    }
-
-
-    public int getRecordLength() {
-        return recordLength;
-    }
-
-
-    public int getMaxRecords() {
-        return maxRecords;
-    }
-
-
-    public byte getCommandCode() {
-        return commandCode;
-    }
-
-
-    public int getCommandParametersCount() {
-        if (this.commandParameters == null) {
-            return 0;
-        } else {
-            return this.commandParameters.length;
-        }
-    }
-
-
-    public byte[] getCommandParameters() {
-        return commandParameters;
-    }
-
-
-    public boolean hasCommandParameters() {
-        return (getCommandParametersCount() > 0);
-    }
-
-
-    public String toString() {
-        return name();
-    }
-
-
-    public String getCommandDescription() {
-        return this.commandDescription;
-    }
-
-
-    public Integer getResourceId() {
-        return resourceId;
-    }
-
-    public enum MinimedCommandParameterType {
-        NoParameters, //
-        FixedParameters, //
-        SubCommands //
-    }
-
-}
diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/MedtronicCommandType.kt b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/MedtronicCommandType.kt
new file mode 100755
index 0000000000..b5f7c08764
--- /dev/null
+++ b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/MedtronicCommandType.kt
@@ -0,0 +1,191 @@
+package info.nightscout.androidaps.plugins.pump.medtronic.defs
+
+import info.nightscout.androidaps.plugins.pump.medtronic.R
+import info.nightscout.androidaps.plugins.pump.medtronic.comm.message.MessageBody
+import info.nightscout.androidaps.plugins.pump.medtronic.comm.message.PumpAckMessageBody
+import info.nightscout.androidaps.plugins.pump.medtronic.comm.message.UnknownMessageBody
+import info.nightscout.androidaps.plugins.pump.medtronic.defs.MedtronicDeviceType.Companion.isSameDevice
+import java.util.*
+
+/**
+ * Taken from GNU Gluco Control diabetes management software (ggc.sourceforge.net)
+ *
+ *
+ * Description: Medtronic Commands (Pump and CGMS) for all 512 and later models (just 5xx)
+ *
+ *
+ * Link to original/unmodified file:
+ * https://sourceforge.net/p/ggc/code/HEAD/tree/trunk/ggc-plugins/ggc-plugins-base/src/
+ * main/java/ggc/plugin/device/impl/minimed/enums/MinimedCommandType.java
+ *
+ *
+ * A lot of stuff has been removed because it is not needed anymore (historical stuff from CareLink
+ * and Carelink USB communication.
+ *
+ *
+ * Author: Andy {andy@atech-software.com}
+ */
+enum class MedtronicCommandType(
+    code: Int,
+    description: String,
+    var devices: MedtronicDeviceType = MedtronicDeviceType.All,
+    var parameterType: MinimedCommandParameterType = MinimedCommandParameterType.NoParameters,
+    var recordLength: Int = 64,
+    var maxRecords: Int = 1,
+    var expectedLength: Int = 0,
+    var resourceId: Int? = null,
+    var commandParameters: ByteArray? = null) {
+
+    InvalidCommand(code = 0, description = "Invalid Command"),  //
+
+    // Pump Responses (9)
+    CommandACK(code = 0x06, description = "ACK - Acknowledge"),  //
+    CommandNAK(code = 0x15, description = "NAK - Not Acknowledged"),  //
+
+    // All (8)
+    PushAck(code = 91, description = "Push ACK", parameterType = MinimedCommandParameterType.FixedParameters, commandParameters = byteArrayOf(2)),  //
+    PushEsc(code = 91, description = "Push Esc", parameterType = MinimedCommandParameterType.FixedParameters, commandParameters = byteArrayOf(1)),  //
+    PushButton(code = 0x5b, description = "Push Button"),  // 91
+    RFPowerOn(code = 93, description = "RF Power On", parameterType = MinimedCommandParameterType.FixedParameters, commandParameters = byteArrayOf(1, 10)),  //
+    RFPowerOff(code = 93, description = "RF Power Off", parameterType = MinimedCommandParameterType.FixedParameters, commandParameters = byteArrayOf(0, 0)),  //
+
+    // SetSuspend(77, "Set Suspend", MinimedTargetType.InitCommand, MedtronicDeviceType.All, MinimedCommandParameterType.FixedParameters, getByteArray(1)), //
+    // CancelSuspend(77, "Cancel Suspend", MinimedTargetType.InitCommand, MedtronicDeviceType.All,MinimedCommandParameterType.FixedParameters, getByteArray(0)), //
+    PumpState(code = 131, description = "Pump State"),  //
+    ReadPumpErrorStatus(code = 117, description = "Pump Error Status"),  //
+
+    // 511 (InitCommand = 2, Config 7, Data = 1(+3)
+    //    DetectBolus(75, "Detect Bolus", MedtronicDeviceType.Medtronic_511, MinimedCommandParameterType.FixedParameters, getByteArray(
+    //        0, 0, 0)), //
+    // RemoteControlIds(118, "Remote Control Ids", MinimedTargetType.PumpConfiguration_NA, MedtronicDeviceType.All,MinimedCommandParameterType.NoParameters), //
+    // FirmwareVersion(116, "Firmware Version", MinimedTargetType.InitCommand, MedtronicDeviceType.All,MinimedCommandParameterType.NoParameters), //
+    // PumpId(113, "Pump Id", MinimedTargetType.PumpConfiguration, MedtronicDeviceType.All,MinimedCommandParameterType.NoParameters), // init
+    SetRealTimeClock(code = 0x40, description = "Set Pump Time", recordLength = 0, resourceId = R.string.medtronic_cmd_desc_set_time),  //
+    GetRealTimeClock(112, description = "Get Pump Time", recordLength = 7, resourceId = R.string.medtronic_cmd_desc_get_time),  // 0x70
+    GetBatteryStatus(code = 0x72, description = "Get Battery Status", recordLength = 0, resourceId = R.string.medtronic_cmd_desc_get_battery_status), //
+    GetRemainingInsulin(code = 0x73, description = "Read Remaining Insulin",
+        recordLength = 2, resourceId = R.string.medtronic_cmd_desc_get_remaining_insulin),  // 115
+    SetBolus(code = 0x42, description = "Set Bolus", recordLength = 0, resourceId = R.string.medtronic_cmd_desc_set_bolus),  // 66
+
+    // 512
+    ReadTemporaryBasal(code = 0x98, description = "Read Temporary Basal", devices = MedtronicDeviceType.Medtronic_512andHigher,  //
+        recordLength = 5, resourceId = R.string.medtronic_cmd_desc_get_tbr),  // 152
+    SetTemporaryBasal(code = 76, description = "Set Temporay Basal", devices = MedtronicDeviceType.Medtronic_512andHigher, //
+        recordLength = 0, resourceId = R.string.medtronic_cmd_desc_set_tbr),  // 512 Config
+    PumpModel(code = 141, description = "Pump Model", devices = MedtronicDeviceType.Medtronic_512andHigher,   //
+        recordLength = 5, resourceId = R.string.medtronic_cmd_desc_get_model),  // 0x8D
+
+    // BGTargets_512(140, "BG Targets", MinimedTargetType.PumpConfiguration, MedtronicDeviceType.Medtronic_512_712,
+    // MinimedCommandParameterType.NoParameters), //
+    // BGUnits(137, "BG Units", MinimedTargetType.PumpConfiguration, MedtronicDeviceType.Medtronic_512andHigher,
+    // MinimedCommandParameterType.NoParameters), //
+    // Language(134, "Language", MinimedTargetType.PumpConfiguration, MedtronicDeviceType.Medtronic_512andHigher,
+    // MinimedCommandParameterType.NoParameters), //
+    Settings_512(code = 145, description = "Configuration", devices = MedtronicDeviceType.Medtronic_512_712,
+        expectedLength = 18, resourceId = R.string.medtronic_cmd_desc_get_settings),  //
+
+    // 512 Data
+    GetHistoryData(code = 128, description = "Get History", devices = MedtronicDeviceType.Medtronic_512andHigher,
+        parameterType = MinimedCommandParameterType.SubCommands, recordLength = 1024, maxRecords = 16,
+        expectedLength = 1024, resourceId = R.string.medtronic_cmd_desc_get_history),  // 0x80
+    GetBasalProfileSTD(code = 146, description = "Get Profile Standard", devices = MedtronicDeviceType.Medtronic_512andHigher,  //
+        maxRecords = 3, expectedLength = 192, resourceId = R.string.medtronic_cmd_desc_get_basal_profile),  // 146
+    GetBasalProfileA(code = 147, description = "Get Profile A", devices = MedtronicDeviceType.Medtronic_512andHigher,   //
+        maxRecords = 3, expectedLength = 192, resourceId = R.string.medtronic_cmd_desc_get_basal_profile),
+    GetBasalProfileB(code = 148, description = "Get Profile B", devices = MedtronicDeviceType.Medtronic_512andHigher,   //
+        maxRecords = 3, expectedLength = 192, resourceId = R.string.medtronic_cmd_desc_get_basal_profile),  // 148
+    SetBasalProfileSTD(code = 0x6f, description = "Set Profile Standard", devices = MedtronicDeviceType.Medtronic_512andHigher,   //
+        maxRecords = 3, expectedLength = 192, resourceId = R.string.medtronic_cmd_desc_set_basal_profile),  // 111
+    SetBasalProfileA(code = 0x30, description = "Set Profile A", devices = MedtronicDeviceType.Medtronic_512andHigher,  //
+        maxRecords = 3, expectedLength = 192, resourceId = R.string.medtronic_cmd_desc_set_basal_profile),  // 48
+    SetBasalProfileB(code = 0x31, description = "Set Profile B", devices = MedtronicDeviceType.Medtronic_512andHigher,  //
+        maxRecords = 3, expectedLength = 192, resourceId = R.string.medtronic_cmd_desc_set_basal_profile),  // 49
+
+    // 515
+    PumpStatus(code = 206, description = "Pump Status", devices = MedtronicDeviceType.Medtronic_515andHigher),  // PumpConfiguration
+    Settings(code = 192, description = "Configuration", devices = MedtronicDeviceType.Medtronic_515andHigher,
+        maxRecords = 1, expectedLength = 21, resourceId = R.string.medtronic_cmd_desc_get_settings),  //
+
+    // 522
+    SensorSettings_522(code = 153, description = "Sensor Configuration", devices = MedtronicDeviceType.Medtronic_522andHigher),  //
+    GlucoseHistory(code = 154, description = "Glucose History", devices = MedtronicDeviceType.Medtronic_522andHigher,
+        MinimedCommandParameterType.SubCommands, recordLength = 1024, maxRecords = 32, expectedLength = 0),  //
+
+    // 523
+    SensorSettings(code = 207, description = "Sensor Configuration", devices = MedtronicDeviceType.Medtronic_523andHigher),  //
+
+    // 553
+    // 554
+    // var MESSAGES = {
+    // READ_CARB_RATIOS : 0x8A,
+    // READ_INSULIN_SENSITIVITIES: 0x8B,
+    // READ_CBG_HISTORY: 0x9A,
+    // READ_ISIG_HISTORY: 0x9B,
+    // READ_CURRENT_PAGE : 0x9D,
+    // READ_BG_TARGETS : 0x9F,
+    // READ_SETTINGS : 0xC0, 192
+    // READ_CURRENT_CBG_PAGE : 0xCD
+    // };
+    // Fake Commands
+    CancelTBR(code = 250, description = "Cancel TBR", resourceId = R.string.medtronic_cmd_desc_cancel_tbr);
+
+    companion object {
+
+        var mapByCode: MutableMap<Byte, MedtronicCommandType> = HashMap()
+
+        fun getByCode(code: Byte): MedtronicCommandType? {
+            return if (mapByCode.containsKey(code)) {
+                mapByCode[code]
+            } else {
+                InvalidCommand
+            }
+        }
+
+        fun constructMessageBody(messageType: MedtronicCommandType?, bodyData: ByteArray): MessageBody {
+            return when (messageType) {
+                CommandACK -> PumpAckMessageBody(bodyData)
+                else       -> UnknownMessageBody(bodyData)
+            }
+        }
+
+        fun getSettings(medtronicPumpModel: MedtronicDeviceType): MedtronicCommandType {
+            return if (isSameDevice(medtronicPumpModel, MedtronicDeviceType.Medtronic_512_712))
+                Settings_512
+            else
+                Settings
+        }
+
+        init {
+            for (medtronicCommandType in values()) {
+                mapByCode[medtronicCommandType.commandCode] = medtronicCommandType
+            }
+        }
+    }
+
+    var commandCode: Byte = 0
+    var commandDescription = description
+    var commandParametersCount = 0
+    var allowedRetries = 2
+
+    //var maxAllowedTime = 2000
+    var minimalBufferSizeToStartReading = 14
+
+    init {
+        commandCode = code.toByte()
+        this.commandParametersCount = commandParameters?.size ?: 0
+        allowedRetries = 2
+        if (this.parameterType == MinimedCommandParameterType.SubCommands) {
+            minimalBufferSizeToStartReading = 200
+        }
+    }
+
+    override fun toString(): String {
+        return name
+    }
+
+    enum class MinimedCommandParameterType {
+        NoParameters,  //
+        FixedParameters,  //
+        SubCommands //
+    }
+}
\ No newline at end of file
diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/MedtronicCustomActionType.java b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/MedtronicCustomActionType.java
deleted file mode 100644
index af0be33cfa..0000000000
--- a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/MedtronicCustomActionType.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.medtronic.defs;
-
-import info.nightscout.androidaps.plugins.general.actions.defs.CustomActionType;
-
-/**
- * Created by andy on 11/3/18.
- */
-
-public enum MedtronicCustomActionType implements CustomActionType {
-
-    WakeUpAndTune(), //
-    ClearBolusBlock(), //
-    ResetRileyLinkConfiguration(), //
-    ;
-
-    @Override
-    public String getKey() {
-        return this.name();
-    }
-}
diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/MedtronicCustomActionType.kt b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/MedtronicCustomActionType.kt
new file mode 100644
index 0000000000..80713a7fa5
--- /dev/null
+++ b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/MedtronicCustomActionType.kt
@@ -0,0 +1,19 @@
+package info.nightscout.androidaps.plugins.pump.medtronic.defs
+
+import info.nightscout.androidaps.plugins.general.actions.defs.CustomActionType
+
+/**
+ * Created by andy on 11/3/18.
+ */
+enum class MedtronicCustomActionType : CustomActionType {
+
+    WakeUpAndTune,  //
+    ClearBolusBlock,  //
+    ResetRileyLinkConfiguration;
+
+    //
+
+    override fun getKey(): String {
+        return name
+    }
+}
\ No newline at end of file
diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/MedtronicDeviceType.java b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/MedtronicDeviceType.java
deleted file mode 100644
index 6623a6f9d8..0000000000
--- a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/MedtronicDeviceType.java
+++ /dev/null
@@ -1,140 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.medtronic.defs;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * Taken from GNU Gluco Control diabetes management software (ggc.sourceforge.net)
- * <p>
- * Author: Andy {andy@atech-software.com}
- */
-
-public enum MedtronicDeviceType {
-    Unknown_Device, //
-
-    // Pump
-    Medtronic_511("511"), //
-
-    Medtronic_512("512"), //
-    Medtronic_712("712"), //
-    Medtronic_512_712(Medtronic_512, Medtronic_712), //
-
-    Medtronic_515("515"), //
-    Medtronic_715("715"), //
-    Medtronic_515_715(Medtronic_515, Medtronic_715), //
-
-    Medtronic_522("522"), //
-    Medtronic_722("722"), //
-    Medtronic_522_722(Medtronic_522, Medtronic_722), //
-
-    Medtronic_523_Revel("523"), //
-    Medtronic_723_Revel("723"), //
-
-    Medtronic_554_Veo("554"), //
-    Medtronic_754_Veo("754"), //
-
-    Medtronic_512andHigher(Medtronic_512, Medtronic_712, Medtronic_515, Medtronic_715, Medtronic_522, Medtronic_722, //
-            Medtronic_523_Revel, Medtronic_723_Revel, Medtronic_554_Veo, Medtronic_754_Veo), //
-
-    Medtronic_515andHigher(Medtronic_515, Medtronic_715, Medtronic_522, Medtronic_722, Medtronic_523_Revel, Medtronic_723_Revel, //
-            Medtronic_554_Veo, Medtronic_754_Veo), //
-    Medtronic_522andHigher(Medtronic_522, Medtronic_722, Medtronic_523_Revel, Medtronic_723_Revel, //
-            Medtronic_554_Veo, Medtronic_754_Veo), //
-    Medtronic_523andHigher(Medtronic_523_Revel, Medtronic_723_Revel, Medtronic_554_Veo, //
-            Medtronic_754_Veo), //
-
-    Medtronic_554andHigher(Medtronic_554_Veo, Medtronic_754_Veo), //
-
-
-    //
-    All;
-
-    static Map<String, MedtronicDeviceType> mapByDescription;
-
-    static {
-
-        mapByDescription = new HashMap<>();
-
-        for (MedtronicDeviceType minimedDeviceType : values()) {
-
-            if (!minimedDeviceType.isFamily) {
-                mapByDescription.put(minimedDeviceType.pumpModel, minimedDeviceType);
-            }
-        }
-
-    }
-
-    private String pumpModel;
-
-    private final boolean isFamily;
-    private MedtronicDeviceType[] familyMembers = null;
-
-
-    MedtronicDeviceType(String pumpModel) {
-        this.isFamily = false;
-        this.pumpModel = pumpModel;
-    }
-
-
-    MedtronicDeviceType(MedtronicDeviceType... familyMembers) {
-        this.familyMembers = familyMembers;
-        this.isFamily = true;
-    }
-
-
-    public static boolean isSameDevice(MedtronicDeviceType deviceWeCheck, MedtronicDeviceType deviceSources) {
-        if (deviceSources.isFamily) {
-            for (MedtronicDeviceType mdt : deviceSources.familyMembers) {
-                if (mdt == deviceWeCheck)
-                    return true;
-            }
-        } else {
-            return (deviceWeCheck == deviceSources);
-        }
-
-        return false;
-    }
-
-
-    public static MedtronicDeviceType getByDescription(String desc) {
-        if (mapByDescription.containsKey(desc)) {
-            return mapByDescription.get(desc);
-        } else {
-            return MedtronicDeviceType.Unknown_Device;
-        }
-    }
-
-
-//    public static boolean isLargerFormat(MedtronicDeviceType model) {
-//        return isSameDevice(model, Medtronic_523andHigher);
-//    }
-
-
-    public boolean isFamily() {
-        return isFamily;
-    }
-
-
-    public MedtronicDeviceType[] getFamilyMembers() {
-        return familyMembers;
-    }
-
-
-//    public boolean isLargerFormat() {
-//        return isSameDevice(this, Medtronic_523andHigher);
-//    }
-
-    public boolean isMedtronic_523orHigher() {
-        return isSameDevice(this, Medtronic_523andHigher);
-    }
-
-
-    public int getBolusStrokes() {
-        return (isMedtronic_523orHigher()) ? 40 : 10;
-    }
-
-
-    public String getPumpModel() {
-        return pumpModel;
-    }
-}
diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/MedtronicDeviceType.kt b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/MedtronicDeviceType.kt
new file mode 100644
index 0000000000..ebf1c0e7c6
--- /dev/null
+++ b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/MedtronicDeviceType.kt
@@ -0,0 +1,100 @@
+package info.nightscout.androidaps.plugins.pump.medtronic.defs
+
+import java.util.*
+
+/**
+ * Taken from GNU Gluco Control diabetes management software (ggc.sourceforge.net)
+ *
+ *
+ * Author: Andy {andy@atech-software.com}
+ */
+enum class MedtronicDeviceType {
+
+    Unknown_Device,  //
+
+    // Pump
+    Medtronic_511("511"),  //
+    Medtronic_512("512"),  //
+    Medtronic_712("712"),  //
+    Medtronic_512_712(listOf(Medtronic_512, Medtronic_712)),  //
+    Medtronic_515("515"),  //
+    Medtronic_715("715"),  //
+    Medtronic_515_715(listOf(Medtronic_515, Medtronic_715)),  //
+    Medtronic_522("522"),  //
+    Medtronic_722("722"),  //
+    Medtronic_522_722(listOf(Medtronic_522, Medtronic_722)),  //
+    Medtronic_523_Revel("523"),  //
+    Medtronic_723_Revel("723"),  //
+    Medtronic_554_Veo("554"),  //
+    Medtronic_754_Veo("754"),  //
+    Medtronic_512andHigher(listOf(Medtronic_512, Medtronic_712, Medtronic_515, Medtronic_715, Medtronic_522, Medtronic_722, Medtronic_523_Revel, Medtronic_723_Revel, Medtronic_554_Veo, Medtronic_754_Veo)),  //
+    Medtronic_515andHigher(listOf(Medtronic_515, Medtronic_715, Medtronic_522, Medtronic_722, Medtronic_523_Revel, Medtronic_723_Revel, Medtronic_554_Veo, Medtronic_754_Veo)),  //
+    Medtronic_522andHigher(listOf(Medtronic_522, Medtronic_722, Medtronic_523_Revel, Medtronic_723_Revel, Medtronic_554_Veo, Medtronic_754_Veo)),  //
+    Medtronic_523andHigher(listOf(Medtronic_523_Revel, Medtronic_723_Revel, Medtronic_554_Veo, Medtronic_754_Veo)),  //
+    Medtronic_554andHigher(listOf(Medtronic_554_Veo, Medtronic_754_Veo)),  //
+
+    //
+    All;
+
+    companion object {
+        var mapByDescription: MutableMap<String, MedtronicDeviceType> = mutableMapOf()
+
+        fun isSameDevice(deviceWeCheck: MedtronicDeviceType, deviceSources: MedtronicDeviceType): Boolean {
+            if (deviceSources.isFamily) {
+                for (mdt in deviceSources.familyMembers!!) {
+                    if (mdt == deviceWeCheck) return true
+                }
+            } else {
+                return deviceWeCheck == deviceSources
+            }
+            return false
+        }
+
+        fun getByDescription(desc: String): MedtronicDeviceType {
+            return if (mapByDescription.containsKey(desc)) {
+                mapByDescription[desc]!!
+            } else {
+                Unknown_Device
+            }
+        }
+
+        init {
+            for (minimedDeviceType in values()) {
+                if (!minimedDeviceType.isFamily && minimedDeviceType.pumpModel!=null) {
+                    mapByDescription[minimedDeviceType.pumpModel!!] = minimedDeviceType
+                }
+            }
+        }
+    }
+
+    var pumpModel: String? = null
+        private set
+
+    //    public static boolean isLargerFormat(MedtronicDeviceType model) {
+    //        return isSameDevice(model, Medtronic_523andHigher);
+    //    }
+    val isFamily: Boolean
+    var familyMembers: List<MedtronicDeviceType>? = null
+        private set
+
+    constructor() {
+        isFamily = false
+    }
+
+    constructor(pumpModel: String?) {
+        isFamily = false
+        this.pumpModel = pumpModel
+    }
+
+    constructor(familyMembers: List<MedtronicDeviceType>) {
+        this.familyMembers = familyMembers
+        isFamily = true
+    }
+
+    val isMedtronic_523orHigher: Boolean
+        get() = isSameDevice(this, Medtronic_523andHigher)
+
+    val bolusStrokes: Int
+        get() = if (isMedtronic_523orHigher) 40 else 10
+
+}
\ No newline at end of file
diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/MedtronicNotificationType.java b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/MedtronicNotificationType.java
deleted file mode 100644
index b05fce81fc..0000000000
--- a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/MedtronicNotificationType.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.medtronic.defs;
-
-import info.nightscout.androidaps.plugins.general.overview.notifications.Notification;
-import info.nightscout.androidaps.plugins.pump.medtronic.R;
-
-/**
- * Created by andy on 10/15/18.
- */
-
-public enum MedtronicNotificationType {
-
-    PumpUnreachable(Notification.RILEYLINK_CONNECTION, R.string.medtronic_pump_status_pump_unreachable, Notification.NORMAL), //
-    PumpTypeNotSame(R.string.medtronic_error_pump_type_set_differs_from_detected, Notification.NORMAL), //
-    PumpBasalProfilesNotEnabled(R.string.medtronic_error_pump_basal_profiles_not_enabled, Notification.URGENT), //
-    PumpIncorrectBasalProfileSelected(R.string.medtronic_error_pump_incorrect_basal_profile_selected, Notification.URGENT), //
-    PumpWrongTBRTypeSet(R.string.medtronic_error_pump_wrong_tbr_type_set, Notification.URGENT), //
-    PumpWrongMaxBolusSet(R.string.medtronic_error_pump_wrong_max_bolus_set, Notification.NORMAL), //
-    PumpWrongMaxBasalSet(R.string.medtronic_error_pump_wrong_max_basal_set, Notification.NORMAL), //
-    PumpWrongTimeUrgent(R.string.medtronic_notification_check_time_date, Notification.URGENT),
-    PumpWrongTimeNormal(R.string.medtronic_notification_check_time_date, Notification.NORMAL),
-    TimeChangeOver24h(Notification.OVER_24H_TIME_CHANGE_REQUESTED, R.string.medtronic_error_pump_24h_time_change_requested, Notification.URGENT),
-    //
-    ;
-
-    private int notificationType;
-    private final int resourceId;
-    private final int notificationUrgency;
-
-
-    MedtronicNotificationType(int resourceId, int notificationUrgency) {
-        this(Notification.MEDTRONIC_PUMP_ALARM, resourceId, notificationUrgency);
-    }
-
-
-    MedtronicNotificationType(int notificationType, int resourceId, int notificationUrgency) {
-        this.notificationType = notificationType;
-        this.resourceId = resourceId;
-        this.notificationUrgency = notificationUrgency;
-    }
-
-
-    public int getNotificationType() {
-        return notificationType;
-    }
-
-
-    public void setNotificationType(int notificationType) {
-        this.notificationType = notificationType;
-    }
-
-
-    public int getResourceId() {
-
-        return resourceId;
-    }
-
-
-    public int getNotificationUrgency() {
-
-        return notificationUrgency;
-    }
-
-    // Notification.MEDTRONIC_PUMP_ALARM R.string.medtronic_pump_status_pump_unreachable, Notification.NORMAL
-
-}
diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/MedtronicNotificationType.kt b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/MedtronicNotificationType.kt
new file mode 100644
index 0000000000..b6bd1a758e
--- /dev/null
+++ b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/MedtronicNotificationType.kt
@@ -0,0 +1,23 @@
+package info.nightscout.androidaps.plugins.pump.medtronic.defs
+
+import info.nightscout.androidaps.plugins.general.overview.notifications.Notification
+import info.nightscout.androidaps.plugins.pump.medtronic.R
+
+/**
+ * Created by andy on 10/15/18.
+ */
+enum class MedtronicNotificationType(var notificationType: Int,
+                                     val resourceId: Int,
+                                     val notificationUrgency: Int) {
+
+    PumpUnreachable(Notification.RILEYLINK_CONNECTION, R.string.medtronic_pump_status_pump_unreachable, Notification.NORMAL),  //
+    PumpTypeNotSame(R.string.medtronic_error_pump_type_set_differs_from_detected, Notification.NORMAL),  //
+    PumpBasalProfilesNotEnabled(R.string.medtronic_error_pump_basal_profiles_not_enabled, Notification.URGENT),  //
+    PumpIncorrectBasalProfileSelected(R.string.medtronic_error_pump_incorrect_basal_profile_selected, Notification.URGENT),  //
+    PumpWrongTBRTypeSet(R.string.medtronic_error_pump_wrong_tbr_type_set, Notification.URGENT),  //
+    PumpWrongMaxBolusSet(R.string.medtronic_error_pump_wrong_max_bolus_set, Notification.NORMAL),  //
+    PumpWrongMaxBasalSet(R.string.medtronic_error_pump_wrong_max_basal_set, Notification.NORMAL),  //
+    PumpWrongTimeUrgent(R.string.medtronic_notification_check_time_date, Notification.URGENT), PumpWrongTimeNormal(R.string.medtronic_notification_check_time_date, Notification.NORMAL), TimeChangeOver24h(Notification.OVER_24H_TIME_CHANGE_REQUESTED, R.string.medtronic_error_pump_24h_time_change_requested, Notification.URGENT);
+
+    constructor(resourceId: Int, notificationUrgency: Int) : this(Notification.MEDTRONIC_PUMP_ALARM, resourceId, notificationUrgency)
+}
\ No newline at end of file
diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/MedtronicStatusRefreshType.java b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/MedtronicStatusRefreshType.java
deleted file mode 100644
index f84f6d3678..0000000000
--- a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/MedtronicStatusRefreshType.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.medtronic.defs;
-
-/**
- * Created by andy on 6/28/18.
- */
-
-public enum MedtronicStatusRefreshType {
-
-    PumpHistory(5, null), //
-    Configuration(0, null), //
-    RemainingInsulin(-1, MedtronicCommandType.GetRemainingInsulin), //
-    BatteryStatus(55, MedtronicCommandType.GetBatteryStatus), //
-    PumpTime(60, MedtronicCommandType.GetRealTimeClock) //
-    ;
-
-    private final int refreshTime;
-    private final MedtronicCommandType commandType;
-
-
-    MedtronicStatusRefreshType(int refreshTime, MedtronicCommandType commandType) {
-        this.refreshTime = refreshTime;
-        this.commandType = commandType;
-    }
-
-
-    public int getRefreshTime() {
-        return refreshTime;
-    }
-
-
-    public MedtronicCommandType getCommandType(MedtronicDeviceType medtronicDeviceType) {
-        if (this == Configuration) {
-            return MedtronicCommandType.getSettings(medtronicDeviceType);
-        } else
-            return commandType;
-    }
-}
diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/MedtronicStatusRefreshType.kt b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/MedtronicStatusRefreshType.kt
new file mode 100644
index 0000000000..3185212739
--- /dev/null
+++ b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/MedtronicStatusRefreshType.kt
@@ -0,0 +1,23 @@
+package info.nightscout.androidaps.plugins.pump.medtronic.defs
+
+/**
+ * Created by andy on 6/28/18.
+ */
+enum class MedtronicStatusRefreshType(val refreshTime: Int,
+                                      private val commandType: MedtronicCommandType?) {
+
+    PumpHistory(5, null),  //
+    Configuration(0, null),  //
+    RemainingInsulin(-1, MedtronicCommandType.GetRemainingInsulin),  //
+    BatteryStatus(55, MedtronicCommandType.GetBatteryStatus),  //
+    PumpTime(60, MedtronicCommandType.GetRealTimeClock //
+    );
+
+    fun getCommandType(medtronicDeviceType: MedtronicDeviceType): MedtronicCommandType? {
+        return if (this == Configuration) {
+            MedtronicCommandType.getSettings(medtronicDeviceType)
+        } else
+            commandType
+    }
+
+}
\ No newline at end of file
diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/MedtronicUIResponseType.java b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/MedtronicUIResponseType.java
deleted file mode 100644
index 8ab1fc0871..0000000000
--- a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/MedtronicUIResponseType.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.medtronic.defs;
-
-/**
- * Created by andy on 10/18/18.
- */
-
-public enum MedtronicUIResponseType {
-
-    Data,
-    Error,
-    Invalid
-
-}
diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/MedtronicUIResponseType.kt b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/MedtronicUIResponseType.kt
new file mode 100644
index 0000000000..6067085071
--- /dev/null
+++ b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/MedtronicUIResponseType.kt
@@ -0,0 +1,9 @@
+package info.nightscout.androidaps.plugins.pump.medtronic.defs
+
+/**
+ * Created by andy on 10/18/18.
+ */
+enum class MedtronicUIResponseType {
+
+    Data, Error, Invalid
+}
\ No newline at end of file
diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/PumpBolusType.java b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/PumpBolusType.java
deleted file mode 100644
index 820bff8a5b..0000000000
--- a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/PumpBolusType.java
+++ /dev/null
@@ -1,129 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.medtronic.defs;
-
-import java.util.HashMap;
-
-/**
- * Application: GGC - GNU Gluco Control
- * Plug-in: Pump Tool (support for Pump devices)
- * <p>
- * See AUTHORS for copyright information.
- * <p>
- * This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public
- * License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later
- * version.
- * <p>
- * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
- * <p>
- * You should have received a copy of the GNU General Public License along with this program; if not, write to the Free
- * Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- * <p>
- * Filename: PumpBolusType Description: Pump Bolus Types
- * <p>
- * Author: Andy {andy@atech-software.com}
- */
-
-public enum PumpBolusType // implements CodeEnumWithTranslation
-{
-    None(0, "NONE"), //
-    Normal(1, "BOLUS_STANDARD"), //
-    Audio(2, "BOLUS_AUDIO"), //
-    Extended(3, "BOLUS_SQUARE", "AMOUNT_SQUARE=%s;DURATION=%s"), //
-    Multiwave(4, "BOLUS_MULTIWAVE", "AMOUNT=%s;AMOUNT_SQUARE=%s;DURATION=%s");
-
-    static String[] descriptions;
-    // static HashMap<String, CodeEnumWithTranslation> translationMapping = new HashMap<String,
-    // CodeEnumWithTranslation>();
-    static HashMap<Integer, PumpBolusType> codeMapping = new HashMap<Integer, PumpBolusType>();
-    private static boolean translated;
-
-    static {
-        for (PumpBolusType pbt : values()) {
-            codeMapping.put(pbt.code, pbt);
-        }
-    }
-
-    // public static void translateKeywords(I18nControlAbstract ic)
-    // {
-    // if (translated)
-    // return;
-    //
-    // for (PumpBolusType pbt : values())
-    // {
-    // pbt.setTranslation(ic.getMessage(pbt.i18nKey));
-    // translationMapping.put(pbt.getTranslation(), pbt);
-    // }
-    //
-    // String[] bolusDescriptions = { ic.getMessage("SELECT_BOLUS_TYPE"), //
-    // ic.getMessage("BOLUS_STANDARD"), //
-    // ic.getMessage("BOLUS_AUDIO"), //
-    // ic.getMessage("BOLUS_SQUARE"), //
-    // ic.getMessage("BOLUS_MULTIWAVE"), };
-    //
-    // descriptions = bolusDescriptions;
-    //
-    // translated = true;
-    // }
-
-    int code;
-    String i18nKey;
-    String translation;
-    String valueTemplate;
-
-
-    PumpBolusType(int code, String i18nKey) {
-        this.code = code;
-        this.i18nKey = i18nKey;
-    }
-
-
-    PumpBolusType(int code, String i18nKey, String valueTemplate) {
-        this.code = code;
-        this.i18nKey = i18nKey;
-        this.valueTemplate = valueTemplate;
-    }
-
-
-    public static PumpBolusType getByCode(int code) {
-        if (codeMapping.containsKey(code)) {
-            return codeMapping.get(code);
-        } else {
-            return PumpBolusType.None;
-        }
-    }
-
-
-    /**
-     * Get Descriptions (array)
-     *
-     * @return array of strings with description
-     */
-    public static String[] getDescriptions() {
-        return descriptions;
-    }
-
-
-    public String getTranslation() {
-        return translation;
-    }
-
-
-    public void setTranslation(String translation) {
-        this.translation = translation;
-    }
-
-
-    public int getCode() {
-        return code;
-    }
-
-
-    public String getI18nKey() {
-        return i18nKey;
-    }
-
-
-    public String getName() {
-        return this.name();
-    }
-}
diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/PumpBolusType.kt b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/PumpBolusType.kt
new file mode 100644
index 0000000000..02e3bdbd2b
--- /dev/null
+++ b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/PumpBolusType.kt
@@ -0,0 +1,54 @@
+package info.nightscout.androidaps.plugins.pump.medtronic.defs
+
+import java.util.*
+
+/**
+ * This file was taken from GGC - GNU Gluco Control (ggc.sourceforge.net), application for diabetes
+ * management and modified/extended for AAPS.
+ *
+ *
+ * Author: Andy {andy.rozman@gmail.com}
+ */
+enum class PumpBolusType {
+
+    None(0, "NONE"),  //
+    Normal(1, "BOLUS_STANDARD"),  //
+    Audio(2, "BOLUS_AUDIO"),  //
+    Extended(3, "BOLUS_SQUARE", "AMOUNT_SQUARE=%s;DURATION=%s"),  //
+    Multiwave(4, "BOLUS_MULTIWAVE", "AMOUNT=%s;AMOUNT_SQUARE=%s;DURATION=%s");
+
+    companion object {
+        var codeMapping = HashMap<Int, PumpBolusType?>()
+
+        fun getByCode(code: Int): PumpBolusType? {
+            return if (codeMapping.containsKey(code)) {
+                codeMapping[code]
+            } else {
+                None
+            }
+        }
+
+        init {
+            for (pbt in values()) {
+                codeMapping[pbt.code] = pbt
+            }
+        }
+    }
+
+    var code: Int
+    var i18nKey: String
+    var valueTemplate: String? = null
+
+    constructor(code: Int, i18nKey: String) {
+        this.code = code
+        this.i18nKey = i18nKey
+    }
+
+    constructor(code: Int, i18nKey: String, valueTemplate: String?) {
+        this.code = code
+        this.i18nKey = i18nKey
+        this.valueTemplate = valueTemplate
+    }
+
+    //override val name: String
+}
\ No newline at end of file
diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/PumpConfigurationGroup.java b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/PumpConfigurationGroup.java
deleted file mode 100644
index 1c69641c98..0000000000
--- a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/PumpConfigurationGroup.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.medtronic.defs;
-
-/**
- * Created by andy on 27.02.15.
- */
-public enum PumpConfigurationGroup {
-    General(1, "GROUP_GENERAL"), //
-    Device(2, "GROUP_DEVICE"), //
-
-    Insulin(3, "GROUP_INSULIN"), //
-
-    Basal(4, "GROUP_BASAL"), //
-    Bolus(5, "GROUP_BOLUS"), //
-    Sound(6, "GROUP_SOUND"), //
-
-    Other(20, "GROUP_OTHER"), //
-
-    UnknownGroup(21, "GROUP_UNKNOWN"), //
-
-    ; //
-
-    static boolean translated;
-    int code;
-    String i18nKey;
-    String translation;
-
-
-    PumpConfigurationGroup(int code, String i18nKey) {
-        this.code = code;
-        this.i18nKey = i18nKey;
-    }
-
-
-    public String getTranslation() {
-        return translation;
-    }
-
-
-    public void setTranslation(String translation) {
-        this.translation = translation;
-    }
-
-
-    public int getCode() {
-        return code;
-    }
-
-
-    public String getI18nKey() {
-        return i18nKey;
-    }
-
-
-    public String getName() {
-        return this.name();
-    }
-
-}
diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/PumpConfigurationGroup.kt b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/PumpConfigurationGroup.kt
new file mode 100644
index 0000000000..6a1c13a628
--- /dev/null
+++ b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/PumpConfigurationGroup.kt
@@ -0,0 +1,20 @@
+package info.nightscout.androidaps.plugins.pump.medtronic.defs
+
+/**
+ * This file was taken from GGC - GNU Gluco Control (ggc.sourceforge.net), application for diabetes
+ * management and modified/extended for AAPS.
+ *
+ * Author: Andy {andy.rozman@gmail.com}
+ */
+enum class PumpConfigurationGroup(var code: Int) {
+
+    General(1),  //
+    Device(2),  //
+    Insulin(3),  //
+    Basal(4),  //
+    Bolus(5),  //
+    Sound(6),  //
+    Other(20),  //
+    UnknownGroup(21);
+
+}
\ No newline at end of file
diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/di/MedtronicModule.kt b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/di/MedtronicModule.kt
index 0a324648e8..0eebc3bd81 100644
--- a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/di/MedtronicModule.kt
+++ b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/di/MedtronicModule.kt
@@ -1,23 +1,35 @@
 package info.nightscout.androidaps.plugins.pump.medtronic.di
 
 import dagger.Module
+import dagger.Provides
 import dagger.android.ContributesAndroidInjector
+import info.nightscout.androidaps.plugins.pump.common.utils.ByteUtil
 import info.nightscout.androidaps.plugins.pump.medtronic.MedtronicFragment
 import info.nightscout.androidaps.plugins.pump.medtronic.comm.MedtronicCommunicationManager
+import info.nightscout.androidaps.plugins.pump.medtronic.comm.ui.MedtronicUIComm
 import info.nightscout.androidaps.plugins.pump.medtronic.comm.ui.MedtronicUITask
 import info.nightscout.androidaps.plugins.pump.medtronic.dialog.MedtronicHistoryActivity
-import info.nightscout.androidaps.plugins.pump.medtronic.dialog.RileyLinkStatusDeviceMedtronic
 import info.nightscout.androidaps.plugins.pump.medtronic.service.RileyLinkMedtronicService
 
 @Module
 @Suppress("unused")
 abstract class MedtronicModule {
-    @ContributesAndroidInjector abstract fun contributesMedtronicHistoryActivity(): MedtronicHistoryActivity
+
+    @ContributesAndroidInjector
+    abstract fun contributesMedtronicHistoryActivity(): MedtronicHistoryActivity
     @ContributesAndroidInjector abstract fun contributesMedtronicFragment(): MedtronicFragment
 
-    @ContributesAndroidInjector abstract fun contributesRileyLinkMedtronicService(): RileyLinkMedtronicService
+    @ContributesAndroidInjector
+    abstract fun contributesRileyLinkMedtronicService(): RileyLinkMedtronicService
 
-    @ContributesAndroidInjector abstract fun medtronicCommunicationManagerProvider(): MedtronicCommunicationManager
+    @ContributesAndroidInjector
+    abstract fun medtronicCommunicationManagerProvider(): MedtronicCommunicationManager
     @ContributesAndroidInjector abstract fun medtronicUITaskProvider(): MedtronicUITask
-    @ContributesAndroidInjector abstract fun contributesRileyLinkStatusDeviceMedtronic(): RileyLinkStatusDeviceMedtronic
+    @ContributesAndroidInjector abstract fun medtronicUICommProvider(): MedtronicUIComm
+
+    companion object {
+
+        @Provides
+        fun byteUtilProvider(): ByteUtil = ByteUtil()
+    }
 }
\ No newline at end of file
diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/dialog/MedtronicHistoryActivity.java b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/dialog/MedtronicHistoryActivity.java
deleted file mode 100644
index fc986f4f83..0000000000
--- a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/dialog/MedtronicHistoryActivity.java
+++ /dev/null
@@ -1,250 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.medtronic.dialog;
-
-import android.os.Bundle;
-import android.os.SystemClock;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.AdapterView;
-import android.widget.ArrayAdapter;
-import android.widget.Spinner;
-import android.widget.TextView;
-
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.inject.Inject;
-
-import info.nightscout.androidaps.activities.NoSplashAppCompatActivity;
-import info.nightscout.androidaps.plugins.pump.common.defs.PumpHistoryEntryGroup;
-import info.nightscout.androidaps.plugins.pump.medtronic.R;
-import info.nightscout.androidaps.plugins.pump.medtronic.comm.history.pump.PumpHistoryEntry;
-import info.nightscout.androidaps.plugins.pump.medtronic.data.MedtronicHistoryData;
-import info.nightscout.androidaps.utils.resources.ResourceHelper;
-
-
-public class MedtronicHistoryActivity extends NoSplashAppCompatActivity {
-
-    @Inject MedtronicHistoryData medtronicHistoryData;
-    @Inject ResourceHelper resourceHelper;
-
-    Spinner historyTypeSpinner;
-    TextView statusView;
-    RecyclerView recyclerView;
-    LinearLayoutManager llm;
-
-    static TypeList showingType = null;
-    static PumpHistoryEntryGroup selectedGroup = PumpHistoryEntryGroup.All;
-    List<PumpHistoryEntry> filteredHistoryList = new ArrayList<>();
-
-    RecyclerViewAdapter recyclerViewAdapter;
-    boolean manualChange = false;
-
-    List<TypeList> typeListFull;
-
-
-    private void filterHistory(PumpHistoryEntryGroup group) {
-
-        this.filteredHistoryList.clear();
-
-        List<PumpHistoryEntry> list = new ArrayList<>();
-        list.addAll(medtronicHistoryData.getAllHistory());
-
-        //LOG.debug("Items on full list: {}", list.size());
-
-        if (group == PumpHistoryEntryGroup.All) {
-            this.filteredHistoryList.addAll(list);
-        } else {
-            for (PumpHistoryEntry pumpHistoryEntry : list) {
-                if (pumpHistoryEntry.getEntryType().getGroup() == group) {
-                    this.filteredHistoryList.add(pumpHistoryEntry);
-                }
-            }
-        }
-
-        if (this.recyclerViewAdapter != null) {
-            this.recyclerViewAdapter.setHistoryList(this.filteredHistoryList);
-            this.recyclerViewAdapter.notifyDataSetChanged();
-        }
-
-        //LOG.debug("Items on filtered list: {}", filteredHistoryList.size());
-    }
-
-
-    @Override
-    protected void onResume() {
-        super.onResume();
-        filterHistory(selectedGroup);
-        setHistoryTypeSpinner();
-    }
-
-
-    private void setHistoryTypeSpinner() {
-        this.manualChange = true;
-
-        for (int i = 0; i < typeListFull.size(); i++) {
-            if (typeListFull.get(i).entryGroup == selectedGroup) {
-                historyTypeSpinner.setSelection(i);
-                break;
-            }
-        }
-
-        SystemClock.sleep(200);
-        this.manualChange = false;
-    }
-
-
-    @Override
-    protected void onPause() {
-        super.onPause();
-    }
-
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.medtronic_history_activity);
-
-        historyTypeSpinner = findViewById(R.id.medtronic_historytype);
-        statusView = findViewById(R.id.medtronic_historystatus);
-        recyclerView = findViewById(R.id.medtronic_history_recyclerview);
-
-        recyclerView.setHasFixedSize(true);
-        llm = new LinearLayoutManager(this);
-        recyclerView.setLayoutManager(llm);
-
-        recyclerViewAdapter = new RecyclerViewAdapter(filteredHistoryList);
-        recyclerView.setAdapter(recyclerViewAdapter);
-
-        statusView.setVisibility(View.GONE);
-
-        typeListFull = getTypeList(PumpHistoryEntryGroup.getTranslatedList(resourceHelper));
-
-        ArrayAdapter<TypeList> spinnerAdapter = new ArrayAdapter<>(this, R.layout.spinner_centered, typeListFull);
-        historyTypeSpinner.setAdapter(spinnerAdapter);
-
-        historyTypeSpinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
-
-            @Override
-            public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
-                if (manualChange)
-                    return;
-                TypeList selected = (TypeList) historyTypeSpinner.getSelectedItem();
-                showingType = selected;
-                selectedGroup = selected.entryGroup;
-                filterHistory(selectedGroup);
-            }
-
-
-            @Override
-            public void onNothingSelected(AdapterView<?> parent) {
-                if (manualChange)
-                    return;
-                filterHistory(PumpHistoryEntryGroup.All);
-            }
-        });
-
-    }
-
-
-    private List<TypeList> getTypeList(List<PumpHistoryEntryGroup> list) {
-
-        ArrayList<TypeList> typeList = new ArrayList<>();
-
-        for (PumpHistoryEntryGroup pumpHistoryEntryGroup : list) {
-            typeList.add(new TypeList(pumpHistoryEntryGroup));
-        }
-
-        return typeList;
-    }
-
-    public static class TypeList {
-
-        PumpHistoryEntryGroup entryGroup;
-        String name;
-
-
-        TypeList(PumpHistoryEntryGroup entryGroup) {
-            this.entryGroup = entryGroup;
-            this.name = entryGroup.getTranslated();
-        }
-
-
-        @Override
-        public String toString() {
-            return name;
-        }
-    }
-
-    public static class RecyclerViewAdapter extends RecyclerView.Adapter<RecyclerViewAdapter.HistoryViewHolder> {
-
-        List<PumpHistoryEntry> historyList;
-
-
-        RecyclerViewAdapter(List<PumpHistoryEntry> historyList) {
-            this.historyList = historyList;
-        }
-
-
-        public void setHistoryList(List<PumpHistoryEntry> historyList) {
-            // this.historyList.clear();
-            // this.historyList.addAll(historyList);
-
-            this.historyList = historyList;
-
-            // this.notifyDataSetChanged();
-        }
-
-
-        @Override
-        public HistoryViewHolder onCreateViewHolder(ViewGroup viewGroup, int viewType) {
-            View v = LayoutInflater.from(viewGroup.getContext()).inflate(R.layout.medtronic_history_item, //
-                    viewGroup, false);
-            return new HistoryViewHolder(v);
-        }
-
-
-        @Override
-        public void onBindViewHolder(HistoryViewHolder holder, int position) {
-            PumpHistoryEntry record = historyList.get(position);
-
-            if (record != null) {
-                holder.timeView.setText(record.getDateTimeString());
-                holder.typeView.setText(record.getEntryType().getDescription());
-                holder.valueView.setText(record.getDisplayableValue());
-            }
-        }
-
-
-        @Override
-        public int getItemCount() {
-            return historyList.size();
-        }
-
-
-        @Override
-        public void onAttachedToRecyclerView(RecyclerView recyclerView) {
-            super.onAttachedToRecyclerView(recyclerView);
-        }
-
-        static class HistoryViewHolder extends RecyclerView.ViewHolder {
-
-            TextView timeView;
-            TextView typeView;
-            TextView valueView;
-
-
-            HistoryViewHolder(View itemView) {
-                super(itemView);
-                // cv = (CardView)itemView.findViewById(R.id.rileylink_history_item);
-                timeView = itemView.findViewById(R.id.medtronic_history_time);
-                typeView = itemView.findViewById(R.id.medtronic_history_source);
-                valueView = itemView.findViewById(R.id.medtronic_history_description);
-            }
-        }
-    }
-
-}
diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/dialog/MedtronicHistoryActivity.kt b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/dialog/MedtronicHistoryActivity.kt
new file mode 100644
index 0000000000..492b5b9ddb
--- /dev/null
+++ b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/dialog/MedtronicHistoryActivity.kt
@@ -0,0 +1,186 @@
+package info.nightscout.androidaps.plugins.pump.medtronic.dialog
+
+import android.os.Bundle
+import android.os.SystemClock
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.AdapterView
+import android.widget.ArrayAdapter
+import android.widget.Spinner
+import android.widget.TextView
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+import dagger.android.DaggerActivity
+import info.nightscout.androidaps.plugins.pump.common.defs.PumpHistoryEntryGroup
+import info.nightscout.androidaps.plugins.pump.medtronic.R
+import info.nightscout.androidaps.plugins.pump.medtronic.comm.history.pump.PumpHistoryEntry
+import info.nightscout.androidaps.plugins.pump.medtronic.data.MedtronicHistoryData
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import java.util.*
+import javax.inject.Inject
+
+class MedtronicHistoryActivity : DaggerActivity() {
+
+    @Inject lateinit var medtronicHistoryData: MedtronicHistoryData
+    @Inject lateinit var resourceHelper: ResourceHelper
+
+    lateinit var historyTypeSpinner: Spinner
+    lateinit var statusView: TextView
+    lateinit var recyclerView: RecyclerView
+    lateinit var llm: LinearLayoutManager
+    lateinit var recyclerViewAdapter: RecyclerViewAdapter
+
+    var filteredHistoryList: MutableList<PumpHistoryEntry> = ArrayList()
+    var manualChange = false
+    lateinit var typeListFull: List<TypeList>
+
+    //private var _binding: MedtronicHistoryActivityBinding? = null
+
+    //@Inject
+    //var fragmentInjector: DispatchingAndroidInjector<Fragment>? = null
+
+    // This property is only valid between onCreateView and
+    // onDestroyView.
+    //private val binding get() = _binding!!
+
+    private fun filterHistory(group: PumpHistoryEntryGroup) {
+        filteredHistoryList.clear()
+        val list: MutableList<PumpHistoryEntry> = ArrayList()
+        list.addAll(medtronicHistoryData.allHistory)
+
+        //LOG.debug("Items on full list: {}", list.size());
+        if (group === PumpHistoryEntryGroup.All) {
+            filteredHistoryList.addAll(list)
+        } else {
+            for (pumpHistoryEntry in list) {
+                if (pumpHistoryEntry.entryType.group === group) {
+                    filteredHistoryList.add(pumpHistoryEntry)
+                }
+            }
+        }
+
+        recyclerViewAdapter.setHistoryListInternal(filteredHistoryList)
+        recyclerViewAdapter.notifyDataSetChanged()
+
+        //LOG.debug("Items on filtered list: {}", filteredHistoryList.size());
+    }
+
+    override fun onResume() {
+        super.onResume()
+        filterHistory(selectedGroup)
+        setHistoryTypeSpinner()
+    }
+
+    private fun setHistoryTypeSpinner() {
+        manualChange = true
+        for (i in typeListFull.indices) {
+            if (typeListFull[i].entryGroup === selectedGroup) {
+                historyTypeSpinner.setSelection(i)
+                break
+            }
+        }
+        SystemClock.sleep(200)
+        manualChange = false
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.medtronic_history_activity)
+        historyTypeSpinner = findViewById(R.id.medtronic_historytype)
+        statusView = findViewById(R.id.medtronic_historystatus)
+        recyclerView = findViewById(R.id.medtronic_history_recyclerview)
+        recyclerView.setHasFixedSize(true)
+        llm = LinearLayoutManager(this)
+        recyclerView.layoutManager = llm
+        recyclerViewAdapter = RecyclerViewAdapter(filteredHistoryList)
+        recyclerView.adapter = recyclerViewAdapter
+        statusView.visibility = View.GONE
+        typeListFull = getTypeList(PumpHistoryEntryGroup.getTranslatedList(resourceHelper))
+        val spinnerAdapter = ArrayAdapter(this, R.layout.spinner_centered, typeListFull)
+        historyTypeSpinner.adapter = spinnerAdapter
+        historyTypeSpinner.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
+            override fun onItemSelected(parent: AdapterView<*>?, view: View, position: Int, id: Long) {
+                if (manualChange) return
+                val selected = historyTypeSpinner.selectedItem as TypeList
+                showingType = selected
+                selectedGroup = selected.entryGroup
+                filterHistory(selectedGroup)
+            }
+
+            override fun onNothingSelected(parent: AdapterView<*>?) {
+                if (manualChange) return
+                filterHistory(PumpHistoryEntryGroup.All)
+            }
+        }
+    }
+
+    private fun getTypeList(list: List<PumpHistoryEntryGroup>): List<TypeList> {
+        val typeList = ArrayList<TypeList>()
+        for (pumpHistoryEntryGroup in list) {
+            typeList.add(TypeList(pumpHistoryEntryGroup))
+        }
+        return typeList
+    }
+
+    class TypeList internal constructor(var entryGroup: PumpHistoryEntryGroup) {
+
+        var name: String
+        override fun toString(): String {
+            return name
+        }
+
+        init {
+            name = entryGroup.translated!!
+        }
+    }
+
+    class RecyclerViewAdapter internal constructor(var historyList: List<PumpHistoryEntry>) : RecyclerView.Adapter<RecyclerViewAdapter.HistoryViewHolder>() {
+
+        fun setHistoryListInternal(historyList: List<PumpHistoryEntry>) {
+            // this.historyList.clear();
+            // this.historyList.addAll(historyList);
+            this.historyList = historyList
+
+            // this.notifyDataSetChanged();
+        }
+
+        override fun onCreateViewHolder(viewGroup: ViewGroup, viewType: Int): HistoryViewHolder {
+            val v = LayoutInflater.from(viewGroup.context).inflate(R.layout.medtronic_history_item,  //
+                viewGroup, false)
+            return HistoryViewHolder(v)
+        }
+
+        override fun onBindViewHolder(holder: HistoryViewHolder, position: Int) {
+            val record = historyList[position]
+            holder.timeView.text = record.dateTimeString
+            holder.typeView.text = record.entryType.description
+            holder.valueView.text = record.displayableValue
+        }
+
+        override fun getItemCount(): Int {
+            return historyList.size
+        }
+
+        class HistoryViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
+
+            var timeView: TextView
+            var typeView: TextView
+            var valueView: TextView
+
+            init {
+                // cv = (CardView)itemView.findViewById(R.id.rileylink_history_item);
+                timeView = itemView.findViewById(R.id.medtronic_history_time)
+                typeView = itemView.findViewById(R.id.medtronic_history_source)
+                valueView = itemView.findViewById(R.id.medtronic_history_description)
+            }
+        }
+
+    }
+
+    companion object {
+
+        var showingType: TypeList? = null
+        var selectedGroup = PumpHistoryEntryGroup.All
+    }
+}
\ No newline at end of file
diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/dialog/RileyLinkStatusDeviceMedtronic.java b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/dialog/RileyLinkStatusDeviceMedtronic.java
deleted file mode 100644
index e4b6c0e13a..0000000000
--- a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/dialog/RileyLinkStatusDeviceMedtronic.java
+++ /dev/null
@@ -1,166 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.medtronic.dialog;
-
-import android.os.Bundle;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.BaseAdapter;
-import android.widget.ListView;
-import android.widget.TextView;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.inject.Inject;
-
-import dagger.android.support.DaggerFragment;
-import info.nightscout.androidaps.plugins.pump.common.dialog.RefreshableInterface;
-import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.data.RLHistoryItem;
-import info.nightscout.androidaps.plugins.pump.common.utils.StringUtil;
-import info.nightscout.androidaps.plugins.pump.medtronic.R;
-import info.nightscout.androidaps.utils.DateUtil;
-import info.nightscout.androidaps.utils.resources.ResourceHelper;
-
-/**
- * Created by andy on 5/19/18.
- * <p>
- * This is for 3rd tab, called Medtronic (in RileyLink stats), that should work similarly as the one in Loop.
- * <p>
- * Showing currently selected RL, speed of RL, ability to issue simple commands (getModel, tuneUp, gerProfile)
- */
-
-// TODO needs to be implemented
-public class RileyLinkStatusDeviceMedtronic extends DaggerFragment implements RefreshableInterface {
-
-    @Inject ResourceHelper resourceHelper;
-    @Inject DateUtil dateUtil;
-
-    // @BindView(R.id.rileylink_history_list)
-    ListView listView;
-
-    RileyLinkCommandListAdapter adapter;
-
-
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-        View rootView = inflater.inflate(R.layout.rileylink_status_device, container, false);
-
-        adapter = new RileyLinkCommandListAdapter();
-
-        return rootView;
-    }
-
-
-    @Override
-    public void onStart() {
-        super.onStart();
-
-        this.listView = getActivity().findViewById(R.id.rileylink_history_list);
-
-        listView.setAdapter(adapter);
-
-        refreshData();
-    }
-
-
-    @Override
-    public void refreshData() {
-        // adapter.addItemsAndClean(RileyLinkUtil.getRileyLinkHistory());
-    }
-
-    static class ViewHolder {
-
-        TextView itemTime;
-        TextView itemSource;
-        TextView itemDescription;
-    }
-
-    private class RileyLinkCommandListAdapter extends BaseAdapter {
-
-        private final List<RLHistoryItem> historyItemList;
-        private final LayoutInflater mInflator;
-
-
-        public RileyLinkCommandListAdapter() {
-            super();
-            historyItemList = new ArrayList<>();
-            mInflator = RileyLinkStatusDeviceMedtronic.this.getLayoutInflater();
-        }
-
-
-        public void addItem(RLHistoryItem item) {
-            if (!historyItemList.contains(item)) {
-                historyItemList.add(item);
-                notifyDataSetChanged();
-            }
-        }
-
-
-        public RLHistoryItem getHistoryItem(int position) {
-            return historyItemList.get(position);
-        }
-
-
-        public void addItemsAndClean(List<RLHistoryItem> items) {
-            this.historyItemList.clear();
-
-            for (RLHistoryItem item : items) {
-
-                if (!historyItemList.contains(item)) {
-                    historyItemList.add(item);
-                }
-            }
-
-            notifyDataSetChanged();
-        }
-
-
-        public void clear() {
-            historyItemList.clear();
-            notifyDataSetChanged();
-        }
-
-
-        @Override
-        public int getCount() {
-            return historyItemList.size();
-        }
-
-
-        @Override
-        public Object getItem(int i) {
-            return historyItemList.get(i);
-        }
-
-
-        @Override
-        public long getItemId(int i) {
-            return i;
-        }
-
-
-        @Override
-        public View getView(int i, View view, ViewGroup viewGroup) {
-            RileyLinkStatusDeviceMedtronic.ViewHolder viewHolder;
-            // General ListView optimization code.
-            if (view == null) {
-                view = mInflator.inflate(R.layout.rileylink_status_device_item, null);
-                viewHolder = new RileyLinkStatusDeviceMedtronic.ViewHolder();
-                viewHolder.itemTime = view.findViewById(R.id.rileylink_history_time);
-                viewHolder.itemSource = view.findViewById(R.id.rileylink_history_source);
-                viewHolder.itemDescription = view.findViewById(R.id.rileylink_history_description);
-                view.setTag(viewHolder);
-            } else {
-                viewHolder = (RileyLinkStatusDeviceMedtronic.ViewHolder) view.getTag();
-            }
-
-            RLHistoryItem item = historyItemList.get(i);
-            viewHolder.itemTime.setText(StringUtil.toDateTimeString(dateUtil, item.getDateTime()));
-            viewHolder.itemSource.setText("Riley Link"); // for now
-            viewHolder.itemDescription.setText(item.getDescription(resourceHelper));
-
-            return view;
-        }
-    }
-
-}
diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/driver/MedtronicPumpStatus.java b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/driver/MedtronicPumpStatus.java
deleted file mode 100644
index 905a005e29..0000000000
--- a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/driver/MedtronicPumpStatus.java
+++ /dev/null
@@ -1,180 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.medtronic.driver;
-
-import androidx.annotation.NonNull;
-
-import java.util.Calendar;
-import java.util.Date;
-import java.util.GregorianCalendar;
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper;
-import info.nightscout.androidaps.plugins.pump.common.defs.PumpDeviceState;
-import info.nightscout.androidaps.plugins.pump.common.defs.PumpType;
-import info.nightscout.androidaps.plugins.pump.common.events.EventRileyLinkDeviceStatusChange;
-import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkUtil;
-import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.data.RLHistoryItem;
-import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.defs.RileyLinkTargetDevice;
-import info.nightscout.androidaps.plugins.pump.medtronic.defs.BasalProfileStatus;
-import info.nightscout.androidaps.plugins.pump.medtronic.defs.BatteryType;
-import info.nightscout.androidaps.plugins.pump.medtronic.defs.MedtronicDeviceType;
-import info.nightscout.androidaps.plugins.pump.medtronic.util.MedtronicConst;
-import info.nightscout.androidaps.utils.resources.ResourceHelper;
-import info.nightscout.androidaps.utils.sharedPreferences.SP;
-
-
-/**
- * Created by andy on 4/28/18.
- */
-
-@Singleton
-public class MedtronicPumpStatus extends info.nightscout.androidaps.plugins.pump.common.data.PumpStatus {
-
-    private final ResourceHelper resourceHelper;
-    private final SP sp;
-    private final RileyLinkUtil rileyLinkUtil;
-    private final RxBusWrapper rxBus;
-
-    public String errorDescription = null;
-    public String serialNumber;
-    public String pumpFrequency = null;
-    public Double maxBolus;
-    public Double maxBasal;
-
-    // statuses
-    private PumpDeviceState pumpDeviceState = PumpDeviceState.NeverContacted;
-    public MedtronicDeviceType medtronicDeviceType = null;
-    public Date tempBasalStart;
-    public Double tempBasalAmount = 0.0d;
-
-    // fixme
-    public Integer tempBasalLength = 0;
-
-    private Map<String, PumpType> medtronicPumpMap = null;
-    private Map<String, MedtronicDeviceType> medtronicDeviceTypeMap = null;
-    public BasalProfileStatus basalProfileStatus = BasalProfileStatus.NotInitialized;
-    public BatteryType batteryType = BatteryType.None;
-
-
-    @Inject
-    public MedtronicPumpStatus(ResourceHelper resourceHelper,
-                               SP sp,
-                               RxBusWrapper rxBus,
-                               RileyLinkUtil rileyLinkUtil
-    ) {
-        super(PumpType.MEDTRONIC_522_722);
-        this.resourceHelper = resourceHelper;
-        this.sp = sp;
-        this.rxBus = rxBus;
-        this.rileyLinkUtil = rileyLinkUtil;
-        initSettings();
-    }
-
-
-    public void initSettings() {
-
-        this.activeProfileName = "STD";
-        this.reservoirRemainingUnits = 75d;
-        this.batteryRemaining = 75;
-
-        if (this.medtronicPumpMap == null)
-            createMedtronicPumpMap();
-
-        if (this.medtronicDeviceTypeMap == null)
-            createMedtronicDeviceTypeMap();
-
-        this.lastConnection = sp.getLong(MedtronicConst.Statistics.LastGoodPumpCommunicationTime, 0L);
-        this.lastDataTime = this.lastConnection;
-    }
-
-
-    private void createMedtronicDeviceTypeMap() {
-        medtronicDeviceTypeMap = new HashMap<>();
-        medtronicDeviceTypeMap.put("512", MedtronicDeviceType.Medtronic_512);
-        medtronicDeviceTypeMap.put("712", MedtronicDeviceType.Medtronic_712);
-        medtronicDeviceTypeMap.put("515", MedtronicDeviceType.Medtronic_515);
-        medtronicDeviceTypeMap.put("715", MedtronicDeviceType.Medtronic_715);
-
-        medtronicDeviceTypeMap.put("522", MedtronicDeviceType.Medtronic_522);
-        medtronicDeviceTypeMap.put("722", MedtronicDeviceType.Medtronic_722);
-        medtronicDeviceTypeMap.put("523", MedtronicDeviceType.Medtronic_523_Revel);
-        medtronicDeviceTypeMap.put("723", MedtronicDeviceType.Medtronic_723_Revel);
-        medtronicDeviceTypeMap.put("554", MedtronicDeviceType.Medtronic_554_Veo);
-        medtronicDeviceTypeMap.put("754", MedtronicDeviceType.Medtronic_754_Veo);
-    }
-
-
-    private void createMedtronicPumpMap() {
-
-        medtronicPumpMap = new HashMap<>();
-        medtronicPumpMap.put("512", PumpType.MEDTRONIC_512_712);
-        medtronicPumpMap.put("712", PumpType.MEDTRONIC_512_712);
-        medtronicPumpMap.put("515", PumpType.MEDTRONIC_515_715);
-        medtronicPumpMap.put("715", PumpType.MEDTRONIC_515_715);
-
-        medtronicPumpMap.put("522", PumpType.MEDTRONIC_522_722);
-        medtronicPumpMap.put("722", PumpType.MEDTRONIC_522_722);
-        medtronicPumpMap.put("523", PumpType.MEDTRONIC_523_723_REVEL);
-        medtronicPumpMap.put("723", PumpType.MEDTRONIC_523_723_REVEL);
-        medtronicPumpMap.put("554", PumpType.MEDTRONIC_554_754_VEO);
-        medtronicPumpMap.put("754", PumpType.MEDTRONIC_554_754_VEO);
-
-    }
-
-    public Map<String, PumpType> getMedtronicPumpMap() {
-        return medtronicPumpMap;
-    }
-
-    public Map<String, MedtronicDeviceType> getMedtronicDeviceTypeMap() {
-        return medtronicDeviceTypeMap;
-    }
-
-    public double getBasalProfileForHour() {
-        if (basalsByHour != null) {
-            GregorianCalendar c = new GregorianCalendar();
-            int hour = c.get(Calendar.HOUR_OF_DAY);
-
-            return basalsByHour[hour];
-        }
-
-        return 0;
-    }
-
-    // Battery type
-    private Map<String, BatteryType> mapByDescription;
-
-    public BatteryType getBatteryTypeByDescription(String batteryTypeStr) {
-        if (mapByDescription == null) {
-            mapByDescription = new HashMap<>();
-            for (BatteryType value : BatteryType.values()) {
-                mapByDescription.put(resourceHelper.gs(value.description), value);
-            }
-        }
-        if (mapByDescription.containsKey(batteryTypeStr)) {
-            return mapByDescription.get(batteryTypeStr);
-        }
-        return BatteryType.None;
-    }
-
-    @NonNull
-    public String getErrorInfo() {
-        return (errorDescription == null) ? "-" : errorDescription;
-    }
-
-
-    public PumpDeviceState getPumpDeviceState() {
-        return pumpDeviceState;
-    }
-
-
-    public void setPumpDeviceState(PumpDeviceState pumpDeviceState) {
-        this.pumpDeviceState = pumpDeviceState;
-
-        rileyLinkUtil.getRileyLinkHistory().add(new RLHistoryItem(pumpDeviceState, RileyLinkTargetDevice.MedtronicPump));
-
-        rxBus.send(new EventRileyLinkDeviceStatusChange(pumpDeviceState));
-    }
-}
diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/driver/MedtronicPumpStatus.kt b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/driver/MedtronicPumpStatus.kt
new file mode 100644
index 0000000000..109ae89acd
--- /dev/null
+++ b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/driver/MedtronicPumpStatus.kt
@@ -0,0 +1,140 @@
+package info.nightscout.androidaps.plugins.pump.medtronic.driver
+
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.pump.common.defs.PumpDeviceState
+import info.nightscout.androidaps.plugins.pump.common.defs.PumpType
+import info.nightscout.androidaps.plugins.pump.common.events.EventRileyLinkDeviceStatusChange
+import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkUtil
+import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.data.RLHistoryItem
+import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.defs.RileyLinkTargetDevice
+import info.nightscout.androidaps.plugins.pump.medtronic.defs.BasalProfileStatus
+import info.nightscout.androidaps.plugins.pump.medtronic.defs.BatteryType
+import info.nightscout.androidaps.plugins.pump.medtronic.defs.MedtronicDeviceType
+import info.nightscout.androidaps.plugins.pump.medtronic.util.MedtronicConst
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import info.nightscout.androidaps.utils.sharedPreferences.SP
+import java.util.*
+import javax.inject.Inject
+import javax.inject.Singleton
+
+/**
+ * Created by andy on 4/28/18.
+ */
+@Singleton
+class MedtronicPumpStatus @Inject constructor(private val resourceHelper: ResourceHelper,
+                                              private val sp: SP,
+                                              private val rxBus: RxBusWrapper,
+                                              private val rileyLinkUtil: RileyLinkUtil
+) : info.nightscout.androidaps.plugins.pump.common.data.PumpStatus(PumpType.MEDTRONIC_522_722) {
+
+    var errorDescription: String? = null
+    lateinit var serialNumber: String //? = null
+    var pumpFrequency: String? = null
+    var maxBolus: Double? = null
+    var maxBasal: Double? = null
+    var runningTBR: info.nightscout.androidaps.plugins.pump.common.sync.PumpDbEntry? = null
+
+    // statuses
+    var pumpDeviceState = PumpDeviceState.NeverContacted
+        set(pumpDeviceState) {
+            field = pumpDeviceState
+            rileyLinkUtil.rileyLinkHistory.add(RLHistoryItem(pumpDeviceState, RileyLinkTargetDevice.MedtronicPump))
+            rxBus.send(EventRileyLinkDeviceStatusChange(pumpDeviceState))
+        }
+
+    var medtronicDeviceType: MedtronicDeviceType = MedtronicDeviceType.Medtronic_522
+    var medtronicPumpMap: MutableMap<String, PumpType> = mutableMapOf()
+    var medtronicDeviceTypeMap: MutableMap<String, MedtronicDeviceType> = mutableMapOf()
+    var basalProfileStatus = BasalProfileStatus.NotInitialized
+    var batteryType = BatteryType.None
+
+    override fun initSettings() {
+        activeProfileName = "STD"
+        reservoirRemainingUnits = 75.0
+        batteryRemaining = 75
+        if (medtronicPumpMap.isEmpty()) createMedtronicPumpMap()
+        if (medtronicDeviceTypeMap.isEmpty()) createMedtronicDeviceTypeMap()
+        lastConnection = sp.getLong(MedtronicConst.Statistics.LastGoodPumpCommunicationTime, 0L)
+        lastDataTime = lastConnection
+        var serial = sp.getStringOrNull(MedtronicConst.Prefs.PumpSerial, null)
+        if (serial != null) {
+            serialNumber = serial
+        }
+    }
+
+    private fun createMedtronicDeviceTypeMap() {
+        medtronicDeviceTypeMap["512"] = MedtronicDeviceType.Medtronic_512
+        medtronicDeviceTypeMap["712"] = MedtronicDeviceType.Medtronic_712
+        medtronicDeviceTypeMap["515"] = MedtronicDeviceType.Medtronic_515
+        medtronicDeviceTypeMap["715"] = MedtronicDeviceType.Medtronic_715
+        medtronicDeviceTypeMap["522"] = MedtronicDeviceType.Medtronic_522
+        medtronicDeviceTypeMap["722"] = MedtronicDeviceType.Medtronic_722
+        medtronicDeviceTypeMap["523"] = MedtronicDeviceType.Medtronic_523_Revel
+        medtronicDeviceTypeMap["723"] = MedtronicDeviceType.Medtronic_723_Revel
+        medtronicDeviceTypeMap["554"] = MedtronicDeviceType.Medtronic_554_Veo
+        medtronicDeviceTypeMap["754"] = MedtronicDeviceType.Medtronic_754_Veo
+    }
+
+    private fun createMedtronicPumpMap() {
+        medtronicPumpMap = HashMap()
+        medtronicPumpMap["512"] = PumpType.MEDTRONIC_512_712
+        medtronicPumpMap["712"] = PumpType.MEDTRONIC_512_712
+        medtronicPumpMap["515"] = PumpType.MEDTRONIC_515_715
+        medtronicPumpMap["715"] = PumpType.MEDTRONIC_515_715
+        medtronicPumpMap["522"] = PumpType.MEDTRONIC_522_722
+        medtronicPumpMap["722"] = PumpType.MEDTRONIC_522_722
+        medtronicPumpMap["523"] = PumpType.MEDTRONIC_523_723_REVEL
+        medtronicPumpMap["723"] = PumpType.MEDTRONIC_523_723_REVEL
+        medtronicPumpMap["554"] = PumpType.MEDTRONIC_554_754_VEO
+        medtronicPumpMap["754"] = PumpType.MEDTRONIC_554_754_VEO
+    }
+
+    val basalProfileForHour: Double
+        get() {
+            if (basalsByHour != null) {
+                val c = GregorianCalendar()
+                val hour = c[Calendar.HOUR_OF_DAY]
+                return basalsByHour!![hour]
+            }
+            return 0.0
+        }
+
+    // Battery type
+    private var batteryTypeByDescMap: MutableMap<String, BatteryType?> = HashMap()
+
+    fun getBatteryTypeByDescription(batteryTypeStr: String?): BatteryType? {
+        if (batteryTypeByDescMap.size == 0) {
+            for (value in BatteryType.values()) {
+                batteryTypeByDescMap[resourceHelper.gs(value.description)] = value
+            }
+        }
+        return if (batteryTypeByDescMap.containsKey(batteryTypeStr)) {
+            batteryTypeByDescMap[batteryTypeStr]
+        } else BatteryType.None
+    }
+
+    override val errorInfo: String
+        get() = if (errorDescription == null) "-" else errorDescription!!
+
+    val tbrRemainingTime: Int?
+        get() {
+            if (tempBasalStart == null) return null
+            if (tempBasalEnd == null) {
+                val startTime = tempBasalStart!!.time
+                tempBasalEnd = startTime + tempBasalLength!! * 60 * 1000
+            }
+            if (System.currentTimeMillis() > tempBasalEnd!!) {
+                tempBasalStart = null
+                tempBasalEnd = null
+                tempBasalLength = null
+                tempBasalAmount = null
+                return null
+            }
+            val timeMinutes = (tempBasalEnd!! - System.currentTimeMillis()) / (1000 * 60)
+            return timeMinutes.toInt()
+        }
+
+    init {
+        initSettings()
+    }
+}
\ No newline at end of file
diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/service/RileyLinkMedtronicService.java b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/service/RileyLinkMedtronicService.java
deleted file mode 100644
index 2c5274ba0b..0000000000
--- a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/service/RileyLinkMedtronicService.java
+++ /dev/null
@@ -1,388 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.medtronic.service;
-
-import android.content.Intent;
-import android.content.res.Configuration;
-import android.os.Binder;
-import android.os.IBinder;
-
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
-import info.nightscout.androidaps.logging.LTag;
-import info.nightscout.androidaps.plugins.pump.common.defs.PumpDeviceState;
-import info.nightscout.androidaps.plugins.pump.common.defs.PumpType;
-import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkConst;
-import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.RFSpy;
-import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.defs.RileyLinkEncodingType;
-import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.defs.RileyLinkTargetFrequency;
-import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.defs.RileyLinkTargetDevice;
-import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.service.RileyLinkService;
-import info.nightscout.androidaps.plugins.pump.common.utils.ByteUtil;
-import info.nightscout.androidaps.plugins.pump.medtronic.MedtronicPumpPlugin;
-import info.nightscout.androidaps.plugins.pump.medtronic.R;
-import info.nightscout.androidaps.plugins.pump.medtronic.comm.MedtronicCommunicationManager;
-import info.nightscout.androidaps.plugins.pump.medtronic.comm.ui.MedtronicUIComm;
-import info.nightscout.androidaps.plugins.pump.medtronic.comm.ui.MedtronicUIPostprocessor;
-import info.nightscout.androidaps.plugins.pump.medtronic.defs.BatteryType;
-import info.nightscout.androidaps.plugins.pump.medtronic.driver.MedtronicPumpStatus;
-import info.nightscout.androidaps.plugins.pump.medtronic.util.MedtronicConst;
-import info.nightscout.androidaps.plugins.pump.medtronic.util.MedtronicUtil;
-
-/**
- * RileyLinkMedtronicService is intended to stay running when the gui-app is closed.
- */
-@Singleton
-public class RileyLinkMedtronicService extends RileyLinkService {
-
-    @Inject MedtronicPumpPlugin medtronicPumpPlugin;
-    @Inject MedtronicUtil medtronicUtil;
-    @Inject MedtronicUIPostprocessor medtronicUIPostprocessor;
-    @Inject MedtronicPumpStatus medtronicPumpStatus;
-    @Inject RFSpy rfSpy;
-    @Inject MedtronicCommunicationManager medtronicCommunicationManager;
-
-    private MedtronicUIComm medtronicUIComm;
-    private final IBinder mBinder = new LocalBinder();
-
-    private boolean serialChanged = false;
-    private String[] frequencies;
-    private String rileyLinkAddress = null;
-    private boolean rileyLinkAddressChanged = false;
-    private RileyLinkEncodingType encodingType;
-    private boolean encodingChanged = false;
-    private boolean inPreInit = true;
-
-
-    // This empty constructor must be kept, otherwise dagger injection might break!
-    @Inject
-    public RileyLinkMedtronicService() {
-    }
-
-
-    @Override public void onCreate() {
-        super.onCreate();
-        aapsLogger.debug(LTag.PUMPCOMM, "RileyLinkMedtronicService newly created");
-    }
-
-    @Override
-    public void onConfigurationChanged(Configuration newConfig) {
-        aapsLogger.warn(LTag.PUMPCOMM, "onConfigurationChanged");
-        super.onConfigurationChanged(newConfig);
-    }
-
-
-    @Override
-    public IBinder onBind(Intent intent) {
-        return mBinder;
-    }
-
-
-    @Override
-    public RileyLinkEncodingType getEncoding() {
-        return RileyLinkEncodingType.FourByteSixByteLocal;
-    }
-
-
-    /**
-     * If you have customized RileyLinkServiceData you need to override this
-     */
-    public void initRileyLinkServiceData() {
-
-        frequencies = new String[2];
-        frequencies[0] = resourceHelper.gs(R.string.key_medtronic_pump_frequency_us_ca);
-        frequencies[1] = resourceHelper.gs(R.string.key_medtronic_pump_frequency_worldwide);
-
-        rileyLinkServiceData.targetDevice = RileyLinkTargetDevice.MedtronicPump;
-
-        setPumpIDString(sp.getString(MedtronicConst.Prefs.PumpSerial, "000000"));
-
-        // get most recently used RileyLink address and name
-        rileyLinkServiceData.rileyLinkAddress = sp.getString(RileyLinkConst.Prefs.RileyLinkAddress, "");
-        rileyLinkServiceData.rileyLinkName = sp.getString(RileyLinkConst.Prefs.RileyLinkName, "");
-
-        rfspy.startReader();
-
-        medtronicUIComm = new MedtronicUIComm(injector, aapsLogger, medtronicUtil, medtronicUIPostprocessor, medtronicCommunicationManager);
-
-        aapsLogger.debug(LTag.PUMPCOMM, "RileyLinkMedtronicService newly constructed");
-    }
-
-    public MedtronicCommunicationManager getDeviceCommunicationManager() {
-        return this.medtronicCommunicationManager;
-    }
-
-
-    @Override
-    public void setPumpDeviceState(PumpDeviceState pumpDeviceState) {
-        this.medtronicPumpStatus.setPumpDeviceState(pumpDeviceState);
-    }
-
-
-    public MedtronicUIComm getMedtronicUIComm() {
-        return medtronicUIComm;
-    }
-
-    public void setPumpIDString(String pumpID) {
-        if (pumpID.length() != 6) {
-            aapsLogger.error("setPumpIDString: invalid pump id string: " + pumpID);
-            return;
-        }
-
-        byte[] pumpIDBytes = ByteUtil.fromHexString(pumpID);
-
-        if (pumpIDBytes == null) {
-            aapsLogger.error("Invalid pump ID? - PumpID is null.");
-
-            rileyLinkServiceData.setPumpID("000000", new byte[]{0, 0, 0});
-
-        } else if (pumpIDBytes.length != 3) {
-            aapsLogger.error("Invalid pump ID? " + ByteUtil.shortHexString(pumpIDBytes));
-
-            rileyLinkServiceData.setPumpID("000000", new byte[]{0, 0, 0});
-
-        } else if (pumpID.equals("000000")) {
-            aapsLogger.error("Using pump ID " + pumpID);
-
-            rileyLinkServiceData.setPumpID(pumpID, new byte[]{0, 0, 0});
-
-        } else {
-            aapsLogger.info(LTag.PUMPBTCOMM, "Using pump ID " + pumpID);
-
-            String oldId = rileyLinkServiceData.pumpID;
-
-            rileyLinkServiceData.setPumpID(pumpID, pumpIDBytes);
-
-            if (oldId != null && !oldId.equals(pumpID)) {
-                medtronicUtil.setMedtronicPumpModel(null); // if we change pumpId, model probably changed too
-            }
-
-            return;
-        }
-
-        medtronicPumpStatus.setPumpDeviceState(PumpDeviceState.InvalidConfiguration);
-
-        // LOG.info("setPumpIDString: saved pumpID " + idString);
-    }
-
-    public class LocalBinder extends Binder {
-
-        public RileyLinkMedtronicService getServiceInstance() {
-            return RileyLinkMedtronicService.this;
-        }
-    }
-
-
-    /* private functions */
-
-    // PumpInterface - REMOVE
-
-    public boolean isInitialized() {
-        return rileyLinkServiceData.rileyLinkServiceState.isReady();
-    }
-
-
-    public boolean verifyConfiguration(boolean forceRileyLinkAddressRenewal) {
-        try {
-            String regexSN = "[0-9]{6}";
-            String regexMac = "([\\da-fA-F]{1,2}(?::|$)){6}";
-
-            medtronicPumpStatus.errorDescription = "-";
-
-            String serialNr = sp.getStringOrNull(MedtronicConst.Prefs.PumpSerial, null);
-
-            if (serialNr == null) {
-                medtronicPumpStatus.errorDescription = resourceHelper.gs(R.string.medtronic_error_serial_not_set);
-                return false;
-            } else {
-                if (!serialNr.matches(regexSN)) {
-                    medtronicPumpStatus.errorDescription = resourceHelper.gs(R.string.medtronic_error_serial_invalid);
-                    return false;
-                } else {
-                    if (!serialNr.equals(medtronicPumpStatus.serialNumber)) {
-                        medtronicPumpStatus.serialNumber = serialNr;
-                        serialChanged = true;
-                    }
-                }
-            }
-
-            String pumpTypePref = sp.getStringOrNull(MedtronicConst.Prefs.PumpType, null);
-
-            if (pumpTypePref == null) {
-                medtronicPumpStatus.errorDescription = resourceHelper.gs(R.string.medtronic_error_pump_type_not_set);
-                return false;
-            } else {
-                String pumpTypePart = pumpTypePref.substring(0, 3);
-
-                if (!pumpTypePart.matches("[0-9]{3}")) {
-                    medtronicPumpStatus.errorDescription = resourceHelper.gs(R.string.medtronic_error_pump_type_invalid);
-                    return false;
-                } else {
-                    PumpType pumpType = medtronicPumpStatus.getMedtronicPumpMap().get(pumpTypePart);
-                    medtronicPumpStatus.medtronicDeviceType = medtronicPumpStatus.getMedtronicDeviceTypeMap().get(pumpTypePart);
-                    medtronicPumpPlugin.setPumpType(pumpType);
-
-                    if (pumpTypePart.startsWith("7"))
-                        medtronicPumpStatus.reservoirFullUnits = 300;
-                    else
-                        medtronicPumpStatus.reservoirFullUnits = 176;
-                }
-            }
-
-            String pumpFrequency = sp.getStringOrNull(MedtronicConst.Prefs.PumpFrequency, null);
-
-            if (pumpFrequency == null) {
-                medtronicPumpStatus.errorDescription = resourceHelper.gs(R.string.medtronic_error_pump_frequency_not_set);
-                return false;
-            } else {
-                if (!pumpFrequency.equals(frequencies[0]) && !pumpFrequency.equals(frequencies[1])) {
-                    medtronicPumpStatus.errorDescription = resourceHelper.gs(R.string.medtronic_error_pump_frequency_invalid);
-                    return false;
-                } else {
-                    medtronicPumpStatus.pumpFrequency = pumpFrequency;
-                    boolean isFrequencyUS = pumpFrequency.equals(frequencies[0]);
-
-                    RileyLinkTargetFrequency newTargetFrequency = isFrequencyUS ? //
-                            RileyLinkTargetFrequency.Medtronic_US
-                            : RileyLinkTargetFrequency.Medtronic_WorldWide;
-
-                    if (rileyLinkServiceData.rileyLinkTargetFrequency != newTargetFrequency) {
-                        rileyLinkServiceData.rileyLinkTargetFrequency = newTargetFrequency;
-                    }
-
-                }
-            }
-
-            String rileyLinkAddress = sp.getStringOrNull(RileyLinkConst.Prefs.RileyLinkAddress, null);
-
-            if (rileyLinkAddress == null) {
-                aapsLogger.debug(LTag.PUMP, "RileyLink address invalid: null");
-                medtronicPumpStatus.errorDescription = resourceHelper.gs(R.string.medtronic_error_rileylink_address_invalid);
-                return false;
-            } else {
-                if (!rileyLinkAddress.matches(regexMac)) {
-                    medtronicPumpStatus.errorDescription = resourceHelper.gs(R.string.medtronic_error_rileylink_address_invalid);
-                    aapsLogger.debug(LTag.PUMP, "RileyLink address invalid: %s", rileyLinkAddress);
-                } else {
-                    if (!rileyLinkAddress.equals(this.rileyLinkAddress)) {
-                        this.rileyLinkAddress = rileyLinkAddress;
-                        rileyLinkAddressChanged = true;
-                    }
-                }
-            }
-
-            double maxBolusLcl = checkParameterValue(MedtronicConst.Prefs.MaxBolus, "25.0", 25.0d);
-
-            if (medtronicPumpStatus.maxBolus == null || !medtronicPumpStatus.maxBolus.equals(maxBolusLcl)) {
-                medtronicPumpStatus.maxBolus = maxBolusLcl;
-
-                //LOG.debug("Max Bolus from AAPS settings is " + maxBolus);
-            }
-
-            double maxBasalLcl = checkParameterValue(MedtronicConst.Prefs.MaxBasal, "35.0", 35.0d);
-
-            if (medtronicPumpStatus.maxBasal == null || !medtronicPumpStatus.maxBasal.equals(maxBasalLcl)) {
-                medtronicPumpStatus.maxBasal = maxBasalLcl;
-
-                //LOG.debug("Max Basal from AAPS settings is " + maxBasal);
-            }
-
-
-            String encodingTypeStr = sp.getStringOrNull(MedtronicConst.Prefs.Encoding, null);
-
-            if (encodingTypeStr == null) {
-                return false;
-            }
-
-            RileyLinkEncodingType newEncodingType = RileyLinkEncodingType.getByDescription(encodingTypeStr, resourceHelper);
-
-            if (encodingType == null) {
-                encodingType = newEncodingType;
-            } else if (encodingType != newEncodingType) {
-                encodingType = newEncodingType;
-                encodingChanged = true;
-            }
-
-            String batteryTypeStr = sp.getStringOrNull(MedtronicConst.Prefs.BatteryType, null);
-
-            if (batteryTypeStr == null)
-                return false;
-
-            BatteryType batteryType = medtronicPumpStatus.getBatteryTypeByDescription(batteryTypeStr);
-
-            if (medtronicPumpStatus.batteryType != batteryType) {
-                medtronicPumpStatus.batteryType = batteryType;
-            }
-
-            //String bolusDebugEnabled = sp.getStringOrNull(MedtronicConst.Prefs.BolusDebugEnabled, null);
-            //boolean bolusDebug = bolusDebugEnabled != null && bolusDebugEnabled.equals(resourceHelper.gs(R.string.common_on));
-            //MedtronicHistoryData.doubleBolusDebug = bolusDebug;
-
-            rileyLinkServiceData.showBatteryLevel = sp.getBoolean(RileyLinkConst.Prefs.ShowBatteryLevel, false);
-
-            reconfigureService(forceRileyLinkAddressRenewal);
-
-            return true;
-
-        } catch (Exception ex) {
-            medtronicPumpStatus.errorDescription = ex.getMessage();
-            aapsLogger.error(LTag.PUMP, "Error on Verification: " + ex.getMessage(), ex);
-            return false;
-        }
-    }
-
-    private boolean reconfigureService(boolean forceRileyLinkAddressRenewal) {
-
-        if (!inPreInit) {
-
-            if (serialChanged) {
-                setPumpIDString(medtronicPumpStatus.serialNumber); // short operation
-                serialChanged = false;
-            }
-
-            if (rileyLinkAddressChanged || forceRileyLinkAddressRenewal) {
-                rileyLinkUtil.sendBroadcastMessage(RileyLinkConst.Intents.RileyLinkNewAddressSet, this);
-                rileyLinkAddressChanged = false;
-            }
-
-            if (encodingChanged) {
-                changeRileyLinkEncoding(encodingType);
-                encodingChanged = false;
-            }
-        }
-
-
-        // if (targetFrequencyChanged && !inPreInit && MedtronicUtil.getMedtronicService() != null) {
-        // RileyLinkUtil.setRileyLinkTargetFrequency(targetFrequency);
-        // // RileyLinkUtil.getRileyLinkCommunicationManager().refreshRileyLinkTargetFrequency();
-        // targetFrequencyChanged = false;
-        // }
-
-        return (!rileyLinkAddressChanged && !serialChanged && !encodingChanged); // && !targetFrequencyChanged);
-    }
-
-    private double checkParameterValue(int key, String defaultValue, double defaultValueDouble) {
-        double val;
-
-        String value = sp.getString(key, defaultValue);
-
-        try {
-            val = Double.parseDouble(value);
-        } catch (Exception ex) {
-            aapsLogger.error("Error parsing setting: %s, value found %s", key, value);
-            val = defaultValueDouble;
-        }
-
-        if (val > defaultValueDouble) {
-            sp.putString(key, defaultValue);
-            val = defaultValueDouble;
-        }
-
-        return val;
-    }
-
-    public boolean setNotInPreInit() {
-        this.inPreInit = false;
-
-        return reconfigureService(false);
-    }
-}
diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/service/RileyLinkMedtronicService.kt b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/service/RileyLinkMedtronicService.kt
new file mode 100644
index 0000000000..30d7f123df
--- /dev/null
+++ b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/service/RileyLinkMedtronicService.kt
@@ -0,0 +1,290 @@
+package info.nightscout.androidaps.plugins.pump.medtronic.service
+
+import android.content.Intent
+import android.content.res.Configuration
+import android.os.Binder
+import android.os.IBinder
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.pump.common.defs.PumpDeviceState
+import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkConst
+import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.RFSpy
+import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.defs.RileyLinkEncodingType
+import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.defs.RileyLinkTargetFrequency
+import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.defs.RileyLinkTargetDevice
+import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.service.RileyLinkService
+import info.nightscout.androidaps.plugins.pump.common.utils.ByteUtil
+import info.nightscout.androidaps.plugins.pump.medtronic.MedtronicPumpPlugin
+import info.nightscout.androidaps.plugins.pump.medtronic.R
+import info.nightscout.androidaps.plugins.pump.medtronic.comm.MedtronicCommunicationManager
+import info.nightscout.androidaps.plugins.pump.medtronic.comm.ui.MedtronicUIComm
+import info.nightscout.androidaps.plugins.pump.medtronic.defs.MedtronicDeviceType
+import info.nightscout.androidaps.plugins.pump.medtronic.driver.MedtronicPumpStatus
+import info.nightscout.androidaps.plugins.pump.medtronic.util.MedtronicConst
+import info.nightscout.androidaps.plugins.pump.medtronic.util.MedtronicUtil
+import javax.inject.Inject
+import javax.inject.Singleton
+
+/**
+ * RileyLinkMedtronicService is intended to stay running when the gui-app is closed.
+ */
+@Singleton
+class RileyLinkMedtronicService  // This empty constructor must be kept, otherwise dagger injection might break!
+@Inject constructor() : RileyLinkService() {
+
+    @Inject lateinit var medtronicPumpPlugin: MedtronicPumpPlugin
+    @Inject lateinit var medtronicUtil: MedtronicUtil
+    @Inject lateinit var medtronicPumpStatus: MedtronicPumpStatus
+    @Inject lateinit var rfSpy: RFSpy
+    @Inject lateinit var medtronicCommunicationManager: MedtronicCommunicationManager
+    @Inject lateinit var medtronicUIComm: MedtronicUIComm
+
+    private val mBinder: IBinder = LocalBinder()
+    private var serialChanged = false
+    lateinit var frequencies: Array<String>
+    private var rileyLinkAddress: String? = null
+    private var rileyLinkAddressChanged = false
+    private var encodingType: RileyLinkEncodingType? = null
+    private var encodingChanged = false
+    private var inPreInit = true
+
+    override fun onCreate() {
+        super.onCreate()
+        aapsLogger.debug(LTag.PUMPCOMM, "RileyLinkMedtronicService newly created")
+    }
+
+    override fun onConfigurationChanged(newConfig: Configuration) {
+        aapsLogger.warn(LTag.PUMPCOMM, "onConfigurationChanged")
+        super.onConfigurationChanged(newConfig)
+    }
+
+    override fun onBind(intent: Intent): IBinder {
+        return mBinder
+    }
+
+    override fun getEncoding(): RileyLinkEncodingType {
+        return RileyLinkEncodingType.FourByteSixByteLocal
+    }
+
+    /**
+     * If you have customized RileyLinkServiceData you need to override this
+     */
+    override fun initRileyLinkServiceData() {
+        frequencies = arrayOf(resourceHelper.gs(R.string.key_medtronic_pump_frequency_us_ca),
+            resourceHelper.gs(R.string.key_medtronic_pump_frequency_worldwide))
+        // frequencies[0] = resourceHelper.gs(R.string.key_medtronic_pump_frequency_us_ca)
+        // frequencies[1] = resourceHelper.gs(R.string.key_medtronic_pump_frequency_worldwide)
+        rileyLinkServiceData.targetDevice = RileyLinkTargetDevice.MedtronicPump
+        setPumpIDString(sp.getString(MedtronicConst.Prefs.PumpSerial, "000000"))
+
+        // get most recently used RileyLink address and name
+        rileyLinkServiceData.rileyLinkAddress = sp.getString(RileyLinkConst.Prefs.RileyLinkAddress, "")
+        rileyLinkServiceData.rileyLinkName = sp.getString(RileyLinkConst.Prefs.RileyLinkName, "")
+        rfspy.startReader()
+        aapsLogger.debug(LTag.PUMPCOMM, "RileyLinkMedtronicService newly constructed")
+    }
+
+    override fun getDeviceCommunicationManager(): MedtronicCommunicationManager {
+        return medtronicCommunicationManager
+    }
+
+    override fun setPumpDeviceState(pumpDeviceState: PumpDeviceState) {
+        medtronicPumpStatus.pumpDeviceState = pumpDeviceState
+    }
+
+    fun setPumpIDString(pumpID: String) {
+        if (pumpID.length != 6) {
+            aapsLogger.error("setPumpIDString: invalid pump id string: $pumpID")
+            return
+        }
+        val pumpIDBytes = ByteUtil.fromHexString(pumpID)
+        if (pumpIDBytes == null) {
+            aapsLogger.error("Invalid pump ID? - PumpID is null.")
+            rileyLinkServiceData.setPumpID("000000", byteArrayOf(0, 0, 0))
+        } else if (pumpIDBytes.size != 3) {
+            aapsLogger.error("Invalid pump ID? " + ByteUtil.shortHexString(pumpIDBytes))
+            rileyLinkServiceData.setPumpID("000000", byteArrayOf(0, 0, 0))
+        } else if (pumpID == "000000") {
+            aapsLogger.error("Using pump ID $pumpID")
+            rileyLinkServiceData.setPumpID(pumpID, byteArrayOf(0, 0, 0))
+        } else {
+            aapsLogger.info(LTag.PUMPBTCOMM, "Using pump ID $pumpID")
+            val oldId = rileyLinkServiceData.pumpID
+            rileyLinkServiceData.setPumpID(pumpID, pumpIDBytes)
+            if (oldId != null && oldId != pumpID) {
+                medtronicUtil.medtronicPumpModel = MedtronicDeviceType.Medtronic_522 // if we change pumpId, model probably changed too
+                medtronicUtil.isModelSet = false
+            }
+            return
+        }
+        medtronicPumpStatus.pumpDeviceState = PumpDeviceState.InvalidConfiguration
+
+        // LOG.info("setPumpIDString: saved pumpID " + idString);
+    }
+
+    inner class LocalBinder : Binder() {
+
+        val serviceInstance: RileyLinkMedtronicService
+            get() = this@RileyLinkMedtronicService
+    }
+
+    /* private functions */ // PumpInterface - REMOVE
+    val isInitialized: Boolean
+        get() = rileyLinkServiceData.rileyLinkServiceState.isReady
+
+    override fun verifyConfiguration(forceRileyLinkAddressRenewal: Boolean): Boolean {
+        return try {
+            val regexSN = "[0-9]{6}"
+            val regexMac = "([\\da-fA-F]{1,2}(?::|$)){6}"
+            medtronicPumpStatus.errorDescription = "-"
+            val serialNr = sp.getStringOrNull(MedtronicConst.Prefs.PumpSerial, null)
+            if (serialNr == null) {
+                medtronicPumpStatus.errorDescription = resourceHelper.gs(R.string.medtronic_error_serial_not_set)
+                return false
+            } else {
+                if (!serialNr.matches(regexSN.toRegex())) {
+                    medtronicPumpStatus.errorDescription = resourceHelper.gs(R.string.medtronic_error_serial_invalid)
+                    return false
+                } else {
+                    if (serialNr != medtronicPumpStatus.serialNumber) {
+                        medtronicPumpStatus.serialNumber = serialNr
+                        serialChanged = true
+                    }
+                }
+            }
+            val pumpTypePref = sp.getStringOrNull(MedtronicConst.Prefs.PumpType, null)
+            if (pumpTypePref == null) {
+                medtronicPumpStatus.errorDescription = resourceHelper.gs(R.string.medtronic_error_pump_type_not_set)
+                return false
+            } else {
+                val pumpTypePart = pumpTypePref.substring(0, 3)
+                if (!pumpTypePart.matches("[0-9]{3}".toRegex())) {
+                    medtronicPumpStatus.errorDescription = resourceHelper.gs(R.string.medtronic_error_pump_type_invalid)
+                    return false
+                } else {
+                    val pumpType = medtronicPumpStatus.medtronicPumpMap[pumpTypePart]!!
+                    medtronicPumpStatus.medtronicDeviceType = medtronicPumpStatus.medtronicDeviceTypeMap[pumpTypePart]!!
+                    medtronicPumpStatus.pumpType = pumpType
+                    medtronicPumpPlugin.pumpType = pumpType
+                    if (pumpTypePart.startsWith("7")) medtronicPumpStatus.reservoirFullUnits = 300 else medtronicPumpStatus.reservoirFullUnits = 176
+                }
+            }
+            val pumpFrequency = sp.getStringOrNull(MedtronicConst.Prefs.PumpFrequency, null)
+            if (pumpFrequency == null) {
+                medtronicPumpStatus.errorDescription = resourceHelper.gs(R.string.medtronic_error_pump_frequency_not_set)
+                return false
+            } else {
+                if (pumpFrequency != frequencies[0] && pumpFrequency != frequencies[1]) {
+                    medtronicPumpStatus.errorDescription = resourceHelper.gs(R.string.medtronic_error_pump_frequency_invalid)
+                    return false
+                } else {
+                    medtronicPumpStatus.pumpFrequency = pumpFrequency
+                    val isFrequencyUS = pumpFrequency == frequencies[0]
+                    val newTargetFrequency = if (isFrequencyUS) //
+                        RileyLinkTargetFrequency.Medtronic_US else RileyLinkTargetFrequency.Medtronic_WorldWide
+                    if (rileyLinkServiceData.rileyLinkTargetFrequency != newTargetFrequency) {
+                        rileyLinkServiceData.rileyLinkTargetFrequency = newTargetFrequency
+                    }
+                }
+            }
+            val rileyLinkAddress = sp.getStringOrNull(RileyLinkConst.Prefs.RileyLinkAddress, null)
+            if (rileyLinkAddress == null) {
+                aapsLogger.debug(LTag.PUMP, "RileyLink address invalid: null")
+                medtronicPumpStatus.errorDescription = resourceHelper.gs(R.string.medtronic_error_rileylink_address_invalid)
+                return false
+            } else {
+                if (!rileyLinkAddress.matches(regexMac.toRegex())) {
+                    medtronicPumpStatus.errorDescription = resourceHelper.gs(R.string.medtronic_error_rileylink_address_invalid)
+                    aapsLogger.debug(LTag.PUMP, "RileyLink address invalid: %s", rileyLinkAddress)
+                } else {
+                    if (rileyLinkAddress != this.rileyLinkAddress) {
+                        this.rileyLinkAddress = rileyLinkAddress
+                        rileyLinkAddressChanged = true
+                    }
+                }
+            }
+            val maxBolusLcl = checkParameterValue(MedtronicConst.Prefs.MaxBolus, "25.0", 25.0)
+            if (medtronicPumpStatus.maxBolus == null || medtronicPumpStatus.maxBolus != maxBolusLcl) {
+                medtronicPumpStatus.maxBolus = maxBolusLcl
+
+                //LOG.debug("Max Bolus from AAPS settings is " + maxBolus);
+            }
+            val maxBasalLcl = checkParameterValue(MedtronicConst.Prefs.MaxBasal, "35.0", 35.0)
+            if (medtronicPumpStatus.maxBasal == null || medtronicPumpStatus.maxBasal != maxBasalLcl) {
+                medtronicPumpStatus.maxBasal = maxBasalLcl
+
+                //LOG.debug("Max Basal from AAPS settings is " + maxBasal);
+            }
+            val encodingTypeStr = sp.getStringOrNull(MedtronicConst.Prefs.Encoding, null)
+                ?: return false
+            val newEncodingType = RileyLinkEncodingType.getByDescription(encodingTypeStr, resourceHelper)
+            if (encodingType == null) {
+                encodingType = newEncodingType
+            } else if (encodingType != newEncodingType) {
+                encodingType = newEncodingType
+                encodingChanged = true
+            }
+            val batteryTypeStr = sp.getStringOrNull(MedtronicConst.Prefs.BatteryType, null)
+                ?: return false
+            val batteryType = medtronicPumpStatus.getBatteryTypeByDescription(batteryTypeStr)
+            if (medtronicPumpStatus.batteryType !== batteryType) {
+                medtronicPumpStatus.batteryType = batteryType!!
+            }
+
+            //String bolusDebugEnabled = sp.getStringOrNull(MedtronicConst.Prefs.BolusDebugEnabled, null);
+            //boolean bolusDebug = bolusDebugEnabled != null && bolusDebugEnabled.equals(resourceHelper.gs(R.string.common_on));
+            //MedtronicHistoryData.doubleBolusDebug = bolusDebug;
+            rileyLinkServiceData.showBatteryLevel = sp.getBoolean(RileyLinkConst.Prefs.ShowBatteryLevel, false)
+            reconfigureService(forceRileyLinkAddressRenewal)
+            true
+        } catch (ex: Exception) {
+            medtronicPumpStatus.errorDescription = ex.message
+            aapsLogger.error(LTag.PUMP, "Error on Verification: " + ex.message, ex)
+            false
+        }
+    }
+
+    private fun reconfigureService(forceRileyLinkAddressRenewal: Boolean): Boolean {
+        if (!inPreInit) {
+            if (serialChanged) {
+                setPumpIDString(medtronicPumpStatus.serialNumber) // short operation
+                serialChanged = false
+            }
+            if (rileyLinkAddressChanged || forceRileyLinkAddressRenewal) {
+                rileyLinkUtil.sendBroadcastMessage(RileyLinkConst.Intents.RileyLinkNewAddressSet, this)
+                rileyLinkAddressChanged = false
+            }
+            if (encodingChanged) {
+                changeRileyLinkEncoding(encodingType)
+                encodingChanged = false
+            }
+        }
+
+        // if (targetFrequencyChanged && !inPreInit && MedtronicUtil.getMedtronicService() != null) {
+        // RileyLinkUtil.setRileyLinkTargetFrequency(targetFrequency);
+        // // RileyLinkUtil.getRileyLinkCommunicationManager().refreshRileyLinkTargetFrequency();
+        // targetFrequencyChanged = false;
+        // }
+        return !rileyLinkAddressChanged && !serialChanged && !encodingChanged // && !targetFrequencyChanged);
+    }
+
+    private fun checkParameterValue(key: Int, defaultValue: String, defaultValueDouble: Double): Double {
+        var valueDouble: Double
+        val value = sp.getString(key, defaultValue)
+        valueDouble = try {
+            value.toDouble()
+        } catch (ex: Exception) {
+            aapsLogger.error("Error parsing setting: %s, value found %s", key, value)
+            defaultValueDouble
+        }
+        if (valueDouble > defaultValueDouble) {
+            sp.putString(key, defaultValue)
+            valueDouble = defaultValueDouble
+        }
+        return valueDouble
+    }
+
+    fun setNotInPreInit(): Boolean {
+        inPreInit = false
+        return reconfigureService(false)
+    }
+}
\ No newline at end of file
diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/util/MedtronicConst.java b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/util/MedtronicConst.java
deleted file mode 100644
index 8a05ad6d35..0000000000
--- a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/util/MedtronicConst.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.medtronic.util;
-
-import info.nightscout.androidaps.plugins.pump.medtronic.R;
-
-/**
- * Created by andy on 5/12/18.
- */
-
-public class MedtronicConst {
-
-    static final String Prefix = "AAPS.Medtronic.";
-
-    public static class Prefs {
-        public static final int PumpSerial = R.string.key_medtronic_serial;
-        public static final int PumpType = R.string.key_medtronic_pump_type;
-        public static final int PumpFrequency = R.string.key_medtronic_frequency;
-        public static final int MaxBolus = R.string.key_medtronic_max_bolus;
-        public static final int MaxBasal = R.string.key_medtronic_max_basal;
-        public static final int BolusDelay = R.string.key_medtronic_bolus_delay;
-        public static final int Encoding = R.string.key_medtronic_encoding;
-        public static final int BatteryType = R.string.key_medtronic_battery_type;
-        public static final int BolusDebugEnabled = R.string.key_medtronic_bolus_debug;
-    }
-
-    public static class Statistics {
-
-        public static final String StatsPrefix = "medtronic_";
-        public static final String FirstPumpStart = Prefix + "first_pump_use";
-        public static final String LastGoodPumpCommunicationTime = Prefix + "lastGoodPumpCommunicationTime";
-        public static final String LastGoodPumpFrequency = Prefix + "LastGoodPumpFrequency";
-        public static final String TBRsSet = StatsPrefix + "tbrs_set";
-        public static final String StandardBoluses = StatsPrefix + "std_boluses_delivered";
-        public static final String SMBBoluses = StatsPrefix + "smb_boluses_delivered";
-        public static final String LastPumpHistoryEntry = StatsPrefix + "pump_history_entry";
-        public static final String LastPrime = StatsPrefix + "last_sent_prime";
-        public static final String LastRewind = StatsPrefix + "last_sent_rewind";
-    }
-
-}
diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/util/MedtronicConst.kt b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/util/MedtronicConst.kt
new file mode 100644
index 0000000000..e88d3de97f
--- /dev/null
+++ b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/util/MedtronicConst.kt
@@ -0,0 +1,37 @@
+package info.nightscout.androidaps.plugins.pump.medtronic.util
+
+import info.nightscout.androidaps.plugins.pump.medtronic.R
+
+/**
+ * Created by andy on 5/12/18.
+ */
+object MedtronicConst {
+
+    const val Prefix = "AAPS.Medtronic."
+
+    object Prefs {
+        val PumpSerial = R.string.key_medtronic_serial
+        val PumpType = R.string.key_medtronic_pump_type
+        val PumpFrequency = R.string.key_medtronic_frequency
+        val MaxBolus = R.string.key_medtronic_max_bolus
+        val MaxBasal = R.string.key_medtronic_max_basal
+        val BolusDelay = R.string.key_medtronic_bolus_delay
+        val Encoding = R.string.key_medtronic_encoding
+        val BatteryType = R.string.key_medtronic_battery_type
+        val BolusDebugEnabled = R.string.key_medtronic_bolus_debug
+    }
+
+    object Statistics {
+        const val StatsPrefix = "medtronic_"
+        const val FirstPumpStart = Prefix + "first_pump_use"
+        const val LastGoodPumpCommunicationTime = Prefix + "lastGoodPumpCommunicationTime"
+        const val LastGoodPumpFrequency = Prefix + "LastGoodPumpFrequency"
+        const val TBRsSet = StatsPrefix + "tbrs_set"
+        const val StandardBoluses = StatsPrefix + "std_boluses_delivered"
+        const val SMBBoluses = StatsPrefix + "smb_boluses_delivered"
+        const val LastPumpHistoryEntry = StatsPrefix + "pump_history_entry"
+        const val LastPrime = StatsPrefix + "last_sent_prime"
+        const val LastRewind = StatsPrefix + "last_sent_rewind"
+        const val InternalTemporaryDatabase = StatsPrefix + "temporary_entries"
+    }
+}
\ No newline at end of file
diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/util/MedtronicUtil.java b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/util/MedtronicUtil.java
deleted file mode 100644
index 680896751c..0000000000
--- a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/util/MedtronicUtil.java
+++ /dev/null
@@ -1,456 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.medtronic.util;
-
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
-
-import org.joda.time.LocalTime;
-
-import java.nio.ByteBuffer;
-import java.nio.ByteOrder;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
-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.events.EventNewNotification;
-import info.nightscout.androidaps.plugins.general.overview.notifications.Notification;
-import info.nightscout.androidaps.plugins.pump.common.events.EventRileyLinkDeviceStatusChange;
-import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkUtil;
-import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.service.RileyLinkServiceData;
-import info.nightscout.androidaps.plugins.pump.common.utils.ByteUtil;
-import info.nightscout.androidaps.plugins.pump.medtronic.data.dto.ClockDTO;
-import info.nightscout.androidaps.plugins.pump.medtronic.data.dto.PumpSettingDTO;
-import info.nightscout.androidaps.plugins.pump.medtronic.data.dto.RLHistoryItemMedtronic;
-import info.nightscout.androidaps.plugins.pump.medtronic.defs.MedtronicCommandType;
-import info.nightscout.androidaps.plugins.pump.medtronic.defs.MedtronicDeviceType;
-import info.nightscout.androidaps.plugins.pump.medtronic.defs.MedtronicNotificationType;
-import info.nightscout.androidaps.plugins.pump.medtronic.driver.MedtronicPumpStatus;
-import info.nightscout.androidaps.utils.resources.ResourceHelper;
-
-/**
- * Created by andy on 5/9/18.
- */
-
-@Singleton
-public class MedtronicUtil {
-
-    private final int ENVELOPE_SIZE = 4; // 0xA7 S1 S2 S3 CMD PARAM_COUNT [PARAMS]
-    private static final boolean lowLevelDebug = true;
-    //private MedtronicDeviceType medtronicPumpModel;
-    private MedtronicCommandType currentCommand;
-    private Map<String, PumpSettingDTO> settings;
-    private final int BIG_FRAME_LENGTH = 65;
-    private final int doneBit = 1 << 7;
-    private ClockDTO pumpTime;
-    public Gson gsonInstance = new GsonBuilder().excludeFieldsWithoutExposeAnnotation().create();
-
-    private final AAPSLogger aapsLogger;
-    private final RxBusWrapper rxBus;
-    private final RileyLinkUtil rileyLinkUtil;
-    private final MedtronicPumpStatus medtronicPumpStatus;
-
-    @Inject
-    public MedtronicUtil(
-            AAPSLogger aapsLogger,
-            RxBusWrapper rxBus,
-            RileyLinkUtil rileyLinkUtil,
-            MedtronicPumpStatus medtronicPumpStatus
-    ) {
-        this.aapsLogger = aapsLogger;
-        this.rxBus = rxBus;
-        this.rileyLinkUtil = rileyLinkUtil;
-        this.medtronicPumpStatus = medtronicPumpStatus;
-    }
-
-    public LocalTime getTimeFrom30MinInterval(int interval) {
-        if (interval % 2 == 0) {
-            return new LocalTime(interval / 2, 0);
-        } else {
-            return new LocalTime((interval - 1) / 2, 30);
-        }
-    }
-
-
-    public static int getIntervalFromMinutes(int minutes) {
-        return minutes / 30;
-    }
-
-
-    public static int makeUnsignedShort(int b2, int b1) {
-        int k = (b2 & 0xff) << 8 | b1 & 0xff;
-        return k;
-    }
-
-    public static byte[] getByteArrayFromUnsignedShort(int shortValue, boolean returnFixedSize) {
-        byte highByte = (byte) (shortValue >> 8 & 0xFF);
-        byte lowByte = (byte) (shortValue & 0xFF);
-
-        if (highByte > 0) {
-            return createByteArray(highByte, lowByte);
-        } else {
-            return returnFixedSize ? createByteArray(highByte, lowByte) : createByteArray(lowByte);
-        }
-
-    }
-
-
-    public static byte[] createByteArray(byte... data) {
-        return data;
-    }
-
-
-    public static byte[] createByteArray(List<Byte> data) {
-
-        byte[] array = new byte[data.size()];
-
-        for (int i = 0; i < data.size(); i++) {
-            array[i] = data.get(i);
-        }
-
-        return array;
-    }
-
-
-    public double decodeBasalInsulin(int i, int j) {
-        return decodeBasalInsulin(makeUnsignedShort(i, j));
-    }
-
-
-    public double decodeBasalInsulin(int i) {
-        return (double) i / 40.0d;
-    }
-
-
-    public byte[] getBasalStrokes(double amount) {
-        return getBasalStrokes(amount, false);
-    }
-
-
-    public static byte[] getBasalStrokes(double amount, boolean returnFixedSize) {
-        return getStrokes(amount, 40, returnFixedSize);
-    }
-
-
-    public int getBasalStrokesInt(double amount) {
-        return getStrokesInt(amount, 40);
-    }
-
-
-    public byte[] getBolusStrokes(double amount) {
-
-        int strokesPerUnit = medtronicPumpStatus.medtronicDeviceType.getBolusStrokes();
-
-        int length;
-        int scrollRate;
-
-        if (strokesPerUnit >= 40) {
-            length = 2;
-
-            // 40-stroke pumps scroll faster for higher unit values
-
-            if (amount > 10)
-                scrollRate = 4;
-            else if (amount > 1)
-                scrollRate = 2;
-            else
-                scrollRate = 1;
-
-        } else {
-            length = 1;
-            scrollRate = 1;
-        }
-
-        int strokes = (int) (amount * ((strokesPerUnit * 1.0d) / (scrollRate * 1.0d))) * scrollRate;
-
-        byte[] body = ByteUtil.fromHexString(String.format("%02x%0" + (2 * length) + "x", length, strokes));
-
-        return body;
-    }
-
-
-    public byte[] createCommandBody(byte[] input) {
-
-        return ByteUtil.concat((byte) input.length, input);
-    }
-
-
-    public static byte[] getStrokes(double amount, int strokesPerUnit, boolean returnFixedSize) {
-
-        int strokes = getStrokesInt(amount, strokesPerUnit);
-
-        return getByteArrayFromUnsignedShort(strokes, returnFixedSize);
-
-    }
-
-
-    public static int getStrokesInt(double amount, int strokesPerUnit) {
-
-        int length = 1;
-        int scrollRate = 1;
-
-        if (strokesPerUnit >= 40) {
-            length = 2;
-
-            // 40-stroke pumps scroll faster for higher unit values
-            if (amount > 10)
-                scrollRate = 4;
-            else if (amount > 1)
-                scrollRate = 2;
-        }
-
-        int strokes = (int) (amount * (strokesPerUnit / (scrollRate * 1.0d)));
-
-        strokes *= scrollRate;
-
-        return strokes;
-
-    }
-
-
-    public void sendNotification(MedtronicNotificationType notificationType, ResourceHelper resourceHelper, RxBusWrapper rxBus) {
-        Notification notification = new Notification( //
-                notificationType.getNotificationType(), //
-                resourceHelper.gs(notificationType.getResourceId()), //
-                notificationType.getNotificationUrgency());
-        rxBus.send(new EventNewNotification(notification));
-    }
-
-
-    public void sendNotification(MedtronicNotificationType notificationType, ResourceHelper resourceHelper, RxBusWrapper rxBus, Object... parameters) {
-        Notification notification = new Notification( //
-                notificationType.getNotificationType(), //
-                resourceHelper.gs(notificationType.getResourceId(), parameters), //
-                notificationType.getNotificationUrgency());
-        rxBus.send(new EventNewNotification(notification));
-    }
-
-
-    public void dismissNotification(MedtronicNotificationType notificationType, RxBusWrapper rxBus) {
-        rxBus.send(new EventDismissNotification(notificationType.getNotificationType()));
-    }
-
-
-//    public byte[] buildCommandPayload(MessageType commandType, byte[] parameters) {
-//        return buildCommandPayload(commandType.getValue(), parameters);
-//    }
-
-
-    public byte[] buildCommandPayload(RileyLinkServiceData rileyLinkServiceData, MedtronicCommandType commandType, byte[] parameters) {
-        return buildCommandPayload(rileyLinkServiceData, commandType.commandCode, parameters);
-    }
-
-
-    public byte[] buildCommandPayload(RileyLinkServiceData rileyLinkServiceData, byte commandType, byte[] parameters) {
-        // A7 31 65 51 C0 00 52
-
-        byte commandLength = (byte) (parameters == null ? 2 : 2 + parameters.length);
-
-        ByteBuffer sendPayloadBuffer = ByteBuffer.allocate(ENVELOPE_SIZE + commandLength); // + CRC_SIZE
-        sendPayloadBuffer.order(ByteOrder.BIG_ENDIAN);
-
-        byte[] serialNumberBCD = rileyLinkServiceData.pumpIDBytes;
-
-        sendPayloadBuffer.put((byte) 0xA7);
-        sendPayloadBuffer.put(serialNumberBCD[0]);
-        sendPayloadBuffer.put(serialNumberBCD[1]);
-        sendPayloadBuffer.put(serialNumberBCD[2]);
-
-        sendPayloadBuffer.put(commandType);
-
-        if (parameters == null) {
-            sendPayloadBuffer.put((byte) 0x00);
-        } else {
-            sendPayloadBuffer.put((byte) parameters.length); // size
-
-            for (byte val : parameters) {
-                sendPayloadBuffer.put(val);
-            }
-        }
-
-        byte[] payload = sendPayloadBuffer.array();
-
-        aapsLogger.debug(LTag.PUMPCOMM, String.format(Locale.ENGLISH, "buildCommandPayload [%s]", ByteUtil.shortHexString(payload)));
-
-        // int crc = computeCRC8WithPolynomial(payload, 0, payload.length - 1);
-
-        // LOG.info("crc: " + crc);
-
-        // sendPayloadBuffer.put((byte) crc);
-
-        return sendPayloadBuffer.array();
-    }
-
-
-    // Note: at the moment supported only for 24 items, if you will use it for more than
-    // that you will need to add
-    public List<List<Byte>> getBasalProfileFrames(byte[] data) {
-
-        boolean done = false;
-        int start = 0;
-        int frame = 1;
-
-        List<List<Byte>> frames = new ArrayList<>();
-        boolean lastFrame = false;
-
-        do {
-            int frameLength = BIG_FRAME_LENGTH - 1;
-
-            if (start + frameLength > data.length) {
-                frameLength = data.length - start;
-            }
-
-            // System.out.println("Framelength: " + frameLength);
-
-            byte[] substring = ByteUtil.substring(data, start, frameLength);
-
-            // System.out.println("Subarray: " + ByteUtil.getCompactString(substring));
-            // System.out.println("Subarray Lenths: " + substring.length);
-
-            List<Byte> frameData = ByteUtil.getListFromByteArray(substring);
-
-            if (isEmptyFrame(frameData)) {
-                byte b = (byte) frame;
-                // b |= 0x80;
-                b |= 0b1000_0000;
-                // b |= doneBit;
-
-                frameData.add(0, b);
-
-                checkAndAppenLastFrame(frameData);
-
-                lastFrame = true;
-
-                done = true;
-            } else {
-                frameData.add(0, (byte) frame);
-            }
-
-            // System.out.println("Subarray: " + ByteUtil.getCompactString(substring));
-
-            frames.add(frameData);
-
-            frame++;
-            start += (BIG_FRAME_LENGTH - 1);
-
-            if (start == data.length) {
-                done = true;
-            }
-
-        } while (!done);
-
-        if (!lastFrame) {
-            List<Byte> frameData = new ArrayList<>();
-
-            byte b = (byte) frame;
-            b |= 0b1000_0000;
-            // b |= doneBit;
-
-            frameData.add(b);
-
-            checkAndAppenLastFrame(frameData);
-        }
-
-        return frames;
-
-    }
-
-
-    private void checkAndAppenLastFrame(List<Byte> frameData) {
-
-        if (frameData.size() == BIG_FRAME_LENGTH)
-            return;
-
-        int missing = BIG_FRAME_LENGTH - frameData.size();
-
-        for (int i = 0; i < missing; i++) {
-            frameData.add((byte) 0x00);
-        }
-    }
-
-
-    private boolean isEmptyFrame(List<Byte> frameData) {
-
-        for (Byte frameDateEntry : frameData) {
-            if (frameDateEntry != 0x00) {
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-
-    public static boolean isLowLevelDebug() {
-        return lowLevelDebug;
-    }
-
-    public boolean isModelSet() {
-        return medtronicPumpStatus.medtronicDeviceType != null;
-    }
-
-    public MedtronicDeviceType getMedtronicPumpModel() {
-        return medtronicPumpStatus.medtronicDeviceType;
-    }
-
-    public void setMedtronicPumpModel(MedtronicDeviceType medtronicPumpModel) {
-        this.medtronicPumpStatus.medtronicDeviceType = medtronicPumpModel;
-    }
-
-    public MedtronicCommandType getCurrentCommand() {
-        return this.currentCommand;
-    }
-
-    public void setCurrentCommand(MedtronicCommandType currentCommand) {
-        this.currentCommand = currentCommand;
-
-        if (currentCommand != null)
-            rileyLinkUtil.getRileyLinkHistory().add(new RLHistoryItemMedtronic(currentCommand));
-
-    }
-
-    public int pageNumber;
-    public Integer frameNumber;
-
-
-    public void setCurrentCommand(MedtronicCommandType currentCommand, int pageNumber_, Integer frameNumber_) {
-        pageNumber = pageNumber_;
-        frameNumber = frameNumber_;
-
-        if (this.currentCommand != currentCommand) {
-            setCurrentCommand(currentCommand);
-        }
-
-        rxBus.send(new EventRileyLinkDeviceStatusChange(medtronicPumpStatus.getPumpDeviceState()));
-    }
-
-
-    public static boolean isSame(Double d1, Double d2) {
-        double diff = d1 - d2;
-
-        return (Math.abs(diff) <= 0.000001);
-    }
-
-
-    public Map<String, PumpSettingDTO> getSettings() {
-        return settings;
-    }
-
-    public void setSettings(Map<String, PumpSettingDTO> settings) {
-        this.settings = settings;
-    }
-
-    public void setPumpTime(ClockDTO pumpTime) {
-        this.pumpTime = pumpTime;
-    }
-
-    public ClockDTO getPumpTime() {
-        return this.pumpTime;
-    }
-}
diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/util/MedtronicUtil.kt b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/util/MedtronicUtil.kt
new file mode 100644
index 0000000000..41fe26d79f
--- /dev/null
+++ b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/util/MedtronicUtil.kt
@@ -0,0 +1,311 @@
+package info.nightscout.androidaps.plugins.pump.medtronic.util
+
+import com.google.gson.GsonBuilder
+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.events.EventNewNotification
+import info.nightscout.androidaps.plugins.general.overview.notifications.Notification
+import info.nightscout.androidaps.plugins.pump.common.events.EventRileyLinkDeviceStatusChange
+import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkUtil
+import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.service.RileyLinkServiceData
+import info.nightscout.androidaps.plugins.pump.common.utils.ByteUtil
+import info.nightscout.androidaps.plugins.pump.medtronic.data.dto.ClockDTO
+import info.nightscout.androidaps.plugins.pump.medtronic.data.dto.PumpSettingDTO
+import info.nightscout.androidaps.plugins.pump.medtronic.data.dto.RLHistoryItemMedtronic
+import info.nightscout.androidaps.plugins.pump.medtronic.defs.MedtronicCommandType
+import info.nightscout.androidaps.plugins.pump.medtronic.defs.MedtronicDeviceType
+import info.nightscout.androidaps.plugins.pump.medtronic.defs.MedtronicNotificationType
+import info.nightscout.androidaps.plugins.pump.medtronic.driver.MedtronicPumpStatus
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import org.joda.time.LocalTime
+import java.nio.ByteBuffer
+import java.nio.ByteOrder
+import java.util.*
+import javax.inject.Inject
+import javax.inject.Singleton
+import kotlin.experimental.or
+
+/**
+ * Created by andy on 5/9/18.
+ */
+@Singleton
+class MedtronicUtil @Inject constructor(
+    private val aapsLogger: AAPSLogger,
+    private val rxBus: RxBusWrapper,
+    private val rileyLinkUtil: RileyLinkUtil,
+    private val medtronicPumpStatus: MedtronicPumpStatus
+) {
+
+    private val ENVELOPE_SIZE = 4 // 0xA7 S1 S2 S3 CMD PARAM_COUNT [PARAMS]
+
+    //private MedtronicDeviceType medtronicPumpModel;
+    private var currentCommand: MedtronicCommandType? = null
+    var settings: Map<String, PumpSettingDTO>? = null
+    private val BIG_FRAME_LENGTH = 65
+    private val doneBit = 1 shl 7
+    var pumpTime: ClockDTO? = null
+    var gsonInstance = GsonBuilder().excludeFieldsWithoutExposeAnnotation().create()
+
+    fun getTimeFrom30MinInterval(interval: Int): LocalTime {
+        return if (interval % 2 == 0) {
+            LocalTime(interval / 2, 0)
+        } else {
+            LocalTime((interval - 1) / 2, 30)
+        }
+    }
+
+    fun decodeBasalInsulin(i: Int, j: Int): Double {
+        return decodeBasalInsulin(makeUnsignedShort(i, j))
+    }
+
+    fun decodeBasalInsulin(i: Int): Double {
+        return i.toDouble() / 40.0
+    }
+
+    fun getBasalStrokes(amount: Double): ByteArray {
+        return getBasalStrokes(amount, false)
+    }
+
+    fun getBasalStrokesInt(amount: Double): Int {
+        return getStrokesInt(amount, 40)
+    }
+
+    fun getBolusStrokes(amount: Double): ByteArray {
+        val strokesPerUnit = medtronicPumpStatus.medtronicDeviceType.bolusStrokes
+        val length: Int
+        val scrollRate: Int
+        if (strokesPerUnit >= 40) {
+            length = 2
+
+            // 40-stroke pumps scroll faster for higher unit values
+            scrollRate = if (amount > 10) 4 else if (amount > 1) 2 else 1
+        } else {
+            length = 1
+            scrollRate = 1
+        }
+        val strokes = (amount * (strokesPerUnit * 1.0 / (scrollRate * 1.0))).toInt() * scrollRate
+        return ByteUtil.fromHexString(String.format("%02x%0" + 2 * length + "x", length, strokes))
+    }
+
+    fun createCommandBody(input: ByteArray): ByteArray {
+        return ByteUtil.concat(input.size.toByte(), input)
+    }
+
+    fun sendNotification(notificationType: MedtronicNotificationType, resourceHelper: ResourceHelper, rxBus: RxBusWrapper) {
+        val notification = Notification( //
+            notificationType.notificationType,  //
+            resourceHelper.gs(notificationType.resourceId),  //
+            notificationType.notificationUrgency)
+        rxBus.send(EventNewNotification(notification))
+    }
+
+    fun sendNotification(notificationType: MedtronicNotificationType, resourceHelper: ResourceHelper, rxBus: RxBusWrapper, vararg parameters: Any?) {
+        val notification = Notification( //
+            notificationType.notificationType,  //
+            resourceHelper.gs(notificationType.resourceId, *parameters),  //
+            notificationType.notificationUrgency)
+        rxBus.send(EventNewNotification(notification))
+    }
+
+    fun dismissNotification(notificationType: MedtronicNotificationType, rxBus: RxBusWrapper) {
+        rxBus.send(EventDismissNotification(notificationType.notificationType))
+    }
+
+    fun buildCommandPayload(rileyLinkServiceData: RileyLinkServiceData, commandType: MedtronicCommandType, parameters: ByteArray?): ByteArray {
+        return buildCommandPayload(rileyLinkServiceData, commandType.commandCode, parameters)
+    }
+
+    fun buildCommandPayload(rileyLinkServiceData: RileyLinkServiceData, commandType: Byte, parameters: ByteArray?): ByteArray {
+        // A7 31 65 51 C0 00 52
+        val commandLength = (if (parameters == null) 2 else 2 + parameters.size).toByte()
+        val sendPayloadBuffer = ByteBuffer.allocate(ENVELOPE_SIZE + commandLength) // + CRC_SIZE
+        sendPayloadBuffer.order(ByteOrder.BIG_ENDIAN)
+        val serialNumberBCD = rileyLinkServiceData.pumpIDBytes
+        sendPayloadBuffer.put(0xA7.toByte())
+        sendPayloadBuffer.put(serialNumberBCD[0])
+        sendPayloadBuffer.put(serialNumberBCD[1])
+        sendPayloadBuffer.put(serialNumberBCD[2])
+        sendPayloadBuffer.put(commandType)
+        if (parameters == null) {
+            sendPayloadBuffer.put(0x00.toByte())
+        } else {
+            sendPayloadBuffer.put(parameters.size.toByte()) // size
+            for (`val` in parameters) {
+                sendPayloadBuffer.put(`val`)
+            }
+        }
+        val payload = sendPayloadBuffer.array()
+        aapsLogger.debug(LTag.PUMPCOMM, String.format(Locale.ENGLISH, "buildCommandPayload [%s]", ByteUtil.shortHexString(payload)))
+
+        // int crc = computeCRC8WithPolynomial(payload, 0, payload.length - 1);
+
+        // LOG.info("crc: " + crc);
+
+        // sendPayloadBuffer.put((byte) crc);
+        return sendPayloadBuffer.array()
+    }
+
+    // Note: at the moment supported only for 24 items, if you will use it for more than
+    // that you will need to add
+    fun getBasalProfileFrames(data: ByteArray): List<List<Byte>> {
+        var done = false
+        var start = 0
+        var frame = 1
+        val frames: MutableList<List<Byte>> = ArrayList()
+        var lastFrame = false
+        do {
+            var frameLength = BIG_FRAME_LENGTH - 1
+            if (start + frameLength > data.size) {
+                frameLength = data.size - start
+            }
+
+            // System.out.println("Framelength: " + frameLength);
+            val substring = ByteUtil.substring(data, start, frameLength)
+
+            // System.out.println("Subarray: " + ByteUtil.getCompactString(substring));
+            // System.out.println("Subarray Lenths: " + substring.length);
+            val frameData = ByteUtil.getListFromByteArray(substring)
+            if (isEmptyFrame(frameData)) {
+                var b = frame.toByte()
+                // b |= 0x80;
+                b = b or 128.toByte()
+                // b |= doneBit;
+                frameData.add(0, b)
+                checkAndAppendLastFrame(frameData)
+                lastFrame = true
+                done = true
+            } else {
+                frameData.add(0, frame.toByte())
+            }
+
+            // System.out.println("Subarray: " + ByteUtil.getCompactString(substring));
+            frames.add(frameData)
+            frame++
+            start += BIG_FRAME_LENGTH - 1
+            if (start == data.size) {
+                done = true
+            }
+        } while (!done)
+        if (!lastFrame) {
+            val frameData: MutableList<Byte> = ArrayList()
+            var b = frame.toByte()
+            b = b or 128.toByte()
+            // b |= doneBit;
+            frameData.add(b)
+            checkAndAppendLastFrame(frameData)
+        }
+        return frames
+    }
+
+    private fun checkAndAppendLastFrame(frameData: MutableList<Byte>) {
+        if (frameData.size == BIG_FRAME_LENGTH) return
+        val missing = BIG_FRAME_LENGTH - frameData.size
+        for (i in 0 until missing) {
+            frameData.add(0x00.toByte())
+        }
+    }
+
+    private fun isEmptyFrame(frameData: List<Byte>): Boolean {
+        for (frameDateEntry in frameData) {
+            if (frameDateEntry.toInt() != 0x00) {
+                return false
+            }
+        }
+        return true
+    }
+
+    var isModelSet: Boolean = false
+    // get() = medtronicPumpStatus.medtronicDeviceType != null
+
+    var medtronicPumpModel: MedtronicDeviceType
+        get() = medtronicPumpStatus.medtronicDeviceType
+        set(medtronicPumpModel) {
+            medtronicPumpStatus.medtronicDeviceType = medtronicPumpModel
+        }
+
+    fun getCurrentCommand(): MedtronicCommandType? {
+        return currentCommand
+    }
+
+    fun setCurrentCommand(currentCommandIn: MedtronicCommandType?) {
+        this.currentCommand = currentCommandIn
+        if (currentCommand != null) rileyLinkUtil.rileyLinkHistory.add(RLHistoryItemMedtronic(currentCommandIn!!))
+    }
+
+    var pageNumber = 0
+    var frameNumber: Int? = null
+
+    fun setCurrentCommand(currentCommand: MedtronicCommandType, pageNumber_: Int, frameNumber_: Int?) {
+        pageNumber = pageNumber_
+        frameNumber = frameNumber_
+        if (this.currentCommand !== currentCommand) {
+            setCurrentCommand(currentCommand)
+        }
+        rxBus.send(EventRileyLinkDeviceStatusChange(medtronicPumpStatus.pumpDeviceState))
+    }
+
+    companion object {
+
+        const val isLowLevelDebug = true
+        fun getIntervalFromMinutes(minutes: Int): Int {
+            return minutes / 30
+        }
+
+        fun makeUnsignedShort(b2: Int, b1: Int): Int {
+            return b2 and 0xff shl 8 or b1 and 0xff
+        }
+
+        fun getByteArrayFromUnsignedShort(shortValue: Int, returnFixedSize: Boolean): ByteArray {
+            val highByte = (shortValue shr 8 and 0xFF).toByte()
+            val lowByte = (shortValue and 0xFF).toByte()
+            return if (highByte > 0) {
+                createByteArray(highByte, lowByte)
+            } else {
+                if (returnFixedSize) createByteArray(highByte, lowByte) else createByteArray(lowByte)
+            }
+        }
+
+        fun createByteArray(vararg data: Byte): ByteArray {
+            return data
+        }
+
+        fun createByteArray(data: List<Byte>): ByteArray {
+            val array = ByteArray(data.size)
+            for (i in data.indices) {
+                array[i] = data[i]
+            }
+            return array
+        }
+
+        fun getBasalStrokes(amount: Double, returnFixedSize: Boolean): ByteArray {
+            return getStrokes(amount, 40, returnFixedSize)
+        }
+
+        fun getStrokes(amount: Double, strokesPerUnit: Int, returnFixedSize: Boolean): ByteArray {
+            val strokes = getStrokesInt(amount, strokesPerUnit)
+            return getByteArrayFromUnsignedShort(strokes, returnFixedSize)
+        }
+
+        fun getStrokesInt(amount: Double, strokesPerUnit: Int): Int {
+            //var length = 1
+            var scrollRate = 1
+            if (strokesPerUnit >= 40) {
+                //    length = 2
+
+                // 40-stroke pumps scroll faster for higher unit values
+                if (amount > 10) scrollRate = 4 else if (amount > 1) scrollRate = 2
+            }
+            var strokes = (amount * (strokesPerUnit / (scrollRate * 1.0))).toInt()
+            strokes *= scrollRate
+            return strokes
+        }
+
+        fun isSame(d1: Double, d2: Double): Boolean {
+            val diff = d1 - d2
+            return Math.abs(diff) <= 0.000001
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/medtronic/src/main/res/layout/medtronic_fragment.xml b/medtronic/src/main/res/layout/medtronic_fragment.xml
index bd30507a75..25f1fa8bd9 100644
--- a/medtronic/src/main/res/layout/medtronic_fragment.xml
+++ b/medtronic/src/main/res/layout/medtronic_fragment.xml
@@ -32,6 +32,7 @@
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="5dp"
                     android:layout_marginRight="5dp"
+                    android:background="@color/pumpStatusBackground"
                     android:gravity="center_vertical|center_horizontal"
                     android:text="@string/initializing"
                     android:textAppearance="?android:attr/textAppearanceSmall" />
@@ -557,7 +558,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:drawableTop="@drawable/ic_danarhistory"
+            android:drawableTop="@drawable/ic_pump_history"
             android:paddingLeft="0dp"
             android:paddingRight="0dp"
             android:text="@string/pumphistory" />
diff --git a/medtronic/src/main/res/values-bg-rBG/strings.xml b/medtronic/src/main/res/values-bg-rBG/strings.xml
index 11b22095af..fcb54883c4 100644
--- a/medtronic/src/main/res/values-bg-rBG/strings.xml
+++ b/medtronic/src/main/res/values-bg-rBG/strings.xml
@@ -70,6 +70,7 @@
     <string name="medtronic_cmd_desc_set_basal_profile">Приложи базалният профил</string>
     <string name="medtronic_cmd_desc_get_tbr">Получи временния базал</string>
     <string name="medtronic_cmd_desc_set_tbr">Приложи временен базал</string>
+    <string name="medtronic_cmd_desc_cancel_tbr">Откажи временен базал</string>
     <string name="medtronic_cmd_desc_set_bolus">Стартирай болус</string>
     <string name="medtronic_pump_status_pump_unreachable">Помпата е недостъпна</string>
     <string name="medtronic_warning">Внимание</string>
diff --git a/medtronic/src/main/res/values-cs-rCZ/strings.xml b/medtronic/src/main/res/values-cs-rCZ/strings.xml
index e791d878a0..2b08a14c22 100644
--- a/medtronic/src/main/res/values-cs-rCZ/strings.xml
+++ b/medtronic/src/main/res/values-cs-rCZ/strings.xml
@@ -65,13 +65,17 @@
     <string name="medtronic_cmd_desc_get_history">Načítání historie - Strana %1$d (%2$d/16)</string>
     <string name="medtronic_cmd_desc_get_history_request">Načítání historie - Strana %1$d</string>
     <string name="medtronic_cmd_desc_get_time">Načítání času pumpy</string>
+    <string name="medtronic_cmd_desc_set_time">Nastavit čas pumpy</string>
+    <string name="medtronic_cmd_desc_get_battery_status">Stav baterie</string>
     <string name="medtronic_cmd_desc_get_settings">Načítání nastavení</string>
     <string name="medtronic_cmd_desc_get_model">Načítání modelu</string>
     <string name="medtronic_cmd_desc_get_basal_profile">Načítání profilu</string>
     <string name="medtronic_cmd_desc_set_basal_profile">Nastavování profilu</string>
     <string name="medtronic_cmd_desc_get_tbr">Načítání dočasného bazálu</string>
     <string name="medtronic_cmd_desc_set_tbr">Nastavování dočasného bazálu</string>
+    <string name="medtronic_cmd_desc_cancel_tbr">Zrušit dočasný bazál</string>
     <string name="medtronic_cmd_desc_set_bolus">Nastavování bolusu</string>
+    <string name="medtronic_cmd_desc_get_remaining_insulin">Zbývající inzulín</string>
     <string name="medtronic_pump_status_pump_unreachable">Pumpa nedostupná</string>
     <string name="medtronic_warning">Varování</string>
     <!-- medtronic_warning -->
@@ -85,4 +89,5 @@
     <string name="pump_time_updated">Čas v pumpě aktualizován</string>
     <string name="set_neutral_temps_title">Nastavit neutrální dočasný bazál</string>
     <string name="set_neutral_temps_summary">Je-li povoleno, zastaví dočasný bazál před koncem každé hodiny. To může u některých pump pomoci zastavit pípání/vibrace v celou hodinu.</string>
+    <string name="mdt_tbr_remaining">%1$.1f U/h (%2$d min zbývá)</string>
 </resources>
diff --git a/medtronic/src/main/res/values-de-rDE/strings.xml b/medtronic/src/main/res/values-de-rDE/strings.xml
index 0a0feb4813..37d628e324 100644
--- a/medtronic/src/main/res/values-de-rDE/strings.xml
+++ b/medtronic/src/main/res/values-de-rDE/strings.xml
@@ -65,13 +65,17 @@
     <string name="medtronic_cmd_desc_get_history">Hole Verlauf - Seite %1$d (%2$d/16)</string>
     <string name="medtronic_cmd_desc_get_history_request">Hole Verlauf - Seite %1$d</string>
     <string name="medtronic_cmd_desc_get_time">Hole Pumpen-Zeit</string>
+    <string name="medtronic_cmd_desc_set_time">Pumpen-Zeit einstellen</string>
+    <string name="medtronic_cmd_desc_get_battery_status">Akku-Status abfragen</string>
     <string name="medtronic_cmd_desc_get_settings">Hole Einstellungen</string>
     <string name="medtronic_cmd_desc_get_model">Hole Pumpenmodel</string>
     <string name="medtronic_cmd_desc_get_basal_profile">Hole Basal-Profil</string>
     <string name="medtronic_cmd_desc_set_basal_profile">Setzte Basal-Profil</string>
     <string name="medtronic_cmd_desc_get_tbr">Hole Temporäre Basalraten</string>
     <string name="medtronic_cmd_desc_set_tbr">Setze Temporäre Basalrate</string>
+    <string name="medtronic_cmd_desc_cancel_tbr">Temp. Basalrate abbrechen</string>
     <string name="medtronic_cmd_desc_set_bolus">Setze Bolus</string>
+    <string name="medtronic_cmd_desc_get_remaining_insulin">Verbleibendes Insulin abfragen</string>
     <string name="medtronic_pump_status_pump_unreachable">Pumpe nicht erreichbar</string>
     <string name="medtronic_warning">Warnung</string>
     <!-- medtronic_warning -->
@@ -85,4 +89,5 @@
     <string name="pump_time_updated">Pumpenzeit aktualisiert</string>
     <string name="set_neutral_temps_title">Neutrale TBR setzen</string>
     <string name="set_neutral_temps_summary">Wenn diese Option aktiviert ist, wird die TBR vor Ende jeder Stunde abgebrochen. Dies kann dazu beitragen, einige Pumpen davon abzuhalten, zur vollen Stunde zu vibrieren / zu piepsen.</string>
+    <string name="mdt_tbr_remaining">%1$.1f U/h (%2$d Minuten verbleibend)</string>
 </resources>
diff --git a/medtronic/src/main/res/values-fr-rFR/strings.xml b/medtronic/src/main/res/values-fr-rFR/strings.xml
index 768a20ff9d..51ec78f3fc 100644
--- a/medtronic/src/main/res/values-fr-rFR/strings.xml
+++ b/medtronic/src/main/res/values-fr-rFR/strings.xml
@@ -65,13 +65,17 @@
     <string name="medtronic_cmd_desc_get_history">Obtenir l\'historique - Page %1$d (%2$d/16)</string>
     <string name="medtronic_cmd_desc_get_history_request">Obtenir l\'historique - Page %1$d</string>
     <string name="medtronic_cmd_desc_get_time">Obtenir l\'heure de la pompe</string>
+    <string name="medtronic_cmd_desc_set_time">Régler l\'heure de la pompe</string>
+    <string name="medtronic_cmd_desc_get_battery_status">Obtenir l\'état de la batterie</string>
     <string name="medtronic_cmd_desc_get_settings">Obtenir les paramètres</string>
     <string name="medtronic_cmd_desc_get_model">Obtenir le modèle de pompe</string>
     <string name="medtronic_cmd_desc_get_basal_profile">Obtenir le profil Basal</string>
     <string name="medtronic_cmd_desc_set_basal_profile">Obtenir le profil Basal</string>
     <string name="medtronic_cmd_desc_get_tbr">Obtenir le Basal Temporaire</string>
     <string name="medtronic_cmd_desc_set_tbr">Définir le Basal Temporaire</string>
+    <string name="medtronic_cmd_desc_cancel_tbr">Annuler basal temporaire</string>
     <string name="medtronic_cmd_desc_set_bolus">Définir le Bolus</string>
+    <string name="medtronic_cmd_desc_get_remaining_insulin">Obtenir l\'insuline restante</string>
     <string name="medtronic_pump_status_pump_unreachable">Pompe hors de portée</string>
     <string name="medtronic_warning">Attention</string>
     <!-- medtronic_warning -->
@@ -85,4 +89,5 @@
     <string name="pump_time_updated">Mise à jour de l\'heure de la pompe</string>
     <string name="set_neutral_temps_title">Définir des basals temp neutres</string>
     <string name="set_neutral_temps_summary">Si activé, cela annulera une basal temp avant la fin de chaque heure. Cela peut aider à supprimer les bips/vibrations à chaque heure.</string>
+    <string name="mdt_tbr_remaining">%1$.1f U/h (%2$d min restantes)</string>
 </resources>
diff --git a/medtronic/src/main/res/values-it-rIT/strings.xml b/medtronic/src/main/res/values-it-rIT/strings.xml
index c4f633ede3..7d0e0e674e 100644
--- a/medtronic/src/main/res/values-it-rIT/strings.xml
+++ b/medtronic/src/main/res/values-it-rIT/strings.xml
@@ -65,13 +65,17 @@
     <string name="medtronic_cmd_desc_get_history">Ottieni storico - Pagina %1$d (%2$d/16)</string>
     <string name="medtronic_cmd_desc_get_history_request">Ottieni storico - Pagina %1$d</string>
     <string name="medtronic_cmd_desc_get_time">Ottieni ora micro</string>
+    <string name="medtronic_cmd_desc_set_time">Imposta ora del micro</string>
+    <string name="medtronic_cmd_desc_get_battery_status">Ottieni stato batteria</string>
     <string name="medtronic_cmd_desc_get_settings">Ottieni impostazioni</string>
     <string name="medtronic_cmd_desc_get_model">Ottieni modello micro</string>
     <string name="medtronic_cmd_desc_get_basal_profile">Ottieni profilo basale</string>
     <string name="medtronic_cmd_desc_set_basal_profile">Imposta profilo basale</string>
     <string name="medtronic_cmd_desc_get_tbr">Ottieni basale temporanea</string>
     <string name="medtronic_cmd_desc_set_tbr">Imposta basale temporanea</string>
+    <string name="medtronic_cmd_desc_cancel_tbr">Cancella basale temporanea</string>
     <string name="medtronic_cmd_desc_set_bolus">Imposta bolo</string>
+    <string name="medtronic_cmd_desc_get_remaining_insulin">Ottieni insulina rimanente</string>
     <string name="medtronic_pump_status_pump_unreachable">Micro irraggiungibile</string>
     <string name="medtronic_warning">Avviso</string>
     <!-- medtronic_warning -->
@@ -85,4 +89,5 @@
     <string name="pump_time_updated">Ora del micro aggiornata</string>
     <string name="set_neutral_temps_title">Imposta basali temporanee neutre</string>
     <string name="set_neutral_temps_summary">Se abilitato, cancellerà una basale temporanea prima della fine di ogni ora. Questo metodo può aiutare a fermare alcuni micro dall\'emettere un suono/vibrare allo scoccare dell\'ora.</string>
+    <string name="mdt_tbr_remaining">%1$.1f U/h (%2$d min rimanenti/e)</string>
 </resources>
diff --git a/medtronic/src/main/res/values-iw-rIL/strings.xml b/medtronic/src/main/res/values-iw-rIL/strings.xml
index 44bdddcf9b..acfac31e0d 100644
--- a/medtronic/src/main/res/values-iw-rIL/strings.xml
+++ b/medtronic/src/main/res/values-iw-rIL/strings.xml
@@ -64,14 +64,18 @@
     <string name="medtronic_cmd_basal_profile_not_set_is_same">הפרופיל הנוכחי זהה ולכן לא יוגדר מחדש.</string>
     <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_get_settings">קבלת הגדרות</string>
-    <string name="medtronic_cmd_desc_get_model">קבלת דגם המשאבה</string>
-    <string name="medtronic_cmd_desc_get_basal_profile">קבלת פרופיל בזאלי</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">אחזר פרופיל בזאלי</string>
     <string name="medtronic_cmd_desc_set_basal_profile">הגדרת פרופיל בזאלי</string>
     <string name="medtronic_cmd_desc_get_tbr">קבלת בזאלי זמני</string>
     <string name="medtronic_cmd_desc_set_tbr">הגדרת בזאלי זמני</string>
+    <string name="medtronic_cmd_desc_cancel_tbr">ביטול בזאלי זמני</string>
     <string name="medtronic_cmd_desc_set_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 -->
@@ -85,4 +89,5 @@
     <string name="pump_time_updated">שעון המשאבה עודכן</string>
     <string name="set_neutral_temps_title">הגדרת מינון בזאלי ניטרלי</string>
     <string name="set_neutral_temps_summary">אם תופעל, היא תבטל בזאלי זמני לפני תום כל שעה. שיטה זו יכולה לעזור לבטל ציפצופים ורטט רבים בחלק מהמשאבות.</string>
+    <string name="mdt_tbr_remaining">%1$.1f יחידות\\שעה (נותרו %2$d דקות) </string>
 </resources>
diff --git a/medtronic/src/main/res/values-ko-rKR/strings.xml b/medtronic/src/main/res/values-ko-rKR/strings.xml
index 1c671da12c..244dc5ef7f 100644
--- a/medtronic/src/main/res/values-ko-rKR/strings.xml
+++ b/medtronic/src/main/res/values-ko-rKR/strings.xml
@@ -22,9 +22,12 @@
     <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>
     <string name="medtronic_error_serial_invalid">일련번호 # 유효하지않음.</string>
     <string name="medtronic_error_pump_type_not_set">펌프 타입이 설정되지 않았습니다.</string>
@@ -47,6 +50,7 @@
     <!--    <string name="medtronic_history_group_statistic">Statistics</string>-->
     <!--    <string name="medtronic_history_group_unknown">Unknowns</string>-->
     <!--    <string name="medtronic_history_group_all">All</string>-->
+    <string name="medtronic_pump_history">메드트로닉 펌프 이력</string>
     <!-- <string name="medtronic_cmd_profile_not_set">Remote Basal profile setting is not supported. Please modify Basal profile on your pump manually.</string> -->
     <string name="medtronic_cmd_cancel_bolus_not_supported">펌프에서 이미 설정된 Bolus를 취소했습니다. 메드트로닉 펌프는 취소를 지원하지 않으므로 수동으로 취소해야합니다. (여전히 취소하길 원한다면) 펌프를 일시 중단 모드로 전환 한 다음 다시 시작하십시오. 다음 업데이트시 (5 분 이내에) 변경 사항을 적용합니다.</string>
     <string name="medtronic_cmd_cant_read_tbr">현재 TBR을 읽을 수 없습니다.</string>
@@ -61,17 +65,29 @@
     <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 -->
+    <string name="medtronic_pump_connected_now">현재</string>
     <!-- combo_pump_connected_now -->
+    <string name="ago">전</string>
+    <string name="medtronic_notification_check_time_date">펌프 시간 업데이트가 필요합니다.</string>
     <!-- combo_notification_check_time_date -->
+    <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/medtronic/src/main/res/values-lt-rLT/strings.xml b/medtronic/src/main/res/values-lt-rLT/strings.xml
index 706db97a5a..7b4dabfb4d 100644
--- a/medtronic/src/main/res/values-lt-rLT/strings.xml
+++ b/medtronic/src/main/res/values-lt-rLT/strings.xml
@@ -25,6 +25,7 @@
     <string name="medtronic_pump_battery_nimh">NiMH (išplėstinis vaizdas)</string>
     <string name="medtronic_bolus_debugging">Boluso/Terapijos Derinimas</string>
     <!-- MDT Fragment -->
+    <string name="rl_battery_label">RileyLink baterija</string>
     <!-- MDT Errors -->
     <string name="medtronic_errors">Klaidos</string>
     <string name="medtronic_error_serial_not_set">Serijos Nr. nenustatytas.</string>
@@ -64,13 +65,17 @@
     <string name="medtronic_cmd_desc_get_history">Gauti istoriją - Lapas %1$d (%2$d/16)</string>
     <string name="medtronic_cmd_desc_get_history_request">Gauti istoriją - Lapas %1$d</string>
     <string name="medtronic_cmd_desc_get_time">Gauti pompos laiką</string>
+    <string name="medtronic_cmd_desc_set_time">Nustatyti pompos laiką</string>
+    <string name="medtronic_cmd_desc_get_battery_status">Parodyti baterijos būseną</string>
     <string name="medtronic_cmd_desc_get_settings">Gauti parametrus</string>
     <string name="medtronic_cmd_desc_get_model">Gauti pompos modelį</string>
     <string name="medtronic_cmd_desc_get_basal_profile">Gauti bazės profilį</string>
     <string name="medtronic_cmd_desc_set_basal_profile">Nustatyti bazės profilį</string>
     <string name="medtronic_cmd_desc_get_tbr">Gauti laikiną bazę</string>
     <string name="medtronic_cmd_desc_set_tbr">Nustatyti laikiną bazę</string>
+    <string name="medtronic_cmd_desc_cancel_tbr">Atšaukti laikiną bazę</string>
     <string name="medtronic_cmd_desc_set_bolus">Nustatyti bolusą</string>
+    <string name="medtronic_cmd_desc_get_remaining_insulin">Parodyti insulino likutį</string>
     <string name="medtronic_pump_status_pump_unreachable">Pompa nepasiekiama</string>
     <string name="medtronic_warning">Perspėjimas</string>
     <!-- medtronic_warning -->
@@ -84,4 +89,5 @@
     <string name="pump_time_updated">Pompos laikas pakeistas</string>
     <string name="set_neutral_temps_title">Nustatyti neutralią laikiną bazę</string>
     <string name="set_neutral_temps_summary">Jei įjungta, laikina valandinė bazė bus anuliuota iki kiekvienos valandos pabaigos. Šis metodas gali padėti išvengti kai kurių pompų pypsėjimo ar vibravimo.</string>
+    <string name="mdt_tbr_remaining">%1$.1f vv/h (liko %2$d min)</string>
 </resources>
diff --git a/medtronic/src/main/res/values-no-rNO/strings.xml b/medtronic/src/main/res/values-no-rNO/strings.xml
index 0c93599b2e..cc3e35d7df 100644
--- a/medtronic/src/main/res/values-no-rNO/strings.xml
+++ b/medtronic/src/main/res/values-no-rNO/strings.xml
@@ -65,13 +65,17 @@
     <string name="medtronic_cmd_desc_get_history">Henter historikk - side %1$d (%2$d/16)</string>
     <string name="medtronic_cmd_desc_get_history_request">Henter historikk - side %1$d</string>
     <string name="medtronic_cmd_desc_get_time">Henter pumpe tid</string>
+    <string name="medtronic_cmd_desc_set_time">Still pumpens klokke</string>
+    <string name="medtronic_cmd_desc_get_battery_status">Les batteri status</string>
     <string name="medtronic_cmd_desc_get_settings">Henter innstillinger</string>
     <string name="medtronic_cmd_desc_get_model">Henter pumpe modell</string>
     <string name="medtronic_cmd_desc_get_basal_profile">Henter basal profil</string>
     <string name="medtronic_cmd_desc_set_basal_profile">Angi basal profil</string>
     <string name="medtronic_cmd_desc_get_tbr">Henter Temp Basal</string>
     <string name="medtronic_cmd_desc_set_tbr">Angi Temp Basal</string>
+    <string name="medtronic_cmd_desc_cancel_tbr">Avbryt temp basal</string>
     <string name="medtronic_cmd_desc_set_bolus">Angi Bolus</string>
+    <string name="medtronic_cmd_desc_get_remaining_insulin">Oppdater status insulinvolum</string>
     <string name="medtronic_pump_status_pump_unreachable">Pumpe utilgjengelig</string>
     <string name="medtronic_warning">Advarsel</string>
     <!-- medtronic_warning -->
@@ -85,4 +89,5 @@
     <string name="pump_time_updated">Pumpens tid ble oppdatert</string>
     <string name="set_neutral_temps_title">Sett nøytrale temp basaler</string>
     <string name="set_neutral_temps_summary">Hvis aktivert så vil den stoppe en temp basal rett før hver hele time for å stoppe noen pumpers varsler/vibreringer på hver hele time.</string>
+    <string name="mdt_tbr_remaining">%1$.1f E/t (%2$d min gjenstår)</string>
 </resources>
diff --git a/medtronic/src/main/res/values-ru-rRU/strings.xml b/medtronic/src/main/res/values-ru-rRU/strings.xml
index 073f5d1350..404ba1866b 100644
--- a/medtronic/src/main/res/values-ru-rRU/strings.xml
+++ b/medtronic/src/main/res/values-ru-rRU/strings.xml
@@ -65,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">Получить профиль базала</string>
     <string name="medtronic_cmd_desc_set_basal_profile">Установить профиль базала</string>
     <string name="medtronic_cmd_desc_get_tbr">Получить временный базал</string>
     <string name="medtronic_cmd_desc_set_tbr">Установить временный базал</string>
+    <string name="medtronic_cmd_desc_cancel_tbr">Отменить временный базал</string>
     <string name="medtronic_cmd_desc_set_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 -->
@@ -85,4 +89,5 @@
     <string name="pump_time_updated">Время на помпе обновлено</string>
     <string name="set_neutral_temps_title">Установить нейтральные временные базалы</string>
     <string name="set_neutral_temps_summary">Если эта опция включена, то она отменяет временный базал до конца каждого часа. Такой метод помогает прекратить почасовую вибрацию некоторых помп.</string>
+    <string name="mdt_tbr_remaining">%1$.1fед/ч(%2$d мин осталось)</string>
 </resources>
diff --git a/medtronic/src/main/res/values-sk-rSK/strings.xml b/medtronic/src/main/res/values-sk-rSK/strings.xml
index 62ac7c4c3f..6f94f8ebe4 100644
--- a/medtronic/src/main/res/values-sk-rSK/strings.xml
+++ b/medtronic/src/main/res/values-sk-rSK/strings.xml
@@ -65,13 +65,17 @@
     <string name="medtronic_cmd_desc_get_history">Načítanie histórie - Strana %1$d (%2$d/16)</string>
     <string name="medtronic_cmd_desc_get_history_request">Načítanie histórie - Strana %1$d</string>
     <string name="medtronic_cmd_desc_get_time">Načítanie času pumpy</string>
+    <string name="medtronic_cmd_desc_set_time">Nastaviť čas pumpy</string>
+    <string name="medtronic_cmd_desc_get_battery_status">Stav batérie</string>
     <string name="medtronic_cmd_desc_get_settings">Načítanie nastavení</string>
     <string name="medtronic_cmd_desc_get_model">Načítanie modelu pumpy</string>
     <string name="medtronic_cmd_desc_get_basal_profile">Načítanie bazálneho profilu</string>
     <string name="medtronic_cmd_desc_set_basal_profile">Nastavovanie bazálneho profilu</string>
     <string name="medtronic_cmd_desc_get_tbr">Načítanie dočasného bazálu</string>
     <string name="medtronic_cmd_desc_set_tbr">Nastavovanie dočasného bazálu</string>
+    <string name="medtronic_cmd_desc_cancel_tbr">Zrušiť dočasný bazál</string>
     <string name="medtronic_cmd_desc_set_bolus">Nastavovanie bolusu</string>
+    <string name="medtronic_cmd_desc_get_remaining_insulin">Zostávajúci inzulín</string>
     <string name="medtronic_pump_status_pump_unreachable">Pumpa nedostupná</string>
     <string name="medtronic_warning">Upozornenie</string>
     <!-- medtronic_warning -->
@@ -85,4 +89,5 @@
     <string name="pump_time_updated">Čas v pumpe bol aktualizovaný</string>
     <string name="set_neutral_temps_title">Nastaviť neutrálny dočasný bazál</string>
     <string name="set_neutral_temps_summary">Ak je povolená táto možnosť, zastaví sa dočasný bazál pred koncom každej hodiny. To môže u niektorých púmp pomôcť zastaviť pípanie/vibrácie na celú hodinu.</string>
+    <string name="mdt_tbr_remaining">%1$.1f JI/h (%2$d min zostáva)</string>
 </resources>
diff --git a/medtronic/src/main/res/values-sv-rSE/strings.xml b/medtronic/src/main/res/values-sv-rSE/strings.xml
index 3ce83a2b0d..4881d1ce5b 100644
--- a/medtronic/src/main/res/values-sv-rSE/strings.xml
+++ b/medtronic/src/main/res/values-sv-rSE/strings.xml
@@ -25,6 +25,7 @@
     <string name="medtronic_pump_battery_nimh">NiMH (utökad vy)</string>
     <string name="medtronic_bolus_debugging">Avlusning av Bolus/Behandlingar</string>
     <!-- MDT Fragment -->
+    <string name="rl_battery_label">RileyLink-batteri</string>
     <!-- MDT Errors -->
     <string name="medtronic_errors">Fel</string>
     <string name="medtronic_error_serial_not_set">Serienummer ej angett.</string>
@@ -64,13 +65,17 @@
     <string name="medtronic_cmd_desc_get_history">Hämta historik - Sida %1$d (%2$d/16)</string>
     <string name="medtronic_cmd_desc_get_history_request">Hämta historik - Sida %1$d</string>
     <string name="medtronic_cmd_desc_get_time">Hämta tid och datum från pumpen</string>
+    <string name="medtronic_cmd_desc_set_time">Ställ in pumptid</string>
+    <string name="medtronic_cmd_desc_get_battery_status">Hämta batteristatus</string>
     <string name="medtronic_cmd_desc_get_settings">Hämta inställningar</string>
     <string name="medtronic_cmd_desc_get_model">Hämta pumpmodell</string>
     <string name="medtronic_cmd_desc_get_basal_profile">Hämta basalprofil</string>
     <string name="medtronic_cmd_desc_set_basal_profile">Sätt basalprofil</string>
     <string name="medtronic_cmd_desc_get_tbr">Hämta temp basal</string>
     <string name="medtronic_cmd_desc_set_tbr">Sätt temp basal</string>
+    <string name="medtronic_cmd_desc_cancel_tbr">Avbryt temporär basal</string>
     <string name="medtronic_cmd_desc_set_bolus">Leverera bolus</string>
+    <string name="medtronic_cmd_desc_get_remaining_insulin">Hämta återstående insulinmängd</string>
     <string name="medtronic_pump_status_pump_unreachable">Pumpen kan inte nås</string>
     <string name="medtronic_warning">Varning</string>
     <!-- medtronic_warning -->
@@ -84,4 +89,5 @@
     <string name="pump_time_updated">Tiden uppdaterad i pumpen</string>
     <string name="set_neutral_temps_title">Sätt neutrala temp basaler</string>
     <string name="set_neutral_temps_summary">Om aktiverad, kommer en eventuell temporär basal automatiskt avbrytas före utgången av varje timme. Denna metod kan förhindra att vissa pumpar piper/vibrerar.</string>
+    <string name="mdt_tbr_remaining">%1$.1f U/h (%2$d min kvar)</string>
 </resources>
diff --git a/medtronic/src/main/res/values/strings.xml b/medtronic/src/main/res/values/strings.xml
index 32715ce7b4..56d216e9cf 100644
--- a/medtronic/src/main/res/values/strings.xml
+++ b/medtronic/src/main/res/values/strings.xml
@@ -95,13 +95,18 @@
     <string name="medtronic_cmd_desc_get_history">Get History - Page %1$d (%2$d/16)</string>
     <string name="medtronic_cmd_desc_get_history_request">Get History - Page %1$d</string>
     <string name="medtronic_cmd_desc_get_time">Get Pump Time</string>
+    <string name="medtronic_cmd_desc_set_time">Set Pump Time</string>
+    <string name="medtronic_cmd_desc_get_battery_status">Get Battery Status</string>
+
     <string name="medtronic_cmd_desc_get_settings">Get Settings</string>
     <string name="medtronic_cmd_desc_get_model">Get Pump Model</string>
     <string name="medtronic_cmd_desc_get_basal_profile">Get Basal Profile</string>
     <string name="medtronic_cmd_desc_set_basal_profile">Set Basal Profile</string>
     <string name="medtronic_cmd_desc_get_tbr">Get Temporary Basal</string>
     <string name="medtronic_cmd_desc_set_tbr">Set Temporary Basal</string>
+    <string name="medtronic_cmd_desc_cancel_tbr">Cancel Temporary Basal</string>
     <string name="medtronic_cmd_desc_set_bolus">Set Bolus</string>
+    <string name="medtronic_cmd_desc_get_remaining_insulin">Get Remaining Insulin</string>
 
     <string name="medtronic_pump_status_pump_unreachable">Pump unreachable</string>
     <string name="medtronic_warning">Warning</string>  <!-- medtronic_warning -->
@@ -115,8 +120,7 @@
     <string name="key_set_neutral_temps" translatable="false">set_neutral_temps</string>
     <string name="set_neutral_temps_title">Set neutral temp basals</string>
     <string name="set_neutral_temps_summary">If enabled, it will cancel a temporary basal before the end of each hour. This method can help stop some pumps beeping/vibrating on the hour.</string>
-
-
+    <string name="mdt_tbr_remaining">%1$.1f U/h (%2$d min remaining)</string>
     <string name="sixdigitnumber" translatable="false">^\\d{6}</string>
 
 </resources>
\ No newline at end of file
diff --git a/medtronic/src/test/java/info/nightscout/androidaps/TestBase.kt b/medtronic/src/test/java/info/nightscout/androidaps/TestBase.kt
new file mode 100644
index 0000000000..ff88739ba2
--- /dev/null
+++ b/medtronic/src/test/java/info/nightscout/androidaps/TestBase.kt
@@ -0,0 +1,39 @@
+package info.nightscout.androidaps
+
+import info.nightscout.androidaps.logging.AAPSLoggerTest
+import info.nightscout.androidaps.utils.rx.AapsSchedulers
+import info.nightscout.androidaps.utils.rx.TestAapsSchedulers
+import org.junit.Before
+import org.junit.Rule
+import org.mockito.Mockito
+import org.mockito.junit.MockitoJUnit
+import org.mockito.junit.MockitoRule
+import java.util.*
+
+open class TestBase {
+
+    val aapsLogger = AAPSLoggerTest()
+    val aapsSchedulers: AapsSchedulers = TestAapsSchedulers()
+
+    // Add a JUnit rule that will setup the @Mock annotated vars and log.
+    // Another possibility would be to add `MockitoAnnotations.initMocks(this) to the setup method.
+    @get:Rule
+    val mockitoRule: MockitoRule = MockitoJUnit.rule()
+
+    @Before
+    fun setupLocale() {
+        Locale.setDefault(Locale.ENGLISH)
+        System.setProperty("disableFirebase", "true")
+    }
+
+    // Workaround for Kotlin nullability.
+    // https://medium.com/@elye.project/befriending-kotlin-and-mockito-1c2e7b0ef791
+    // https://stackoverflow.com/questions/30305217/is-it-possible-to-use-mockito-in-kotlin
+    fun <T> anyObject(): T {
+        Mockito.any<T>()
+        return uninitialized()
+    }
+
+    @Suppress("Unchecked_Cast")
+    fun <T> uninitialized(): T = null as T
+}
\ No newline at end of file
diff --git a/medtronic/src/test/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/pump/MedtronicPumpHistoryDecoderUTest.java b/medtronic/src/test/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/pump/MedtronicPumpHistoryDecoderUTest.kt
similarity index 81%
rename from medtronic/src/test/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/pump/MedtronicPumpHistoryDecoderUTest.java
rename to medtronic/src/test/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/pump/MedtronicPumpHistoryDecoderUTest.kt
index 14a4c2926a..bbb4fcea86 100644
--- a/medtronic/src/test/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/pump/MedtronicPumpHistoryDecoderUTest.java
+++ b/medtronic/src/test/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/pump/MedtronicPumpHistoryDecoderUTest.kt
@@ -1,58 +1,49 @@
-package info.nightscout.androidaps.plugins.pump.medtronic.comm.history.pump;
+package info.nightscout.androidaps.plugins.pump.medtronic.comm.history.pump
 
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.Mock;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import java.util.List;
-
-import dagger.android.HasAndroidInjector;
-import info.nightscout.androidaps.interfaces.ActivePlugin;
-import info.nightscout.androidaps.logging.AAPSLogger;
-import info.nightscout.androidaps.logging.AAPSLoggerTest;
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper;
-import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkUtil;
-import info.nightscout.androidaps.plugins.pump.common.utils.ByteUtil;
-import info.nightscout.androidaps.plugins.pump.medtronic.comm.history.RawHistoryPage;
-import info.nightscout.androidaps.plugins.pump.medtronic.defs.MedtronicDeviceType;
-import info.nightscout.androidaps.plugins.pump.medtronic.driver.MedtronicPumpStatus;
-import info.nightscout.androidaps.plugins.pump.medtronic.util.MedtronicUtil;
-import info.nightscout.androidaps.utils.resources.ResourceHelper;
-import info.nightscout.androidaps.utils.rx.TestAapsSchedulers;
-import info.nightscout.androidaps.utils.sharedPreferences.SP;
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.TestBase
+import info.nightscout.androidaps.interfaces.ActivePlugin
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkUtil
+import info.nightscout.androidaps.plugins.pump.common.utils.ByteUtil
+import info.nightscout.androidaps.plugins.pump.medtronic.comm.history.RawHistoryPage
+import info.nightscout.androidaps.plugins.pump.medtronic.defs.MedtronicDeviceType
+import info.nightscout.androidaps.plugins.pump.medtronic.driver.MedtronicPumpStatus
+import info.nightscout.androidaps.plugins.pump.medtronic.util.MedtronicUtil
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import info.nightscout.androidaps.utils.rx.TestAapsSchedulers
+import info.nightscout.androidaps.utils.sharedPreferences.SP
+import org.junit.Assert
+import org.junit.Before
+import org.junit.Test
+import org.mockito.Answers
+import org.mockito.Mock
 
 /**
  * Created by andy on 11/1/18.
  */
-@RunWith(PowerMockRunner.class)
-public class MedtronicPumpHistoryDecoderUTest {
+@Suppress("SpellCheckingInspection")
+class MedtronicPumpHistoryDecoderUTest : TestBase() {
 
-    @Mock HasAndroidInjector injector;
-    AAPSLogger aapsLogger = new AAPSLoggerTest();
-    RxBusWrapper rxBusWrapper = new RxBusWrapper(new TestAapsSchedulers());
-    @Mock ResourceHelper resourceHelper;
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS) ActivePlugin activePlugin;
-    @Mock RileyLinkUtil rileyLinkUtil;
-    @Mock SP sp;
-    MedtronicPumpStatus medtronicPumpStatus;
-    MedtronicUtil medtronicUtil;
-    MedtronicPumpHistoryDecoder decoder;
+    @Mock lateinit var injector: HasAndroidInjector
+    @Mock lateinit var resourceHelper: ResourceHelper
+    @Mock(answer = Answers.RETURNS_DEEP_STUBS) lateinit var activePlugin: ActivePlugin
+    @Mock lateinit var rileyLinkUtil: RileyLinkUtil
+    @Mock lateinit var sp: SP
 
-
-    @Before
-    public void setup() {
-        medtronicPumpStatus = new MedtronicPumpStatus(resourceHelper, sp, rxBusWrapper, rileyLinkUtil);
-        medtronicUtil = new MedtronicUtil(aapsLogger, rxBusWrapper, rileyLinkUtil, medtronicPumpStatus);
-        decoder = new MedtronicPumpHistoryDecoder(aapsLogger, medtronicUtil);
+    private var medtronicPumpStatus: MedtronicPumpStatus? = null
+    private var medtronicUtil: MedtronicUtil? = null
+    private var decoder: MedtronicPumpHistoryDecoder? = null
+    var rxBusWrapper = RxBusWrapper(TestAapsSchedulers())
+    @Before fun setup() {
+        medtronicPumpStatus =
+            MedtronicPumpStatus(resourceHelper, sp, rxBusWrapper, rileyLinkUtil)
+        medtronicUtil =
+            MedtronicUtil(aapsLogger, rxBusWrapper, rileyLinkUtil, medtronicPumpStatus!!)
+        decoder = MedtronicPumpHistoryDecoder(aapsLogger, medtronicUtil!!, ByteUtil())
     }
 
-
-
-/*
+    /*
 
     // @Test
     public void decodeRecord() throws Exception {
@@ -176,59 +167,51 @@ public class MedtronicPumpHistoryDecoderUTest {
 
     }
 */
-
-
-    @Test
-    public void historyProblem_148_amunhateb() throws Exception {
-        List<PumpHistoryEntry> pumpHistoryEntries = readAndParseHistoryPage("5A 0F 20 F4 0C 03 15 19 11 00 17 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 1E 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 32 50 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 1A 11 00 0F 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 1E 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 32 50 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 33 01 12 12 00 25 DE 2D 43 15 01 50 50 00 26 EA 2D 43 15 01 4B 4B 00 2C C9 34 43 15 62 00 2F CB 17 03 15 01 33 33 00 16 DE 37 43 15 07 00 00 07 FE 23 95 6D 23 95 0A 08 00 2B 00 00 00 00 07 FE 03 8E 2C 04 70 38 00 00 04 70 38 00 00 00 00 00 00 04 70 64 06 00 00 00 06 08 00 2B 00 00 00 2C A0 2F E3 01 04 15 33 00 2F E7 04 44 15 00 16 03 2F E7 04 44 15 33 28 3B C2 06 44 15 00 16 01 3B C2 06 44 15 08 08 17 DB 0B 44 15 00 26 00 06 26 00 0C 26 00 12 28 00 18 26 00 1E 26 00 24 24 00 2A 26 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 09 18 17 DB 0B 44 15 00 26 00 02 26 00 04 26 00 06 24 00 08 24 00 0A 24 00 0C 26 00 0E 26 00 10 26 00 12 28 00 14 28 00 16 28 00 18 26 00 1A 26 00 1C 26 00 1E 26 00 20 26 00 22 26 00 24 24 00 26 24 00 28 24 00 2A 26 00 2C 26 00 2E 26 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 01 45 45 00 28 E9 2B 44 15 19 00 00 C1 0D 04 15 1A 00 15 C3 0D 04 15 1A 01 33 C3 0D 04 15 01 28 28 00 07 CC 2E 44 15 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 14 2D",
-                MedtronicDeviceType.Medtronic_522_722);
-
-        Assert.assertEquals(20, pumpHistoryEntries.size());
+    @Test @Throws(Exception::class) fun historyProblem_148_amunhateb() {
+        val pumpHistoryEntries = readAndParseHistoryPage(
+            "5A 0F 20 F4 0C 03 15 19 11 00 17 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 1E 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 32 50 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 1A 11 00 0F 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 1E 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 32 50 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 33 01 12 12 00 25 DE 2D 43 15 01 50 50 00 26 EA 2D 43 15 01 4B 4B 00 2C C9 34 43 15 62 00 2F CB 17 03 15 01 33 33 00 16 DE 37 43 15 07 00 00 07 FE 23 95 6D 23 95 0A 08 00 2B 00 00 00 00 07 FE 03 8E 2C 04 70 38 00 00 04 70 38 00 00 00 00 00 00 04 70 64 06 00 00 00 06 08 00 2B 00 00 00 2C A0 2F E3 01 04 15 33 00 2F E7 04 44 15 00 16 03 2F E7 04 44 15 33 28 3B C2 06 44 15 00 16 01 3B C2 06 44 15 08 08 17 DB 0B 44 15 00 26 00 06 26 00 0C 26 00 12 28 00 18 26 00 1E 26 00 24 24 00 2A 26 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 09 18 17 DB 0B 44 15 00 26 00 02 26 00 04 26 00 06 24 00 08 24 00 0A 24 00 0C 26 00 0E 26 00 10 26 00 12 28 00 14 28 00 16 28 00 18 26 00 1A 26 00 1C 26 00 1E 26 00 20 26 00 22 26 00 24 24 00 26 24 00 28 24 00 2A 26 00 2C 26 00 2E 26 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 01 45 45 00 28 E9 2B 44 15 19 00 00 C1 0D 04 15 1A 00 15 C3 0D 04 15 1A 01 33 C3 0D 04 15 01 28 28 00 07 CC 2E 44 15 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 14 2D",
+            MedtronicDeviceType.Medtronic_522_722
+        )
+        Assert.assertEquals(20, pumpHistoryEntries.size.toLong())
     }
 
-
-    @Test
-    public void historyProblem_423_duzy78() throws Exception {
-        List<PumpHistoryEntry> pumpHistoryEntries = readAndParseHistoryPage("16 00 08 D0 0E 51 15 33 60 0A D0 0E 51 15 00 16 01 0A D0 0E 51 15 33 00 07 DF 0E 51 15 00 16 00 07 DF 0E 51 15 33 6C 09 DF 0E 51 15 00 16 01 09 DF 0E 51 15 33 00 25 ED 0E 51 15 00 16 00 25 ED 0E 51 15 33 2C 27 ED 0E 51 15 00 16 01 27 ED 0E 51 15 33 00 07 F4 0E 51 15 00 16 00 07 F4 0E 51 15 33 00 09 F4 0E 51 15 00 16 01 09 F4 0E 51 15 33 2C 25 D5 0F 51 15 00 16 01 25 D5 0F 51 15 01 3C 3C 00 30 D5 4F 51 15 33 2C 25 F7 0F 51 15 00 16 01 25 F7 0F 51 15 33 00 07 C6 10 51 15 00 16 00 07 C6 10 51 15 33 30 09 C6 10 51 15 00 16 01 09 C6 10 51 15 33 30 25 E8 10 51 15 00 16 01 25 E8 10 51 15 33 30 24 CF 11 51 15 00 16 01 24 CF 11 51 15 33 00 23 E4 11 51 15 00 16 00 23 E4 11 51 15 33 3C 25 E4 11 51 15 00 16 01 25 E4 11 51 15 33 00 23 E8 11 51 15 00 16 00 23 E8 11 51 15 33 4A 25 E8 11 51 15 00 16 01 25 E8 11 51 15 33 00 19 EE 11 51 15 00 16 00 19 EE 11 51 15 33 30 1B EE 11 51 15 00 16 01 1B EE 11 51 15 33 00 23 F2 11 51 15 00 16 00 23 F2 11 51 15 33 3E 25 F2 11 51 15 00 16 01 25 F2 11 51 15 33 00 24 C0 12 51 15 00 16 00 24 C0 12 51 15 33 5E 25 C0 12 51 15 00 16 01 25 C0 12 51 15 33 00 23 CF 12 51 15 00 16 00 23 CF 12 51 15 33 64 25 CF 12 51 15 00 16 01 25 CF 12 51 15 33 00 23 D9 12 51 15 00 16 00 23 D9 12 51 15 33 6A 25 D9 12 51 15 00 16 01 25 D9 12 51 15 33 00 23 E9 12 51 15 00 16 00 23 E9 12 51 15 33 30 25 E9 12 51 15 00 16 01 25 E9 12 51 15 01 16 16 00 10 C2 53 51 15 33 30 24 CF 13 51 15 00 16 01 24 CF 13 51 15 33 30 04 EE 13 51 15 00 16 01 04 EE 13 51 15 01 14 14 00 3B F0 53 51 15 33 00 22 C0 14 51 15 00 16 00 22 C0 14 51 15 33 22 24 C0 14 51 15 00 16 01 24 C0 14 51 15 33 22 03 DF 14 51 15 00 16 01 03 DF 14 51 15 1E 00 37 E1 14 11 15 1F 00 01 EE 14 11 15 33 22 03 C6 15 51 15 00 16 01 03 C6 15 51 15 33 00 20 D9 15 51 15 00 16 00 20 D9 15 51 15 33 34 22 D9 15 51 15 00 16 01 22 D9 15 51 15 39 14 0E DF 35 71 15 83 92 40 01 0B 0B 00 37 E0 55 51 15 33 00 21 E3 15 51 15 00 16 00 21 E3 15 51 15 33 22 22 E3 15 51 15 00 16 01 22 E3 15 51 15 33 00 21 E8 15 51 15 00 16 00 21 E8 15 51 15 33 30 23 E8 15 51 15 00 16 01 23 E8 15 51 15 33 00 20 ED 15 51 15 00 16 00 20 ED 15 51 15 33 22 22 ED 15 51 15 00 16 01 22 ED 15 51 15 33 00 03 F8 15 51 15 00 16 00 03 F8 15 51 15 33 32 05 F8 15 51 15 00 16 01 05 F8 15 51 15 33 00 01 CB 16 51 15 00 16 00 01 CB 16 51 15 33 20 03 CB 16 51 15 00 16 01 03 CB 16 51 15 33 2A 20 ED 16 51 15 00 16 01 20 ED 16 51 15 33 00 02 F8 16 51 15 00 16 00 02 F8 16 51 15 33 2C 04 F8 16 51 15 00 16 01 04 F8 16 51 15 33 00 1F CA 17 51 15 00 16 00 1F CA 17 51 15 33 34 21 CA 17 51 15 00 16 01 21 CA 17 51 15 33 00 1F D4 17 51 15 00 16 00 1F D4 17 51 15 33 38 21 D4 17 51 15 00 16 01 21 D4 17 51 15 33 00 15 EE 17 51 15 00 16 00 15 EE 17 51 15 33 42 17 EE 17 51 15 00 16 01 17 EE 17 51 15 07 00 00 08 0A 31 95 6C 31 95 05 00 A1 A1 A1 01 00 00 08 0A 04 8E 39 03 7C 2B 00 00 03 7C 2B 00 00 00 00 00 00 03 7C 64 07 00 00 00 07 33 00 05 C1 00 52 15 00 16 00 05 C1 00 52 15 33 50 07 C1 00 52 15 00 16 01 07 C1 00 52 15 33 00 01 CB 00 52 15 00 16 00 01 CB 00 52 15 33 26 03 CB 00 52 15 00 16 01 03 CB 00 52 15 33 00 1E DE 00 52 15 00 00 00 8F 0E",
-                MedtronicDeviceType.Medtronic_515_715);
-
-        Assert.assertEquals(131, pumpHistoryEntries.size());
+    @Test @Throws(Exception::class) fun historyProblem_423_duzy78() {
+        val pumpHistoryEntries = readAndParseHistoryPage(
+            "16 00 08 D0 0E 51 15 33 60 0A D0 0E 51 15 00 16 01 0A D0 0E 51 15 33 00 07 DF 0E 51 15 00 16 00 07 DF 0E 51 15 33 6C 09 DF 0E 51 15 00 16 01 09 DF 0E 51 15 33 00 25 ED 0E 51 15 00 16 00 25 ED 0E 51 15 33 2C 27 ED 0E 51 15 00 16 01 27 ED 0E 51 15 33 00 07 F4 0E 51 15 00 16 00 07 F4 0E 51 15 33 00 09 F4 0E 51 15 00 16 01 09 F4 0E 51 15 33 2C 25 D5 0F 51 15 00 16 01 25 D5 0F 51 15 01 3C 3C 00 30 D5 4F 51 15 33 2C 25 F7 0F 51 15 00 16 01 25 F7 0F 51 15 33 00 07 C6 10 51 15 00 16 00 07 C6 10 51 15 33 30 09 C6 10 51 15 00 16 01 09 C6 10 51 15 33 30 25 E8 10 51 15 00 16 01 25 E8 10 51 15 33 30 24 CF 11 51 15 00 16 01 24 CF 11 51 15 33 00 23 E4 11 51 15 00 16 00 23 E4 11 51 15 33 3C 25 E4 11 51 15 00 16 01 25 E4 11 51 15 33 00 23 E8 11 51 15 00 16 00 23 E8 11 51 15 33 4A 25 E8 11 51 15 00 16 01 25 E8 11 51 15 33 00 19 EE 11 51 15 00 16 00 19 EE 11 51 15 33 30 1B EE 11 51 15 00 16 01 1B EE 11 51 15 33 00 23 F2 11 51 15 00 16 00 23 F2 11 51 15 33 3E 25 F2 11 51 15 00 16 01 25 F2 11 51 15 33 00 24 C0 12 51 15 00 16 00 24 C0 12 51 15 33 5E 25 C0 12 51 15 00 16 01 25 C0 12 51 15 33 00 23 CF 12 51 15 00 16 00 23 CF 12 51 15 33 64 25 CF 12 51 15 00 16 01 25 CF 12 51 15 33 00 23 D9 12 51 15 00 16 00 23 D9 12 51 15 33 6A 25 D9 12 51 15 00 16 01 25 D9 12 51 15 33 00 23 E9 12 51 15 00 16 00 23 E9 12 51 15 33 30 25 E9 12 51 15 00 16 01 25 E9 12 51 15 01 16 16 00 10 C2 53 51 15 33 30 24 CF 13 51 15 00 16 01 24 CF 13 51 15 33 30 04 EE 13 51 15 00 16 01 04 EE 13 51 15 01 14 14 00 3B F0 53 51 15 33 00 22 C0 14 51 15 00 16 00 22 C0 14 51 15 33 22 24 C0 14 51 15 00 16 01 24 C0 14 51 15 33 22 03 DF 14 51 15 00 16 01 03 DF 14 51 15 1E 00 37 E1 14 11 15 1F 00 01 EE 14 11 15 33 22 03 C6 15 51 15 00 16 01 03 C6 15 51 15 33 00 20 D9 15 51 15 00 16 00 20 D9 15 51 15 33 34 22 D9 15 51 15 00 16 01 22 D9 15 51 15 39 14 0E DF 35 71 15 83 92 40 01 0B 0B 00 37 E0 55 51 15 33 00 21 E3 15 51 15 00 16 00 21 E3 15 51 15 33 22 22 E3 15 51 15 00 16 01 22 E3 15 51 15 33 00 21 E8 15 51 15 00 16 00 21 E8 15 51 15 33 30 23 E8 15 51 15 00 16 01 23 E8 15 51 15 33 00 20 ED 15 51 15 00 16 00 20 ED 15 51 15 33 22 22 ED 15 51 15 00 16 01 22 ED 15 51 15 33 00 03 F8 15 51 15 00 16 00 03 F8 15 51 15 33 32 05 F8 15 51 15 00 16 01 05 F8 15 51 15 33 00 01 CB 16 51 15 00 16 00 01 CB 16 51 15 33 20 03 CB 16 51 15 00 16 01 03 CB 16 51 15 33 2A 20 ED 16 51 15 00 16 01 20 ED 16 51 15 33 00 02 F8 16 51 15 00 16 00 02 F8 16 51 15 33 2C 04 F8 16 51 15 00 16 01 04 F8 16 51 15 33 00 1F CA 17 51 15 00 16 00 1F CA 17 51 15 33 34 21 CA 17 51 15 00 16 01 21 CA 17 51 15 33 00 1F D4 17 51 15 00 16 00 1F D4 17 51 15 33 38 21 D4 17 51 15 00 16 01 21 D4 17 51 15 33 00 15 EE 17 51 15 00 16 00 15 EE 17 51 15 33 42 17 EE 17 51 15 00 16 01 17 EE 17 51 15 07 00 00 08 0A 31 95 6C 31 95 05 00 A1 A1 A1 01 00 00 08 0A 04 8E 39 03 7C 2B 00 00 03 7C 2B 00 00 00 00 00 00 03 7C 64 07 00 00 00 07 33 00 05 C1 00 52 15 00 16 00 05 C1 00 52 15 33 50 07 C1 00 52 15 00 16 01 07 C1 00 52 15 33 00 01 CB 00 52 15 00 16 00 01 CB 00 52 15 33 26 03 CB 00 52 15 00 16 01 03 CB 00 52 15 33 00 1E DE 00 52 15 00 00 00 8F 0E",
+            MedtronicDeviceType.Medtronic_515_715
+        )
+        Assert.assertEquals(131, pumpHistoryEntries.size.toLong())
     }
 
-    @Test
-    public void historyProblem_476_OpossumGit() throws Exception {
-        List<PumpHistoryEntry> pumpHistoryEntries = readAndParseHistoryPage("08 07 50 05 0D 4D 15 00 18 00 08 14 00 0E 10 00 14 08 00 1E 12 00 26 16 00 2B 1A 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 09 18 50 05 0D 4D 15 00 18 00 02 18 00 04 18 00 06 18 00 08 14 00 0A 14 00 0C 14 00 0E 10 00 10 10 00 12 10 00 14 08 00 16 08 00 18 08 00 1A 08 00 1C 08 00 1E 14 00 20 14 00 22 14 00 24 14 00 26 16 00 28 16 00 2A 16 00 2C 1C 00 2E 1C 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 01 04 04 00 44 09 4D 4D 15 33 06 57 15 0D 4D 15 00 16 01 57 15 0D 4D 15 33 00 77 15 0D 4D 15 00 16 00 77 15 0D 4D 15 33 00 5D 16 0D 4D 15 00 16 04 5D 16 0D 4D 15 33 00 61 1A 0D 4D 15 00 16 00 61 1A 0D 4D 15 5D 00 5E 31 0D 0D 15 1A 00 6E 31 0D 0D 15 06 03 04 D2 6E 31 6D 0D 15 0C 03 11 40 00 01 05 64 01 13 40 00 01 05 17 00 0A 41 00 01 05 18 00 40 39 15 0D 15 21 00 53 04 16 0D 15 03 00 00 00 58 57 09 36 0D 15 5D 01 78 0A 16 0D 15 64 01 78 0A 16 8D 15 2C 68 78 0A 16 8D 15 24 3C 78 0A 16 8D 15 63 02 78 0A 16 8D 15 1B 12 78 0A 16 8D 15 65 61 78 0A 16 8D 15 61 00 78 0A 16 8D 15 32 0E 78 0A 16 8D 15 66 00 78 0A 16 8D 15 3C 01 78 0A 16 8D 15 3D 88 32 93 00 00 00 3E 00 00 00 00 00 00 26 01 78 0A 16 8D 15 27 01 B2 08 00 00 00 28 00 00 00 00 00 00 60 00 78 0A 16 4D 15 23 00 78 0A 16 8D 15 5E 01 78 0A 16 8D 15 2D 01 78 0A 16 8D 15 5A 0F 78 0A 16 8D 15 49 13 00 07 12 0A 1E 0B 2A 0A 00 00 00 00 00 00 00 00 00 23 08 27 2C 23 00 00 00 00 00 00 00 00 00 00 00 32 41 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 49 13 00 07 12 0A 1E 0B 2A 0A 00 00 00 00 00 00 00 00 00 23 08 27 2C 23 00 00 00 00 00 00 00 00 00 00 00 32 41 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 22 62 00 78 0A 16 8D 15 5F 51 78 0A 16 8D 15 4F 00 78 0A 16 8D 15 40 01 00 6F 1C 16 1E 00 3C 14 00 1E 3C 1F 15 70 40 01 00 6F 1C 16 1E 00 3C 14 00 1E 3C 1F 15 70 08 18 78 0A 16 8D 15 00 18 00 02 18 00 04 18 00 06 18 00 08 14 00 0A 14 00 0C 14 00 0E 10 00 10 10 00 12 10 00 14 08 00 16 08 00 18 08 00 1A 08 00 1C 08 00 1E 14 00 20 14 00 22 14 00 24 14 00 26 16 00 28 16 00 2A 16 00 2C 1C 00 2E 1C 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 D6 06",
-                MedtronicDeviceType.Medtronic_522_722);
-
-        Assert.assertEquals(41, pumpHistoryEntries.size());
+    @Test @Throws(Exception::class) fun historyProblem_476_OpossumGit() {
+        val pumpHistoryEntries = readAndParseHistoryPage(
+            "08 07 50 05 0D 4D 15 00 18 00 08 14 00 0E 10 00 14 08 00 1E 12 00 26 16 00 2B 1A 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 09 18 50 05 0D 4D 15 00 18 00 02 18 00 04 18 00 06 18 00 08 14 00 0A 14 00 0C 14 00 0E 10 00 10 10 00 12 10 00 14 08 00 16 08 00 18 08 00 1A 08 00 1C 08 00 1E 14 00 20 14 00 22 14 00 24 14 00 26 16 00 28 16 00 2A 16 00 2C 1C 00 2E 1C 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 01 04 04 00 44 09 4D 4D 15 33 06 57 15 0D 4D 15 00 16 01 57 15 0D 4D 15 33 00 77 15 0D 4D 15 00 16 00 77 15 0D 4D 15 33 00 5D 16 0D 4D 15 00 16 04 5D 16 0D 4D 15 33 00 61 1A 0D 4D 15 00 16 00 61 1A 0D 4D 15 5D 00 5E 31 0D 0D 15 1A 00 6E 31 0D 0D 15 06 03 04 D2 6E 31 6D 0D 15 0C 03 11 40 00 01 05 64 01 13 40 00 01 05 17 00 0A 41 00 01 05 18 00 40 39 15 0D 15 21 00 53 04 16 0D 15 03 00 00 00 58 57 09 36 0D 15 5D 01 78 0A 16 0D 15 64 01 78 0A 16 8D 15 2C 68 78 0A 16 8D 15 24 3C 78 0A 16 8D 15 63 02 78 0A 16 8D 15 1B 12 78 0A 16 8D 15 65 61 78 0A 16 8D 15 61 00 78 0A 16 8D 15 32 0E 78 0A 16 8D 15 66 00 78 0A 16 8D 15 3C 01 78 0A 16 8D 15 3D 88 32 93 00 00 00 3E 00 00 00 00 00 00 26 01 78 0A 16 8D 15 27 01 B2 08 00 00 00 28 00 00 00 00 00 00 60 00 78 0A 16 4D 15 23 00 78 0A 16 8D 15 5E 01 78 0A 16 8D 15 2D 01 78 0A 16 8D 15 5A 0F 78 0A 16 8D 15 49 13 00 07 12 0A 1E 0B 2A 0A 00 00 00 00 00 00 00 00 00 23 08 27 2C 23 00 00 00 00 00 00 00 00 00 00 00 32 41 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 49 13 00 07 12 0A 1E 0B 2A 0A 00 00 00 00 00 00 00 00 00 23 08 27 2C 23 00 00 00 00 00 00 00 00 00 00 00 32 41 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 22 62 00 78 0A 16 8D 15 5F 51 78 0A 16 8D 15 4F 00 78 0A 16 8D 15 40 01 00 6F 1C 16 1E 00 3C 14 00 1E 3C 1F 15 70 40 01 00 6F 1C 16 1E 00 3C 14 00 1E 3C 1F 15 70 08 18 78 0A 16 8D 15 00 18 00 02 18 00 04 18 00 06 18 00 08 14 00 0A 14 00 0C 14 00 0E 10 00 10 10 00 12 10 00 14 08 00 16 08 00 18 08 00 1A 08 00 1C 08 00 1E 14 00 20 14 00 22 14 00 24 14 00 26 16 00 28 16 00 2A 16 00 2C 1C 00 2E 1C 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 D6 06",
+            MedtronicDeviceType.Medtronic_522_722
+        )
+        Assert.assertEquals(41, pumpHistoryEntries.size.toLong())
     }
 
-
-    private List<PumpHistoryEntry> readAndParseHistoryPage(String historyPageString, MedtronicDeviceType medtronicDeviceType) throws Exception {
-        byte[] historyPageData = ByteUtil.createByteArrayFromString(historyPageString);
-
-        aapsLogger.debug("History Page Length:" + historyPageData.length);
-
-        medtronicUtil.setMedtronicPumpModel(medtronicDeviceType);
-
-        RawHistoryPage historyPage = new RawHistoryPage(aapsLogger);
-        historyPage.appendData(historyPageData);
-
-        List<PumpHistoryEntry> pumpHistoryEntries = decoder.processPageAndCreateRecords(historyPage);
-
-        displayHistoryRecords(pumpHistoryEntries);
-
-        return pumpHistoryEntries;
+    @Throws(Exception::class)
+    private fun readAndParseHistoryPage(
+        historyPageString: String,
+        medtronicDeviceType: MedtronicDeviceType
+    ): List<PumpHistoryEntry> {
+        val historyPageData = ByteUtil.createByteArrayFromString(historyPageString)
+        aapsLogger.debug("History Page Length:" + historyPageData.size)
+        medtronicUtil!!.medtronicPumpModel = medtronicDeviceType
+        medtronicUtil!!.isModelSet = true
+        val historyPage = RawHistoryPage(aapsLogger)
+        historyPage.appendData(historyPageData)
+        val pumpHistoryEntries: List<PumpHistoryEntry> =
+            decoder!!.processPageAndCreateRecords(historyPage)
+        displayHistoryRecords(pumpHistoryEntries)
+        return pumpHistoryEntries
     }
 
-
-    private void displayHistoryRecords(List<PumpHistoryEntry> pumpHistoryEntries) {
-        aapsLogger.debug("PumpHistoryEntries: " + pumpHistoryEntries.size());
-
-        for (PumpHistoryEntry pumpHistoryEntry : pumpHistoryEntries) {
-            aapsLogger.debug(pumpHistoryEntry.toString());
+    private fun displayHistoryRecords(pumpHistoryEntries: List<PumpHistoryEntry>) {
+        aapsLogger.debug("PumpHistoryEntries: " + pumpHistoryEntries.size)
+        for (pumpHistoryEntry in pumpHistoryEntries) {
+            aapsLogger.debug(pumpHistoryEntry.toString())
         }
     }
-
-
-}
+}
\ No newline at end of file
diff --git a/medtronic/src/test/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/pump/PumpHistoryEntryUTest.java b/medtronic/src/test/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/pump/PumpHistoryEntryUTest.java
index af8c7b0d0a..043a2fdd86 100644
--- a/medtronic/src/test/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/pump/PumpHistoryEntryUTest.java
+++ b/medtronic/src/test/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/pump/PumpHistoryEntryUTest.java
@@ -16,7 +16,7 @@ public class PumpHistoryEntryUTest {
         long queryObject = 20191009000000L;
 
         PumpHistoryEntry phe = new PumpHistoryEntry();
-        phe.atechDateTime = dateObject;
+        phe.setAtechDateTime(dateObject);
 
         Assert.assertTrue(phe.isAfter(queryObject));
     }
diff --git a/omnipod-common/build.gradle b/omnipod-common/build.gradle
index 19430b670c..6c5d9d7776 100644
--- a/omnipod-common/build.gradle
+++ b/omnipod-common/build.gradle
@@ -2,18 +2,13 @@
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-kapt'
+apply plugin: 'kotlin-allopen'
 apply plugin: 'com.hiya.jacoco-android'
 
 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"
-
-android {
-    defaultConfig {
-        versionCode 1
-        versionName "1.0"
-    }
-}
+apply from: "${project.rootDir}/gradle/jacoco_global.gradle"
 
 dependencies {
     implementation project(':core')
diff --git a/core/src/main/java/info/nightscout/androidaps/db/OmnipodHistoryRecord.java b/omnipod-common/src/main/java/info/nightscout/androidaps/db/OmnipodHistoryRecord.java
similarity index 95%
rename from core/src/main/java/info/nightscout/androidaps/db/OmnipodHistoryRecord.java
rename to omnipod-common/src/main/java/info/nightscout/androidaps/db/OmnipodHistoryRecord.java
index 0f4b56b096..584f6cc150 100644
--- a/core/src/main/java/info/nightscout/androidaps/db/OmnipodHistoryRecord.java
+++ b/omnipod-common/src/main/java/info/nightscout/androidaps/db/OmnipodHistoryRecord.java
@@ -9,7 +9,7 @@ import info.nightscout.androidaps.plugins.pump.common.utils.DateTimeUtil;
  * Created by andy on 30.11.2019.
  */
 @DatabaseTable(tableName = "PodHistory")
-public class OmnipodHistoryRecord implements DbObjectBase, Comparable<OmnipodHistoryRecord> {
+public class OmnipodHistoryRecord implements Comparable<OmnipodHistoryRecord> {
 
     @DatabaseField(id = true)
     public long date;
@@ -42,7 +42,6 @@ public class OmnipodHistoryRecord implements DbObjectBase, Comparable<OmnipodHis
         generatePumpId();
     }
 
-    @Override
     public long getDate() {
         return this.date;
     }
@@ -91,7 +90,6 @@ public class OmnipodHistoryRecord implements DbObjectBase, Comparable<OmnipodHis
         this.successConfirmed = successConfirmed;
     }
 
-    @Override
     public long getPumpId() {
         return pumpId;
     }
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..d3c0ac8aaa 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,21 @@ 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.disposables.CompositeDisposable
+import io.reactivex.rxkotlin.addTo
+import io.reactivex.rxkotlin.plusAssign
+import io.reactivex.rxkotlin.subscribeBy
 
-abstract class ActionViewModelBase : ViewModelBase() {
+abstract class ActionViewModelBase(
+    protected val injector: HasAndroidInjector,
+    protected val logger: AAPSLogger
+) : ViewModelBase() {
+    protected val disposable = CompositeDisposable()
 
     private val _isActionExecutingLiveData = MutableLiveData(false)
     val isActionExecutingLiveData: LiveData<Boolean> = _isActionExecutingLiveData
@@ -16,14 +26,24 @@ abstract class ActionViewModelBase : ViewModelBase() {
 
     fun executeAction() {
         _isActionExecutingLiveData.postValue(true)
-        SingleSubject.fromCallable(this::doExecuteAction)
-            .subscribeOn(Schedulers.io())
-            .doOnSuccess { result ->
+        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
+    override fun onCleared() {
+        super.onCleared()
+        disposable.clear()
+    }
+
+
+    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-cs-rCZ/strings.xml b/omnipod-common/src/main/res/values-cs-rCZ/strings.xml
index bb5e830b06..a3c487cd99 100644
--- a/omnipod-common/src/main/res/values-cs-rCZ/strings.xml
+++ b/omnipod-common/src/main/res/values-cs-rCZ/strings.xml
@@ -111,6 +111,10 @@
     <string name="omnipod_common_preferences_category_other">Jiné</string>
     <string name="omnipod_common_preferences_category_alerts">Výstrahy</string>
     <string name="omnipod_common_preferences_category_confirmation_beeps">Potvrzovací pípnutí</string>
+    <string name="omnipod_common_preferences_category_notifications">Oznámení</string>
+    <string name="omnipod_common_preferences_notification_uncertain_tbr_sound_enabled">Zvuk pro nejistý dočasný bazál povolen</string>
+    <string name="omnipod_common_preferences_notification_uncertain_smb_sound_enabled">Zvuk oznámení pro nejisté SMB povoleno</string>
+    <string name="omnipod_common_preferences_notification_uncertain_bolus_sound_enabled">Zvuk oznámení pro nejistý bolus povolen</string>
     <!-- Omnipod - Pod Status -->
     <string name="omnipod_common_pod_status_no_active_pod">Žádný aktivní Pod</string>
     <string name="omnipod_common_pod_status_waiting_for_activation">Probíhá nastavování (čeká se na aktivaci Podu)</string>
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-fr-rFR/strings.xml b/omnipod-common/src/main/res/values-fr-rFR/strings.xml
index d4b1b4f9b8..5d0849d85f 100644
--- a/omnipod-common/src/main/res/values-fr-rFR/strings.xml
+++ b/omnipod-common/src/main/res/values-fr-rFR/strings.xml
@@ -111,6 +111,10 @@
     <string name="omnipod_common_preferences_category_other">Autres</string>
     <string name="omnipod_common_preferences_category_alerts">Alertes</string>
     <string name="omnipod_common_preferences_category_confirmation_beeps">Bips de confirmation</string>
+    <string name="omnipod_common_preferences_category_notifications">Notifications</string>
+    <string name="omnipod_common_preferences_notification_uncertain_tbr_sound_enabled">Son pour les notifications DBT incertains activé</string>
+    <string name="omnipod_common_preferences_notification_uncertain_smb_sound_enabled">Son pour les notifications SMB incertains activé</string>
+    <string name="omnipod_common_preferences_notification_uncertain_bolus_sound_enabled">Son pour les notifications bolus incertains activé</string>
     <!-- Omnipod - Pod Status -->
     <string name="omnipod_common_pod_status_no_active_pod">Pas de Pod actif</string>
     <string name="omnipod_common_pod_status_waiting_for_activation">Configuration en cours (en attente d\'activation du Pod)</string>
@@ -127,7 +131,7 @@
     <string name="omnipod_common_cmd_set_bolus">Définir Bolus</string>
     <string name="omnipod_common_cmd_cancel_bolus">Annuler Bolus</string>
     <string name="omnipod_common_cmd_set_tbr">Définir Basal Temporaire</string>
-    <string name="omnipod_common_cmd_cancel_tbr_by_driver">Annulation basal temp. (en interne par le pilote)</string>
+    <string name="omnipod_common_cmd_cancel_tbr_by_driver">Annulation basal temp (en interne par le pilote)</string>
     <string name="omnipod_common_cmd_cancel_tbr">Annuler basal temporaire</string>
     <string name="omnipod_common_cmd_set_basal_schedule">Définir le profil de basal</string>
     <string name="omnipod_common_cmd_get_pod_status">Obtenir l\'état du Pod</string>
diff --git a/omnipod-common/src/main/res/values-it-rIT/strings.xml b/omnipod-common/src/main/res/values-it-rIT/strings.xml
index deb65859b5..4bb95f407b 100644
--- a/omnipod-common/src/main/res/values-it-rIT/strings.xml
+++ b/omnipod-common/src/main/res/values-it-rIT/strings.xml
@@ -111,6 +111,8 @@
     <string name="omnipod_common_preferences_category_other">Altro</string>
     <string name="omnipod_common_preferences_category_alerts">Avvisi</string>
     <string name="omnipod_common_preferences_category_confirmation_beeps">BIP di conferma</string>
+    <string name="omnipod_common_preferences_category_notifications">Notifiche</string>
+    <string name="omnipod_common_preferences_notification_uncertain_tbr_sound_enabled">Suono notifiche TBR incerto abilitato</string>
     <!-- Omnipod - Pod Status -->
     <string name="omnipod_common_pod_status_no_active_pod">Nessun pod attivo</string>
     <string name="omnipod_common_pod_status_waiting_for_activation">Configurazione in corso (attesa attivazione pod)</string>
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-lt-rLT/strings.xml b/omnipod-common/src/main/res/values-lt-rLT/strings.xml
index e35fcaa95a..f1350859d8 100644
--- a/omnipod-common/src/main/res/values-lt-rLT/strings.xml
+++ b/omnipod-common/src/main/res/values-lt-rLT/strings.xml
@@ -2,17 +2,198 @@
 <resources>
     <!-- Omnipod - Keys -->
     <!-- Omnipod - Pod Management -->
+    <string name="omnipod_common_pod_management_title">Pod valdymas</string>
+    <string name="omnipod_common_pod_management_heading_actions">Veiksmai</string>
+    <string name="omnipod_common_pod_management_heading_tools">Įrankiai</string>
+    <string name="omnipod_common_pod_management_button_activate_pod">Aktyvuoti Pod</string>
+    <string name="omnipod_common_pod_management_button_deactivate_pod">Išjungti Pod</string>
+    <string name="omnipod_common_pod_management_button_discard_pod">Išmesti Pod</string>
+    <string name="omnipod_common_pod_management_discard_pod_confirmation">Jei išmesite Pod, ryšio su juo nebebus galima atkurti. Darykite tai tik tada, kai pastoviai nepavyksta užmegzti ryšio. Jei ryšys visgi yra, naudokite <b>Deaktyvuoti Pod</b> funkciją. \n\nJei norite tęsti, pašalinkite Pod nuo savo kūno!</string>
+    <string name="omnipod_common_pod_management_button_play_test_beep">Paleisti bandomąjį signalą</string>
+    <string name="omnipod_common_pod_management_button_playing_test_beep">Bandomasis signalas paleistas…</string>
+    <string name="omnipod_common_pod_management_button_pod_history">Pod istorija</string>
     <!-- Omnipod - Error -->
+    <string name="omnipod_common_error_pod_not_attached">Nėra aktyvaus Pod</string>
+    <string name="omnipod_common_error_set_basal_failed">Nepavyko nustatyti bazės profilio.</string>
+    <string name="omnipod_common_error_bolus_did_not_succeed">Bolusas nepavyko.</string>
+    <string name="omnipod_common_error_failed_to_set_profile_empty_profile">Nepavyko nustatyti bazinio profilio: gautas tuščias profilis. Įsitikinkite, kad aktyvavote savo bazės profilį.</string>
+    <string name="omnipod_common_error_set_initial_basal_schedule_no_profile">Nėra aktyvaus profilio. Įsitikinkite, kad bazės profilis aktyvuotas.</string>
+    <string name="omnipod_common_error_unsupported_custom_command">Nepalaikoma pasirinktinė komanda: %1$s</string>
+    <string name="omnipod_common_error_failed_to_refresh_status">Nepavyko atnaujinti būsenos</string>
+    <string name="omnipod_common_error_failed_to_refresh_status_on_startup">Nepavyko atnaujinti būsenos paleidžiant</string>
+    <string name="omnipod_common_error_failed_to_silence_alerts">Nepavyko nutildyti įspėjimų</string>
+    <string name="omnipod_common_error_failed_to_suspend_delivery">Nepavyko sustabdyti suleidimo</string>
+    <string name="omnipod_common_error_failed_to_set_time">Nepavyko nustatyti laiko</string>
+    <string name="omnipod_common_error_failed_to_resume_delivery">Nepavyko atnaujinti suleidimo</string>
+    <string name="omnipod_common_error_failed_to_initialize_pod">Nepavyko inicijuoti Pod</string>
+    <string name="omnipod_common_error_failed_to_insert_cannula">Nepavyko įvesti kaniulės</string>
+    <string name="omnipod_common_error_pod_fault_activation_time_exceeded">Pod aktyvavimo laikas buvo viršytas. Šis Pod nebegali būti aktyvuotas.</string>
+    <string name="omnipod_common_error_failed_to_verify_activation_progress">Nepavyko patvirtinti aktyvinimo eigos. Pabandykite pakartoti.</string>
+    <string name="omnipod_common_error_pod_suspended">Pod sustabdyta</string>
+    <string name="omnipod_common_error_failed_to_play_test_beep">Nepavyko paleisti bandomojo signalo</string>
+    <string name="omnipod_common_error_time_out_of_sync">Neatitinka laikas su Pod. Atnaujinkite laiką skirtuke Omnipod.</string>
+    <string name="omnipod_common_error_unexpected_exception">Įvyko netikėta klaida. Prašome pranešti! (%1$s: %2$s).</string>
     <!-- Omnipod - Confirmation -->
+    <string name="omnipod_common_confirmation">Patvirtinimas</string>
+    <string name="omnipod_common_confirmation_time_or_timezone_change">Laikas ir/ar laiko zona Pod pakeista.</string>
+    <string name="omnipod_common_confirmation_expiration_alerts_updated">Įspėjimo konfigūracija Pod atnaujinta.</string>
+    <string name="omnipod_common_confirmation_time_on_pod_updated">Laikas Pod buvo atnaujintas.</string>
+    <string name="omnipod_common_confirmation_suspended_delivery">Insulino suleidimas buvo sustabdytas.</string>
+    <string name="omnipod_common_confirmation_silenced_alerts">Aktyvūs perspėjimai buvo nutildyti.</string>
+    <string name="omnipod_common_confirmation_delivery_resumed">Insulino suleidimas atnaujintas.</string>
     <!-- Omnipod - Overview -->
+    <string name="omnipod_common_overview_button_set_time">Nustatyti laiką</string>
+    <string name="omnipod_common_overview_button_suspend_delivery">Sustabdyta</string>
+    <string name="omnipod_common_overview_button_resume_delivery">Atnaujinti suleidimą</string>
+    <string name="omnipod_common_overview_button_pod_management">Pod valdymas</string>
+    <string name="omnipod_common_overview_button_silence_alerts">Tylūs perpėjimai</string>
+    <string name="omnipod_common_overview_pod_status">Pod būklė</string>
+    <string name="omnipod_common_overview_total_delivered">Iš viso suleista</string>
+    <string name="omnipod_common_overview_total_delivered_value">%1$.2f vv</string>
+    <string name="omnipod_common_overview_pod_unique_id">Unikalus ID</string>
+    <string name="omnipod_common_overview_lot_number">LOT numeris</string>
+    <string name="omnipod_common_overview_pod_sequence_number">Eilės Nr.</string>
+    <string name="omnipod_common_overview_pod_expiry_date">Pod laikas pasibaigs</string>
+    <string name="omnipod_common_overview_last_connection">Paskutinis prisijungimas</string>
+    <string name="omnipod_common_overview_last_bolus">Paskutinis bolusas</string>
+    <string name="omnipod_common_overview_temp_basal_rate">Laikina valandinė bazė</string>
+    <string name="omnipod_common_overview_base_basal_rate">Pagrindinė valandinė bazė</string>
+    <string name="omnipod_common_overview_reservoir">Rezervuaras</string>
+    <string name="omnipod_common_overview_pod_active_alerts">Aktyvaus Pod signalai</string>
+    <string name="omnipod_common_overview_firmware_version">Programinės įrangos versija</string>
+    <string name="omnipod_common_overview_time_on_pod">Laikas Pod</string>
+    <string name="omnipod_common_overview_temp_basal_value">%1$.2fvv/val @%2$s (%3$d/%4$d min)</string>
+    <string name="omnipod_common_overview_reservoir_value">liko %1$.2f vv</string>
+    <string name="omnipod_common_overview_reservoir_value_over50">Liko daugiau nei 50 vv</string>
+    <string name="omnipod_common_overview_errors">Klaidos</string>
     <!-- Omnipod - Wizard Base -->
+    <string name="omnipod_common_wizard_button_cancel">Atšaukti</string>
+    <string name="omnipod_common_wizard_button_finish">Užbaigti</string>
+    <string name="omnipod_common_wizard_button_next">Kitas</string>
+    <string name="omnipod_common_wizard_button_retry">Bandyti dar kartą</string>
+    <string name="omnipod_common_wizard_button_deactivate_pod">Išjungti Pod</string>
+    <string name="omnipod_common_wizard_button_discard_pod">Išmesti Pod</string>
+    <string name="omnipod_common_wizard_exit_confirmation_text">Jūs dar nebaigėte visų veiksmų. Ar tikrai norite išeiti?</string>
+    <string name="omnipod_common_wizard_exit_confirmation_title">Išeiti</string>
     <!-- Omnipod - Pod Activation Wizard -->
+    <string name="omnipod_common_pod_activation_wizard_start_pod_activation_title">Užpildyti Pod</string>
+    <string name="omnipod_common_pod_activation_wizard_initialize_pod_title">Inicijuoti Pod</string>
+    <string name="omnipod_common_pod_activation_wizard_attach_pod_title">Prijunkite Pod</string>
+    <string name="omnipod_common_pod_activation_wizard_attach_pod_text">Paruoškite infuzijos vietą. Nuimkite adatos apsauginį dangtelį, pleistro apsaugą ir užklijuokite Pod ant infuzijos vietos.\n\nJei kaniulė atšoks, paspauskite <b>Atšaukti</b> ir pakeiskite Pod.\n\nSpauskite <b>Kitas</b>, norėdami įvesti kaniulę ir pradėti leisti insuliną.</string>
+    <string name="omnipod_common_pod_activation_wizard_attach_pod_confirm_insert_cannula_text">Kai paspausite <b>OK</b>, kaniulė bus įvesta. Įsitikinkite, kad prie infuzijos vietos pritvirtinote Pod.</string>
+    <string name="omnipod_common_pod_activation_wizard_insert_cannula_title">Įvesti kaniulę</string>
+    <string name="omnipod_common_pod_activation_wizard_insert_cannula_text">Mėginkite nustatyti pradinį bazės profilį ir įvesti kaniulę.\n\nKai kaniulė bus sėkmingai įvesta, galite paspausti <b>Kitas</b>.</string>
+    <string name="omnipod_common_pod_activation_wizard_pod_activated_title">Pod aktyvuotas</string>
+    <string name="omnipod_common_pod_activation_wizard_pod_activated_text">Naujasis Pod yra dabar aktyvus.\n\nJūsų bazės profilis yra suprogramuotas ir kaniulė įvesta.\n\nPatikrinkite, ar kaniulė buvo tinkamai įvesta, ir, jei jaučiate, kad taip nėra, pakeiskite Pod.</string>
     <!-- Omnipod - Pod Deactivation Wizard -->
+    <string name="omnipod_common_pod_deactivation_wizard_start_pod_deactivation_title">Išjungti Pod</string>
+    <string name="omnipod_common_pod_deactivation_wizard_start_pod_deactivation_text">Spustelėkite<b>Kitas</b>, kad išjungtumėte Pod.\n\n<b>Pastaba:</b> Tai sustabdys insulino leidimą ir išjungs Pod.</string>
+    <string name="omnipod_common_pod_deactivation_wizard_deactivating_pod_title">Pod išjungiamas</string>
+    <string name="omnipod_common_pod_deactivation_wizard_deactivating_pod_text">Pod išjungiamas.\n\nKai išjungimas bus sėkmingai baigtas, galite spustelėti <b>Kitas</b>.</string>
+    <string name="omnipod_common_pod_deactivation_wizard_pod_deactivated_title">Pod išjungtas</string>
+    <string name="omnipod_common_pod_deactivation_wizard_pod_deactivated_text">Pod išjungtas.\n\nNuimkite Pod nuo kūno ir jį išmeskite.</string>
+    <string name="omnipod_common_pod_deactivation_wizard_pod_discarded_title">Pod išmestas</string>
+    <string name="omnipod_common_pod_deactivation_wizard_pod_discarded_text">Pod statusas atmestas. Insulino tiekimas nesustabdytas, nes Pod nebuvo teisingai deaktyvuotas. \n\nPašalinkite Pod nuo savo kūno ir jį utilizuokite.</string>
+    <string name="omnipod_common_pod_deactivation_wizard_discard_pod_confirmation">Jei atmesite Pod, ryšio su juo nebebus galima užmegzti. Darykite tai tik tada, kai visi bandymai užmegzti ryšį nepavyksta. Ar esate tikras, kad norite atmesti Pod?</string>
+    <string name="omnipod_common_pod_deactivation_wizard_discard_pod">Išmesti Pod</string>
     <!-- Omnipod - Preferences -->
+    <string name="omnipod_common_preferences_bolus_beeps_enabled">Boluso signalai įjungti</string>
+    <string name="omnipod_common_preferences_basal_beeps_enabled">Bazės signalai įjungti</string>
+    <string name="omnipod_common_preferences_smb_beeps_enabled">SMB signalai įjungti</string>
+    <string name="omnipod_common_preferences_tbr_beeps_enabled">Laikinos bazės signalai įjungti</string>
+    <string name="omnipod_common_preferences_suspend_delivery_button_enabled">Omnipod skirtuke rodyti mygtuką Sustabdyti tiekimą</string>
+    <string name="omnipod_common_preferences_time_change_enabled">Vasaros laiko/Laiko juostos aptikimas įgalintas</string>
+    <string name="omnipod_common_preferences_expiration_reminder_enabled">Galiojimo pabaigos priminimas</string>
+    <string name="omnipod_common_preferences_expiration_reminder_hours_before_shutdown">Valandos prieš išsijungimą</string>
+    <string name="omnipod_common_preferences_low_reservoir_alert_enabled">Įgalintas įspėjimas apie žemą rezervuaro lygį</string>
+    <string name="omnipod_common_preferences_low_reservoir_alert_units">Vienetų skaičius</string>
+    <string name="omnipod_common_preferences_automatically_silence_alerts">Automatiškai nutildyti Pod perspėjimus</string>
+    <string name="omnipod_common_preferences_category_other">Kiti</string>
+    <string name="omnipod_common_preferences_category_alerts">Perspėjimai</string>
+    <string name="omnipod_common_preferences_category_confirmation_beeps">Patvirtinimo signalai</string>
     <!-- Omnipod - Pod Status -->
+    <string name="omnipod_common_pod_status_no_active_pod">Nėra aktyvaus Pod</string>
+    <string name="omnipod_common_pod_status_waiting_for_activation">Vykdomas nustatymas (laukiama Pod aktyvavimo)</string>
+    <string name="omnipod_common_pod_status_waiting_for_cannula_insertion">Vykdomas nustatymas (laukiama kaniulės įvedimo)</string>
+    <string name="omnipod_common_pod_status_running">Vykdoma</string>
+    <string name="omnipod_common_pod_status_suspended">Sustabdyta</string>
+    <string name="omnipod_common_pod_status_pod_fault">Pod klaida</string>
+    <string name="omnipod_common_pod_status_activation_time_exceeded">Viršytas aktyvinimo laikas</string>
+    <string name="omnipod_common_pod_status_inactive">Neaktyvus</string>
+    <string name="omnipod_common_pod_status_pod_fault_description">Pod klaida: %1$03d %2$s</string>
     <!-- Omnipod - Commands -->
+    <string name="omnipod_common_cmd_deactivate_pod">Išjungti Pod</string>
+    <string name="omnipod_common_cmd_discard_pod">Išmesti Pod</string>
+    <string name="omnipod_common_cmd_set_bolus">Nustatyti bolusą</string>
+    <string name="omnipod_common_cmd_cancel_bolus">Atšaukti bolusą</string>
+    <string name="omnipod_common_cmd_set_tbr">Nustatyti laikiną bazę</string>
+    <string name="omnipod_common_cmd_cancel_tbr_by_driver">Atšaukti laikiną bazę (vidinis valdiklis)</string>
+    <string name="omnipod_common_cmd_cancel_tbr">Atšaukti laikiną bazę</string>
+    <string name="omnipod_common_cmd_set_basal_schedule">Nustatyti bazės tvarkaraštį</string>
+    <string name="omnipod_common_cmd_get_pod_status">Gauti Pod būseną</string>
+    <string name="omnipod_common_cmd_get_pod_info">Gauti Pod informaciją</string>
+    <string name="omnipod_common_cmd_set_time">Nustatyti laiką</string>
+    <string name="omnipod_common_cmd_configure_alerts">Konfigūruoti perspėjimus</string>
+    <string name="omnipod_common_cmd_silence_alerts">Tylūs perpėjimai</string>
+    <string name="omnipod_common_cmd_suspend_delivery">Sustabdyti suleidimą</string>
+    <string name="omnipod_common_cmd_resume_delivery">Atnaujinti suleidimą</string>
+    <string name="omnipod_common_cmd_unknown_entry">Nežinomas Įrašas</string>
+    <string name="omnipod_common_cmd_initialize_pod">Inicijuoti Pod</string>
+    <string name="omnipod_common_cmd_insert_cannula">Įvesti kaniulę</string>
+    <string name="omnipod_common_cmd_read_pulse_log">Skaityti Pulse žurnalą</string>
+    <string name="omnipod_common_cmd_set_fake_suspended_tbr">Nustatykite netikrą laikiną bazę, nes Pod sustabdyta</string>
+    <string name="omnipod_common_cmd_cancel_fake_suspended_tbr">Atšaukite netikrą laikiną bazę, kuri buvo nustatyta dėl to, kad Pod buvo sustabdyta</string>
+    <string name="omnipod_common_cmd_split_tbr">Laikina bazė padalinta dėl nežinomos klaidos atšaukiant ją</string>
+    <string name="omnipod_common_cmd_beep_config">Signalo nustatymai</string>
+    <string name="omnipod_common_cmd_play_test_beep">Paleisti bandomąjį signalą</string>
     <!-- Omnipod - Alerts -->
+    <string name="omnipod_common_alert_finish_pairing_reminder">Priminimas apie suporavimo pabaigą</string>
+    <string name="omnipod_common_alert_finish_setup_reminder_reminder">Priminimas apie sąrankos pabaigą</string>
+    <string name="omnipod_common_alert_expiration">Pod galiojimas greitai baigsis</string>
+    <string name="omnipod_common_alert_expiration_advisory">Pod galiojimas greitai baigsis</string>
+    <string name="omnipod_common_alert_shutdown_imminent">Išjungimas yra neišvengiamas</string>
+    <string name="omnipod_common_alert_low_reservoir">Žemas rezervuaro lygis</string>
+    <string name="omnipod_common_alert_unknown_alert">Nežinomas perspėjimas</string>
     <!-- Omnipod - Short status -->
+    <string name="omnipod_common_short_status_no_active_pod">Nėra aktyvaus Pod</string>
+    <string name="omnipod_common_short_status_last_connection">Pask. prisijung.: prieš %1$d min</string>
+    <string name="omnipod_common_short_status_last_bolus">Pask.Bolusas: %1$s @ %2$s</string>
+    <string name="omnipod_common_short_status_temp_basal">Laik.bazė: %1$s</string>
+    <string name="omnipod_common_short_status_extended_bolus">Ištęstas: %1$s</string>
+    <string name="omnipod_common_short_status_reservoir">Rezerv: %1$svv</string>
     <!-- Omnipod - Other -->
+    <string name="omnipod_common_yes">Taip</string>
+    <string name="omnipod_common_no">Ne</string>
+    <string name="omnipod_common_ok">OK</string>
+    <string name="omnipod_common_cancel">Atšaukti</string>
+    <string name="omnipod_common_warning">Perspėjimas</string>
     <!-- Omnipod - Times -->
+    <string name="omnipod_common_moments_ago">Neseniai</string>
+    <string name="omnipod_common_less_than_a_minute_ago">Mažiau nei prieš minutę</string>
+    <string name="omnipod_common_composite_time">%1$s ir %2$s</string>
+    <string name="omnipod_common_time_ago">prieš %1$s</string>
+    <plurals name="omnipod_common_minutes">
+        <item quantity="one">%1$d min</item>
+        <item quantity="few">%1$d min</item>
+        <item quantity="many">%1$d min</item>
+        <item quantity="other">%1$d min</item>
+    </plurals>
+    <plurals name="omnipod_common_hours">
+        <item quantity="one">%1$d val</item>
+        <item quantity="few">%1$d val</item>
+        <item quantity="many">%1$d val</item>
+        <item quantity="other">%1$d val</item>
+    </plurals>
+    <plurals name="omnipod_common_days">
+        <item quantity="one">%1$d d.</item>
+        <item quantity="few">%1$d d.</item>
+        <item quantity="many">%1$d d.</item>
+        <item quantity="other">%1$d d.</item>
+    </plurals>
+    <plurals name="omnipod_common_pod_alerts">
+        <item quantity="one">Pod aliarmas: %1$s</item>
+        <item quantity="few">Pod aliarmai: %1$s</item>
+        <item quantity="many">Pod aliarmai: %1$s</item>
+        <item quantity="other">Pod aliarmai: %1$s</item>
+    </plurals>
 </resources>
diff --git a/omnipod-common/src/main/res/values-sk-rSK/strings.xml b/omnipod-common/src/main/res/values-sk-rSK/strings.xml
index afd53a9869..8be1c68069 100644
--- a/omnipod-common/src/main/res/values-sk-rSK/strings.xml
+++ b/omnipod-common/src/main/res/values-sk-rSK/strings.xml
@@ -111,6 +111,10 @@
     <string name="omnipod_common_preferences_category_other">Iné</string>
     <string name="omnipod_common_preferences_category_alerts">Výstrahy</string>
     <string name="omnipod_common_preferences_category_confirmation_beeps">Potvrdzovacie pípnutia</string>
+    <string name="omnipod_common_preferences_category_notifications">Notifikácie</string>
+    <string name="omnipod_common_preferences_notification_uncertain_tbr_sound_enabled">Zvuk upozornenia pre neistý dočasný bazál povolený</string>
+    <string name="omnipod_common_preferences_notification_uncertain_smb_sound_enabled">Zvuk upozornenia pre neistý SMB povolený</string>
+    <string name="omnipod_common_preferences_notification_uncertain_bolus_sound_enabled">Zvuk upozornenia pre neistý bolus povolený</string>
     <!-- Omnipod - Pod Status -->
     <string name="omnipod_common_pod_status_no_active_pod">Žiadny aktívny Pod</string>
     <string name="omnipod_common_pod_status_waiting_for_activation">Prebieha inštalácia (čaká sa na aktiváciu Podu)</string>
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 ea8c60af66..b9dd868a07 100644
--- a/omnipod-dash/build.gradle
+++ b/omnipod-dash/build.gradle
@@ -1,20 +1,31 @@
 apply plugin: 'com.android.library'
 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"
 
-android {
-    defaultConfig {
-        versionCode 1
-        versionName "1.0"
-    }
+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..4f49c6f4f1
--- /dev/null
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/OmnipodDashPumpPlugin.kt
@@ -0,0 +1,1409 @@
+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")
+
+            val err = createFakeTBRWhenNoActivePod()
+                .subscribeOn(aapsSchedulers.io)
+                .blockingGet()
+            err?.let {
+                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 285349495a..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,8 +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 {
+    // 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 0c23171639..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 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 7fcf8a8ece..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 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 b0341235c7..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 AlertSlot slot;
-    private boolean enabled;
-    private short durationInMinutes;
-    private boolean autoOff;
-    private AlertTriggerType triggerType;
-    private short offsetInMinutesOrThresholdInMicroLiters;
-    private BeepType beepType;
-    private 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..7669f176f7
--- /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.toInt() or (1 shl 3)).toByte()
+            }
+            if (trigger is AlertTrigger.ReservoirVolumeTrigger) {
+                firstByte = (firstByte.toInt() or (1 shl 2)).toByte()
+            }
+            if (autoOff) {
+                firstByte = (firstByte.toInt() 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 9e8b23cb74..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 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 2b290f96b5..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 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 ee750df520..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 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 7dc9618fb5..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 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 d6482386ee..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 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 88fb98b546..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 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 384ae11c0e..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 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 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 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 2c0703258a..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 byte messageType;
-    private short messageLength;
-    private short pulseVolumeInTenThousandthMicroLiter;
-    private short pumpRate;
-    private short primePumpRate;
-    private short numberOfEngagingClutchDrivePulses;
-    private short numberOfPrimePulses;
-    private short podExpirationTimeInHours;
-    private short firmwareVersionMajor;
-    private short firmwareVersionMinor;
-    private short firmwareVersionInterim;
-    private short bleVersionMajor;
-    private short bleVersionMinor;
-    private short bleVersionInterim;
-    private short productId;
-    private PodStatus podStatus;
-    private long lotNumber;
-    private long podSequenceNumber;
-    private 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..78f8c48d8d
--- /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,74 @@
+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.disposables.CompositeDisposable
+import io.reactivex.rxkotlin.addTo
+import io.reactivex.rxkotlin.plusAssign
+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
+
+            super.disposable += 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..a716d2b56b
--- /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,115 @@
+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.disposables.CompositeDisposable
+import io.reactivex.rxkotlin.addTo
+import io.reactivex.rxkotlin.plusAssign
+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
+
+            super.disposable += 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..a178c01d4f 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,18 @@
     <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>
+    <string name="omnipod_dash_overview_bluetooth_status">État Bluetooth</string>
+    <string name="omnipod_dash_overview_bluetooth_address">Adresse 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">Qualité de connexion</string>
+    <string name="omnipod_dash_overview_delivery_status">État de l\'injection</string>
+    <!-- Omnipod Dash - Pod Activation Wizard -->
+    <string name="omnipod_dash_pod_activation_wizard_start_pod_activation_text">Remplissez avec suffisamment d\'insuline pour 3 jours.\n\nVous devez entendre deux bips lors du remplissage du Pod. Ils indiquent que la quantité minimale de 85u a été ajouté. Assurez-vous de vider complètement la seringue de remplissage après avoir entendu les deux bips.\n\nAprès le remplissage du Pod, vous pouvez presser<b>Suivant</b>\n\n<b>Remarque :</b>N\'enlever pas la protection  de l\'aiguille du Pod à cette étape.</string>
+    <string name="omnipod_dash_pod_activation_wizard_initialize_pod_text">Tentative d\'appairage de d\'amorçage du nouveau Pod.\n\nUne fois le processus d\'initialisation terminé avec succès, vous pouvez appuyer sur <b>Suivant</b>.</string>
+    <string name="omnipod_common_preferences_notification_delivery_suspended_sound_enabled">Son activé en cas de notification de pause d\'injection</string>
+    <!-- Exceptions -->
+    <string name="omnipod_dash_failed_to_connect">Echec de connexion au pod</string>
+    <string name="omnipod_dash_found_too_many_pods">Trop de pods trouvés pour l\'activation</string>
+    <string name="omnipod_dash_scan_failed">Impossible de trouver un pod disponible pour l\'activation</string>
+    <string name="omnipod_dash_generic_error">Erreur générique : %1$s</string>
 </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..d2863c37b3 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,15 @@
     <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>
+    <string name="omnipod_dash_overview_bluetooth_status">Stato bluetooth</string>
+    <string name="omnipod_dash_overview_bluetooth_address">Indirizzo 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">Qualità connessione</string>
+    <string name="omnipod_dash_overview_delivery_status">Stato erogazione</string>
+    <!-- Omnipod Dash - Pod Activation Wizard -->
+    <!-- Exceptions -->
+    <string name="omnipod_dash_failed_to_connect">Impossibile connettersi al pod</string>
+    <string name="omnipod_dash_found_too_many_pods">Trovati troppi pod per l\'attivazione</string>
+    <string name="omnipod_dash_scan_failed">Nessun pod disponibile per l\'attivazione</string>
+    <string name="omnipod_dash_generic_error">Errore generico: %1$s</string>
 </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 c690568d07..a73633ba7b 100644
--- a/omnipod-dash/src/main/res/values-lt-rLT/strings.xml
+++ b/omnipod-dash/src/main/res/values-lt-rLT/strings.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <!-- Omnipod Dash - Description -->
+    <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 -->
+    <!-- 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 c690568d07..1cc58e3cd8 100644
--- a/omnipod-dash/src/main/res/values-nl-rNL/strings.xml
+++ b/omnipod-dash/src/main/res/values-nl-rNL/strings.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <!-- Omnipod Dash - Description -->
+    <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 -->
+    <!-- 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..bb75fed0a6 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,18 @@
     <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>
+    <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 pripojenia</string>
+    <string name="omnipod_dash_overview_delivery_status">Stav doručenia</string>
+    <!-- Omnipod Dash - Pod Activation Wizard -->
+    <string name="omnipod_dash_pod_activation_wizard_start_pod_activation_text">Naplňte nový Pod dostatkom inzulínu na 3 dni.\n\nČakajte na dve pípnutia z Podu v priebehu procesu plnenia. Tieto indikujú, že minimálne množstvo 85U bolo naplnené. Uistite sa, že striekačka je úplne vyprázdnená a to aj po vypočutí dvoch pípnutí.\n\nPo naplnení Podu, prosím, stlačte <b>Ďalšia</b>.\n\n<b>Poznámka:</b> zatiaľ nesnímajte kryt z ihly Podu.</string>
+    <string name="omnipod_dash_pod_activation_wizard_initialize_pod_text">Systém sa snaží spárovať s novým Podom a naplniť ho.\n\nAkonáhle bude inicializační proces úspešne dokončený, môžete stlačiť tlačítko <b>Ďalšia</b>.</string>
+    <string name="omnipod_common_preferences_notification_delivery_suspended_sound_enabled">Zvuk oznámenia pri pozastavenom podávaní povolený</string>
+    <!-- Exceptions -->
+    <string name="omnipod_dash_failed_to_connect">Nepodarilo sa pripojiť k Podu</string>
+    <string name="omnipod_dash_found_too_many_pods">Našlo sa príliš veľa Podov na aktiváciu</string>
+    <string name="omnipod_dash_scan_failed">Nemôžem nájsť dostupný Pod na aktiváciu</string>
+    <string name="omnipod_dash_generic_error">Všeobecná chyba: %1$s</string>
 </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 c690568d07..3c7c463c40 100644
--- a/omnipod-dash/src/main/res/values-sv-rSE/strings.xml
+++ b/omnipod-dash/src/main/res/values-sv-rSE/strings.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <!-- Omnipod Dash - Description -->
+    <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 -->
+    <!-- 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 16185fdbc4..0000000000
--- a/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/command/ProgramBasalCommandTest.java
+++ /dev/null
@@ -1,38 +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.Arrays;
-import java.util.Date;
-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;
-
-import static org.junit.Assert.assertArrayEquals;
-
-public class ProgramBasalCommandTest {
-    @Test
-    public void testProgramBasalCommand() throws DecoderException {
-        List<BasalProgram.Segment> segments = Arrays.asList(
-                new BasalProgram.Segment((short) 0, (short) 48, 300)
-        );
-        BasalProgram basalProgram = new BasalProgram(segments);
-        Date date = new Date(2021, 1, 17, 14, 47, 43);
-
-        byte[] encoded = new ProgramBasalCommand.Builder() //
-                .setUniqueId(37879809) //
-                .setNonce(1229869870) //
-                .setSequenceNumber((short) 10) //
-                .setBasalProgram(basalProgram) //
-                .setCurrentTime(date) //
-                .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/build.gradle b/omnipod-eros/build.gradle
index 63fcffcef6..4cf2467f9f 100644
--- a/omnipod-eros/build.gradle
+++ b/omnipod-eros/build.gradle
@@ -1,21 +1,17 @@
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-kapt'
+apply plugin: 'kotlin-allopen'
 apply plugin: 'com.hiya.jacoco-android'
 
 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"
-
-android {
-    defaultConfig {
-        versionCode 1
-        versionName "1.0"
-    }
-}
+apply from: "${project.rootDir}/gradle/jacoco_global.gradle"
 
 dependencies {
     implementation project(':core')
+    implementation project(':pump-common')
     implementation project(':omnipod-common')
     implementation project(':rileylink')
 }
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 65a3c739ba..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
@@ -1,10 +1,5 @@
 package info.nightscout.androidaps.plugins.pump.omnipod.eros;
 
-import static info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.OmnipodConstants.BASAL_STEP_DURATION;
-import static info.nightscout.androidaps.extensions.PumpStateExtensionKt.convertedToAbsolute;
-import static info.nightscout.androidaps.extensions.PumpStateExtensionKt.getPlannedRemainingMinutes;
-import static info.nightscout.androidaps.extensions.PumpStateExtensionKt.toStringFull;
-
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
@@ -34,7 +29,6 @@ import javax.inject.Singleton;
 import dagger.android.HasAndroidInjector;
 import info.nightscout.androidaps.activities.ErrorHelperActivity;
 import info.nightscout.androidaps.data.DetailedBolusInfo;
-import info.nightscout.androidaps.interfaces.Profile;
 import info.nightscout.androidaps.data.PumpEnactResult;
 import info.nightscout.androidaps.events.EventAppExit;
 import info.nightscout.androidaps.events.EventAppInitialized;
@@ -44,9 +38,10 @@ import info.nightscout.androidaps.interfaces.ActivePlugin;
 import info.nightscout.androidaps.interfaces.CommandQueueProvider;
 import info.nightscout.androidaps.interfaces.PluginDescription;
 import info.nightscout.androidaps.interfaces.PluginType;
+import info.nightscout.androidaps.interfaces.Profile;
 import info.nightscout.androidaps.interfaces.ProfileFunction;
-import info.nightscout.androidaps.interfaces.PumpDescription;
 import info.nightscout.androidaps.interfaces.Pump;
+import info.nightscout.androidaps.interfaces.PumpDescription;
 import info.nightscout.androidaps.interfaces.PumpPluginBase;
 import info.nightscout.androidaps.interfaces.PumpSync;
 import info.nightscout.androidaps.logging.AAPSLogger;
@@ -67,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;
@@ -83,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;
@@ -110,6 +105,11 @@ import info.nightscout.androidaps.utils.rx.AapsSchedulers;
 import info.nightscout.androidaps.utils.sharedPreferences.SP;
 import io.reactivex.disposables.CompositeDisposable;
 
+import static info.nightscout.androidaps.extensions.PumpStateExtensionKt.convertedToAbsolute;
+import static info.nightscout.androidaps.extensions.PumpStateExtensionKt.getPlannedRemainingMinutes;
+import static info.nightscout.androidaps.extensions.PumpStateExtensionKt.toStringFull;
+import static info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.OmnipodConstants.BASAL_STEP_DURATION;
+
 /**
  * Created by andy on 23.04.18.
  *
@@ -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());
@@ -648,10 +648,12 @@ public class OmnipodErosPumpPlugin extends PumpPluginBase implements Pump, Riley
             return deliverBolus(detailedBolusInfo);
         } else {
             // no bolus required, carb only treatment
-            activePlugin.getActiveTreatments().addToHistoryTreatment(detailedBolusInfo, true);
+//            activePlugin.getActiveTreatments().addToHistoryTreatment(detailedBolusInfo, true);
 
-            return new PumpEnactResult(getInjector()).success(true).enacted(true).bolusDelivered(0d)
-                    .carbsDelivered(detailedBolusInfo.carbs).comment(info.nightscout.androidaps.core.R.string.common_resultok);
+//            return new PumpEnactResult(getInjector()).success(true).enacted(true).bolusDelivered(0d)
+//                    .carbsDelivered(detailedBolusInfo.carbs);
+// Needs refactor
+            throw new IllegalStateException("Not implemented");
         }
     }
 
@@ -676,7 +678,7 @@ public class OmnipodErosPumpPlugin extends PumpPluginBase implements Pump, Riley
 
         if (tbrCurrent != null) {
             aapsLogger.info(LTag.PUMP, "setTempBasalAbsolute: Current Basal: duration: {} min, rate={}",
-                    T.msecs(tbrCurrent.getDuration()).mins(), tbrCurrent.getRate());
+                    T.Companion.msecs(tbrCurrent.getDuration()).mins(), tbrCurrent.getRate());
         }
 
         if (tbrCurrent != null && !enforceNew) {
@@ -827,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) {
@@ -1040,17 +1042,17 @@ public class OmnipodErosPumpPlugin extends PumpPluginBase implements Pump, Riley
 
     @NonNull @Override public PumpEnactResult setExtendedBolus(double insulin, int durationInMinutes) {
         aapsLogger.debug(LTag.PUMP, "setExtendedBolus [OmnipodPumpPlugin] - Not implemented.");
-        return getOperationNotSupportedWithCustomText(info.nightscout.androidaps.core.R.string.pump_operation_not_supported_by_pump_driver);
+        return getOperationNotSupportedWithCustomText(info.nightscout.androidaps.plugins.pump.common.R.string.pump_operation_not_supported_by_pump_driver);
     }
 
     @NonNull @Override public PumpEnactResult cancelExtendedBolus() {
         aapsLogger.debug(LTag.PUMP, "cancelExtendedBolus [OmnipodPumpPlugin] - Not implemented.");
-        return getOperationNotSupportedWithCustomText(info.nightscout.androidaps.core.R.string.pump_operation_not_supported_by_pump_driver);
+        return getOperationNotSupportedWithCustomText(info.nightscout.androidaps.plugins.pump.common.R.string.pump_operation_not_supported_by_pump_driver);
     }
 
     @NonNull @Override public PumpEnactResult loadTDDs() {
         aapsLogger.debug(LTag.PUMP, "loadTDDs [OmnipodPumpPlugin] - Not implemented.");
-        return getOperationNotSupportedWithCustomText(info.nightscout.androidaps.core.R.string.pump_operation_not_supported_by_pump_driver);
+        return getOperationNotSupportedWithCustomText(info.nightscout.androidaps.plugins.pump.common.R.string.pump_operation_not_supported_by_pump_driver);
     }
 
     public boolean isUseRileyLinkBatteryLevel() {
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 78151262e9..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
@@ -16,14 +16,13 @@ import javax.inject.Singleton;
 import dagger.android.HasAndroidInjector;
 import info.nightscout.androidaps.activities.ErrorHelperActivity;
 import info.nightscout.androidaps.data.DetailedBolusInfo;
-import info.nightscout.androidaps.interfaces.Profile;
 import info.nightscout.androidaps.data.PumpEnactResult;
 import info.nightscout.androidaps.db.OmnipodHistoryRecord;
 import info.nightscout.androidaps.events.Event;
 import info.nightscout.androidaps.events.EventRefreshOverview;
 import info.nightscout.androidaps.extensions.PumpStateExtensionKt;
 import info.nightscout.androidaps.interfaces.ActivePlugin;
-import info.nightscout.androidaps.interfaces.DatabaseHelperInterface;
+import info.nightscout.androidaps.interfaces.Profile;
 import info.nightscout.androidaps.interfaces.PumpSync;
 import info.nightscout.androidaps.logging.AAPSLogger;
 import info.nightscout.androidaps.logging.LTag;
@@ -74,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;
@@ -88,16 +87,14 @@ 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;
     private final ResourceHelper resourceHelper;
     private final HasAndroidInjector injector;
-    private final ActivePlugin activePlugin;
     private final SP sp;
     private final OmnipodManager delegate;
-    private final DatabaseHelperInterface databaseHelper;
     private final OmnipodAlertUtil omnipodAlertUtil;
     private final Context context;
     private final PumpSync pumpSync;
@@ -119,7 +116,7 @@ public class AapsOmnipodErosManager {
 
     @Inject
     public AapsOmnipodErosManager(OmnipodRileyLinkCommunicationManager communicationService,
-                                  PodStateManager podStateManager,
+                                  ErosPodStateManager podStateManager,
                                   AapsOmnipodUtil aapsOmnipodUtil,
                                   AAPSLogger aapsLogger,
                                   AapsSchedulers aapsSchedulers,
@@ -127,8 +124,6 @@ public class AapsOmnipodErosManager {
                                   SP sp,
                                   ResourceHelper resourceHelper,
                                   HasAndroidInjector injector,
-                                  ActivePlugin activePlugin,
-                                  DatabaseHelperInterface databaseHelper,
                                   OmnipodAlertUtil omnipodAlertUtil,
                                   Context context,
                                   PumpSync pumpSync) {
@@ -140,8 +135,6 @@ public class AapsOmnipodErosManager {
         this.sp = sp;
         this.resourceHelper = resourceHelper;
         this.injector = injector;
-        this.activePlugin = activePlugin;
-        this.databaseHelper = databaseHelper;
         this.omnipodAlertUtil = omnipodAlertUtil;
         this.context = context;
         this.pumpSync = pumpSync;
@@ -370,7 +363,7 @@ public class AapsOmnipodErosManager {
             bolusCommandResult = executeCommand(() -> delegate.bolus(PumpType.OMNIPOD_EROS.determineCorrectBolusSize(detailedBolusInfo.insulin), beepsEnabled, beepsEnabled, detailedBolusInfo.getBolusType() == DetailedBolusInfo.BolusType.SMB ? null :
                     (estimatedUnitsDelivered, percentage) -> {
                         EventOverviewBolusProgress progressUpdateEvent = EventOverviewBolusProgress.INSTANCE;
-                        progressUpdateEvent.setStatus(getStringResource(R.string.bolusdelivering, detailedBolusInfo.insulin));
+                        progressUpdateEvent.setStatus(getStringResource(R.string.goingtodeliver, detailedBolusInfo.insulin));
                         progressUpdateEvent.setPercent(percentage);
                         sendEvent(progressUpdateEvent);
                     }));
@@ -704,13 +697,15 @@ public class AapsOmnipodErosManager {
             carbInfo.setCarbsTimestamp(detailedBolusInfo.getCarbsTimestamp());
             carbInfo.carbs = detailedBolusInfo.carbs;
             carbInfo.setPumpType(PumpType.USER);
-            activePlugin.getActiveTreatments().addToHistoryTreatment(carbInfo, false);
-
+//            activePlugin.getActiveTreatments().addToHistoryTreatment(carbInfo, false);
+// Needs refactor
             // remove carbs from bolusInfo to not trigger any unwanted code paths in
             // TreatmentsPlugin.addToHistoryTreatment() method
             detailedBolusInfo.carbs = 0;
         }
-        activePlugin.getActiveTreatments().addToHistoryTreatment(detailedBolusInfo, false);
+//        activePlugin.getActiveTreatments().addToHistoryTreatment(detailedBolusInfo, false);
+// Needs refactor
+        throw new IllegalStateException("Not implemented");
     }
 
     public synchronized void createSuspendedFakeTbrIfNotExists() {
@@ -749,8 +744,9 @@ public class AapsOmnipodErosManager {
     public boolean hasSuspendedFakeTbr() {
         PumpSync.PumpState pumpState = pumpSync.expectedPumpState();
         if (pumpState.getTemporaryBasal() != null && pumpState.getTemporaryBasal().getPumpId() != null) {
-            OmnipodHistoryRecord historyRecord = databaseHelper.findOmnipodHistoryRecordByPumpId(pumpState.getTemporaryBasal().getPumpId());
-            return historyRecord != null && PodHistoryEntryType.getByCode(historyRecord.getPodEntryTypeCode()).equals(PodHistoryEntryType.SET_FAKE_SUSPENDED_TEMPORARY_BASAL);
+//            OmnipodHistoryRecord historyRecord = databaseHelper.findOmnipodHistoryRecordByPumpId(pumpState.getTemporaryBasal().getPumpId());
+//            return historyRecord != null && PodHistoryEntryType.getByCode(historyRecord.getPodEntryTypeCode()).equals(PodHistoryEntryType.SET_FAKE_SUSPENDED_TEMPORARY_BASAL);
+            throw new IllegalStateException("Not implemented");
         }
         return false;
     }
@@ -780,7 +776,6 @@ public class AapsOmnipodErosManager {
 
     // Cancels current TBR and adds a new TBR for the remaining duration
     private void splitActiveTbr() {
-        PumpSync.PumpState pumpState = pumpSync.expectedPumpState();
         PumpSync.PumpState.TemporaryBasal previouslyRunningTempBasal = pumpSync.expectedPumpState().getTemporaryBasal();
         if (previouslyRunningTempBasal != null) {
             // Cancel the previously running TBR and start a NEW TBR here for the remaining duration,
@@ -811,7 +806,7 @@ public class AapsOmnipodErosManager {
         pumpSync.syncTemporaryBasalWithPumpId(
                 time,
                 tempBasalPair.getInsulinRate(),
-                T.mins(tempBasalPair.getDurationMinutes()).msecs(),
+                T.Companion.mins(tempBasalPair.getDurationMinutes()).msecs(),
                 true,
                 PumpSync.TemporaryBasalType.NORMAL,
                 pumpId,
@@ -853,9 +848,9 @@ public class AapsOmnipodErosManager {
         omnipodHistoryRecord.setSuccess(success);
         omnipodHistoryRecord.setPodSerial(podStateManager.hasPodState() ? String.valueOf(podStateManager.getAddress()) : "None");
 
-        databaseHelper.createOrUpdate(omnipodHistoryRecord);
-
-        return omnipodHistoryRecord.getPumpId();
+//        databaseHelper.createOrUpdate(omnipodHistoryRecord);
+//        return omnipodHistoryRecord.getPumpId();
+        throw new IllegalStateException("Not implemented");
     }
 
     private void executeCommand(Runnable runnable) {
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 9a8485f689..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
@@ -9,7 +9,6 @@ import org.apache.commons.lang3.StringUtils;
 
 import javax.inject.Inject;
 
-import info.nightscout.androidaps.interfaces.DatabaseHelperInterface;
 import info.nightscout.androidaps.logging.LTag;
 import info.nightscout.androidaps.plugins.pump.common.defs.PumpDeviceState;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkCommunicationManager;
@@ -20,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;
@@ -36,9 +35,6 @@ public class RileyLinkOmnipodService extends RileyLinkService {
 
     @Inject OmnipodErosPumpPlugin omnipodErosPumpPlugin;
     @Inject AapsOmnipodUtil aapsOmnipodUtil;
-    @Inject PodStateManager podStateManager;
-    @Inject DatabaseHelperInterface databaseHelper;
-    @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/ErosPodHistoryActivity.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/ErosPodHistoryActivity.java
index b534861b81..0f9ea02d9f 100644
--- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/ErosPodHistoryActivity.java
+++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/ErosPodHistoryActivity.java
@@ -10,11 +10,10 @@ import android.widget.ArrayAdapter;
 import android.widget.Spinner;
 import android.widget.TextView;
 
+import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
-import androidx.annotation.NonNull;
-
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Collections;
@@ -24,14 +23,13 @@ import java.util.List;
 import javax.inject.Inject;
 
 import info.nightscout.androidaps.activities.NoSplashAppCompatActivity;
-import info.nightscout.androidaps.interfaces.Profile;
 import info.nightscout.androidaps.db.OmnipodHistoryRecord;
-import info.nightscout.androidaps.interfaces.DatabaseHelperInterface;
+import info.nightscout.androidaps.interfaces.Profile;
 import info.nightscout.androidaps.logging.AAPSLogger;
 import info.nightscout.androidaps.logging.LTag;
-import info.nightscout.androidaps.plugins.pump.common.defs.TempBasalPair;
 import info.nightscout.androidaps.plugins.pump.common.defs.PumpHistoryEntryGroup;
 import info.nightscout.androidaps.plugins.pump.common.defs.PumpType;
+import info.nightscout.androidaps.plugins.pump.common.defs.TempBasalPair;
 import info.nightscout.androidaps.plugins.pump.common.utils.ProfileUtil;
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.R;
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.definition.PodHistoryEntryType;
@@ -43,7 +41,6 @@ public class ErosPodHistoryActivity extends NoSplashAppCompatActivity {
     @Inject AAPSLogger aapsLogger;
     @Inject AapsOmnipodUtil aapsOmnipodUtil;
     @Inject ResourceHelper resourceHelper;
-    @Inject DatabaseHelperInterface databaseHelper;
 
     private Spinner historyTypeSpinner;
     private TextView statusView;
@@ -69,9 +66,9 @@ public class ErosPodHistoryActivity extends NoSplashAppCompatActivity {
         GregorianCalendar gc = new GregorianCalendar();
         gc.add(Calendar.HOUR_OF_DAY, -24);
 
-        databaseHelper.getAllOmnipodHistoryRecordsFromTimestamp(gc.getTimeInMillis(), false);
-
-        fullHistoryList.addAll(databaseHelper.getAllOmnipodHistoryRecordsFromTimestamp(gc.getTimeInMillis(), true));
+//        databaseHelper.getAllOmnipodHistoryRecordsFromTimestamp(gc.getTimeInMillis(), false);
+//        fullHistoryList.addAll(databaseHelper.getAllOmnipodHistoryRecordsFromTimestamp(gc.getTimeInMillis(), true));
+        throw new IllegalStateException("Not implemented");
     }
 
 
@@ -149,7 +146,7 @@ public class ErosPodHistoryActivity extends NoSplashAppCompatActivity {
 
         statusView.setVisibility(View.GONE);
 
-        typeListFull = getTypeList(PumpHistoryEntryGroup.getTranslatedList(resourceHelper));
+        typeListFull = getTypeList(PumpHistoryEntryGroup.Companion.getTranslatedList(resourceHelper));
 
         ArrayAdapter<TypeList> spinnerAdapter = new ArrayAdapter<>(this, R.layout.spinner_centered, typeListFull);
         historyTypeSpinner.setAdapter(spinnerAdapter);
@@ -309,7 +306,7 @@ public class ErosPodHistoryActivity extends NoSplashAppCompatActivity {
 
             try {
                 Profile.ProfileValue[] profileValuesArray = aapsOmnipodUtil.getGsonInstance().fromJson(data, Profile.ProfileValue[].class);
-                valueView.setText(ProfileUtil.getBasalProfilesDisplayable(profileValuesArray, PumpType.OMNIPOD_EROS));
+                valueView.setText(ProfileUtil.INSTANCE.getBasalProfilesDisplayable(profileValuesArray, PumpType.OMNIPOD_EROS));
             } catch (Exception e) {
                 aapsLogger.error(LTag.PUMP, "Problem parsing Profile json. Ex: {}, Data:\n{}", e.getMessage(), data);
                 valueView.setText("");
@@ -324,7 +321,7 @@ public class ErosPodHistoryActivity extends NoSplashAppCompatActivity {
 
 
         @Override
-        public void onAttachedToRecyclerView(RecyclerView recyclerView) {
+        public void onAttachedToRecyclerView(@NonNull RecyclerView recyclerView) {
             super.onAttachedToRecyclerView(recyclerView);
         }
 
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-bg-rBG/strings.xml b/omnipod-eros/src/main/res/values-bg-rBG/strings.xml
index bc89093c83..5b26a40bd0 100644
--- a/omnipod-eros/src/main/res/values-bg-rBG/strings.xml
+++ b/omnipod-eros/src/main/res/values-bg-rBG/strings.xml
@@ -4,10 +4,68 @@
     <!-- 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">Показване на PULSE LOG в менюто на Pod Management</string>
+    <string name="omnipod_eros_preferences_riley_link_stats_button_enabled">Показване на RileyLink Stats бутон в меню Управление на Pod</string>
+    <string name="omnipod_eros_preferences_battery_change_logging_enabled">Позволи на записване на смяна на батерията в Действия</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Е</string>
+    <string name="omnipod_eros_history_bolus_value_with_carbs">%1$.2f Е, Вх=%2$.1f гр</string>
+    <string name="omnipod_eros_history_tbr_value">Количество: %1$.2f U, Продължителност: %2$d мин</string>
     <!-- Omnipod Eros - Short Status -->
+    <string name="omnipod_eros_short_status_riley_link_battery">RL бат: %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">Неуспешна комуникация: получиен невалиден пакет от под</string>
+    <string name="omnipod_eros_error_invalid_progress_state">Неуспешна комуникация: под е в грешно състояние</string>
+    <string name="omnipod_eros_error_invalid_response">Неуспешна комуникация: получени грешен отговор от под</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 и стартирайте нов</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">Неуспешно задаване на базален профил. Доставката на инсулин може да бъде спряна! Моля, ръчно опреснете състоянието на Pod от раздел Omnipod и възобновете доставката, ако е необходимо.</string>
+    <string name="omnipod_eros_error_set_basal_might_have_failed_delivery_might_be_suspended">Неуспешно задаване на базален профил. Доставката на инсулин може да бъде спряна! Моля, ръчно опреснете състоянието на Pod от раздел Omnipod и възобновете доставката, ако е необходимо.</string>
+    <string name="omnipod_eros_error_set_basal_failed_delivery_suspended">Неуспешно задаване на базален профил. Инсулинът е спрян! Моля, ръчно подновяване на доставката от раздела Omnipod.</string>
+    <string name="omnipod_eros_error_cancel_temp_basal_failed_uncertain">Отменянето на временния базал може да е неуспешно. Моля, ръчно опреснете статуса на Pod от раздел Omnipod.</string>
+    <string name="omnipod_eros_error_set_temp_basal_failed_old_tbr_might_be_cancelled">Задаването на временен базал е неуспешно. Ако преди това е изпълнявал временен базал, може да е бил отменен. Моля, ръчно опреснете статуса на Pod от раздела Omnipod.</string>
+    <string name="omnipod_eros_error_set_temp_basal_failed_old_tbr_cancelled_new_might_have_failed">Задаването на временен базал е неуспешно. Ако преди това е имало временен базал, може да е бил отменен. Моля, ръчно опреснете статуса на Pod от раздела Omnipod.</string>
+    <string name="omnipod_eros_error_set_temp_basal_failed_validation">Продължителността трябва да бъде по-голяма от нула и кратно на %1$s минути.</string>
+    <string name="omnipod_eros_error_set_time_failed_delivery_might_be_suspended">Неуспешно задаване на базален профил. Доставката на инсулин може да бъде спряна! Моля, ръчно опреснете състоянието на Pod от раздел Omnipod и възобновете доставката, ако е необходимо.</string>
+    <string name="omnipod_eros_error_set_time_failed_delivery_suspended">Неуспешно задаване на време. Инсулинът е спрян! Моля, ръчно подновяване на доставката от раздела Omnipod.</string>
+    <string name="omnipod_eros_error_failed_to_read_pulse_log">Неуспешно прочитане на Pulse Log</string>
+    <string name="omnipod_eros_error_automatic_time_or_timezone_change_failed">Неуспешно променяне на времето на под. Трябва ръчно да синхронизирате времето в раздела Omnipod.</string>
+    <string name="omnipod_eros_error_operation_not_possible_no_configuration">Забранено действие.\n\n Първо трябва да конфигурурате Omnipod , преди да използвате тази операция,.</string>
+    <string name="omnipod_eros_error_bolus_failed_uncertain">Не може да се провери дали болус е поставен. Моля, уверете се ръчно, че Вашият Pod се активира чрез слушане на кликвания. <b>Ако сте сигурни, че болус не е успял, вие трябва ръчно да изтриете болния запис от лечение, дори ако щракнете върху \'Отказ от болус\' сега!</b></string>
+    <string name="omnipod_eros_error_bolus_failed_uncertain_smb">Не може да се провери дали SMB болус(%1$.2f Е) е успешен. <b>Ако сте сигурни, че не е успял, трябва ръчно да изтриете запис SMB от леченията.</b></string>
+    <string name="omnipod_eros_error_tbr_running_but_aaps_not_aware">В Pod има пуснат временен базал но AAPS не знае за него. Моля, отменете временния си базал ръчно.</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 log(копиран в клипборда)</string>
     <!-- Omnipod Eros - Pod Activation Wizard -->
+    <string name="omnipod_eros_pod_activation_wizard_initialize_pod_text">Опитвам се да се сдвоя с Pod.\n\nКогато всички елементи са проверени, можете да натиснете <b>Следващ</b>.\n\n<b>Забележка:</b> задръжте Pod много близо до RileyLink в този момент.</string>
     <!-- Omnipod Eros - Other -->
+    <string name="omnipod_eros_uncertain">неизвестно</string>
 </resources>
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 c5c13ac4e7..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 -->
@@ -11,11 +12,62 @@
     <string name="omnipod_eros_preferences_battery_change_logging_enabled">Aktiviere die Protokollierung des Akkuwechsels im Aktionen-Tab/Menü</string>
     <string name="omnipod_eros_preferences_category_riley_link">RileyLink</string>
     <string name="omnipod_eros_preferences_notification_uncertain_tbr_sound_enabled">Ton für unsichere TBR-Benachrichtigungen aktiviert</string>
+    <string name="omnipod_eros_preferences_notification_uncertain_smb_sound_enabled">Ton für unsichere SMB-Benachrichtigungen aktiviert</string>
+    <string name="omnipod_eros_preferences_notification_uncertain_bolus_sound_enabled">Ton für unsichere Bolus-Benachrichtigungen aktiviert</string>
     <!-- Omnipod Eros - History -->
+    <string name="omnipod_eros_history_title">Pod Historie</string>
+    <string name="omnipod_eros_history_item_description">Beschreibung</string>
+    <string name="omnipod_eros_history_item_source">Quelle</string>
+    <string name="omnipod_eros_history_item_date">Datum</string>
+    <string name="omnipod_eros_history_type">Typ:</string>
+    <string name="omnipod_eros_history_bolus_value">%1$.2f IE</string>
+    <string name="omnipod_eros_history_bolus_value_with_carbs">%1$.2f IE, KH=%2$.1fg</string>
+    <string name="omnipod_eros_history_tbr_value">Rate: %1$.2f IE, Dauer: %2$d min.</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 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-fr-rFR/strings.xml b/omnipod-eros/src/main/res/values-fr-rFR/strings.xml
index 24e4167342..869fe5bd0d 100644
--- a/omnipod-eros/src/main/res/values-fr-rFR/strings.xml
+++ b/omnipod-eros/src/main/res/values-fr-rFR/strings.xml
@@ -56,7 +56,7 @@
     <string name="omnipod_eros_error_operation_not_possible_no_configuration">Operation impossible.\n\nVous devez d\'abord configurer l\'Omnipod pour pouvoir faire cette operation.</string>
     <string name="omnipod_eros_error_bolus_failed_uncertain">Impossible de vérifier si le bolus a réussi. Veuillez vérifier manuellement que votre Pod est en train de délivrer un bolus en écoutant des clics. <b>Si vous êtes sûr que le bolus n\'a pas réussi, vous devez supprimer manuellement l\'entrée bolus des traitements, même si vous cliquez sur \'Annuler bolus\' maintenant !</b></string>
     <string name="omnipod_eros_error_bolus_failed_uncertain_smb">Impossible de vérifier si le bolus SMB (%1$.2f U) a réussi. <b>Si vous êtes certain que le bolus n\'a pas réussi, vous devez supprimer manuellement l\'entrée SMB des traitements.</b></string>
-    <string name="omnipod_eros_error_tbr_running_but_aaps_not_aware">Un basal temporaire est en cours d\'exécution sur le Pod, mais AAPS n\'est pas au courant de ce basal temporaire. Veuillez annuler votre basal temporaire manuellement.</string>
+    <string name="omnipod_eros_error_tbr_running_but_aaps_not_aware">Une basale temporaire est en cours d\'exécution sur le Pod, mais AAPS n\'est pas au courant de ce basal temporaire. Veuillez annuler votre basal temporaire manuellement.</string>
     <!-- Omnipod Eros - Pod Management -->
     <string name="omnipod_eros_pod_management_button_riley_link_stats">Stats RileyLink</string>
     <string name="omnipod_eros_pod_management_waiting_for_riley_link_connection">En attente de connexion RileyLink...</string>
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/omnipod-eros/src/main/res/values-lt-rLT/strings.xml b/omnipod-eros/src/main/res/values-lt-rLT/strings.xml
index bc89093c83..eba4dded84 100644
--- a/omnipod-eros/src/main/res/values-lt-rLT/strings.xml
+++ b/omnipod-eros/src/main/res/values-lt-rLT/strings.xml
@@ -1,13 +1,73 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <!-- Omnipod Eros - Description -->
+    <string name="omnipod_eros_pump_description">Pompos integravimas su Omnipod Eros (senesnis modelis su skaidriu adatos dangteliu). Reikalingas RileyLink įrenginys, su 2.0 ir naujesne programinės įrangos versija.</string>
     <!-- Omnipod Eros - Keys -->
     <!-- Omnipod Eros - Overview -->
     <!-- Omnipod Eros - Preferences -->
+    <string name="omnipod_eros_preferences_riley_link_configuration">RileyLink konfigūravimas</string>
+    <string name="omnipod_eros_preferences_category_notifications">Pranešimai</string>
+    <string name="omnipod_eros_preferences_pulse_log_button_enabled">Pod valdymo meniu rodyti mygtuką Pulse log</string>
+    <string name="omnipod_eros_preferences_riley_link_stats_button_enabled">Pod valdymo meniu rodyti mygtuką RileyLink Stats</string>
+    <string name="omnipod_eros_preferences_battery_change_logging_enabled">Įgalinti baterijos keitimo registravimą veiksmuose</string>
+    <string name="omnipod_eros_preferences_category_riley_link">RileyLink</string>
+    <string name="omnipod_eros_preferences_notification_uncertain_tbr_sound_enabled">Įjungtas garsas neaiškiems laikinos bazės perspėjimams</string>
+    <string name="omnipod_eros_preferences_notification_uncertain_smb_sound_enabled">Įjungtas garsas neaiškiems SMB perspėjimams</string>
+    <string name="omnipod_eros_preferences_notification_uncertain_bolus_sound_enabled">Įjungtas garsas neaiškiems bolusų perspėjimams</string>
     <!-- Omnipod Eros - History -->
+    <string name="omnipod_eros_history_title">Pod istorija</string>
+    <string name="omnipod_eros_history_item_description">Aprašymas</string>
+    <string name="omnipod_eros_history_item_source">Šaltinis</string>
+    <string name="omnipod_eros_history_item_date">Data</string>
+    <string name="omnipod_eros_history_type">Tipas:</string>
+    <string name="omnipod_eros_history_bolus_value">%1$.2f vv</string>
+    <string name="omnipod_eros_history_bolus_value_with_carbs">%1$.2f vv, AV=%2$.1f g</string>
+    <string name="omnipod_eros_history_tbr_value">Kiekis: %1$.2f vv, trukmė: %2$d min</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 adresas neteisingas.</string>
+    <string name="omnipod_eros_error_crc_mismatch">Ryšio klaida: pranešimo vientisumo patikra nepavyko</string>
+    <string name="omnipod_eros_error_invalid_packet_type">Ryšio klaida: netinkami įvesties iš Pod parametrai</string>
+    <string name="omnipod_eros_error_invalid_progress_state">Ryšio klaida: Pod būklė yra netinkama</string>
+    <string name="omnipod_eros_error_invalid_response">Ryšio klaida: gautas netinkamas atsakymas iš Pod</string>
+    <string name="omnipod_eros_error_invalid_message_sequence_number">Ryšio klaida: iš Pod gautas pranešimas su negaliojančiu serijos numeriu</string>
+    <string name="omnipod_eros_error_invalid_message_address">Ryšio klaida: iš Pod gautas pranešimas su netinkamu adresu</string>
+    <string name="omnipod_eros_error_message_decoding_failed">Ryšio klaida: nepavyko iššifruoti pranešimo iš Pod</string>
+    <string name="omnipod_eros_error_nonce_resync_failed">Ryšio klaida: nepavyko iš naujo sinchronizuoti unikalų kodą</string>
+    <string name="omnipod_eros_error_nonce_out_of_sync">Ryšio klaida: unikalus kodas nebuvo sinchronizuotas</string>
+    <string name="omnipod_eros_error_not_enough_data">Ryšio klaida: iš Pod gauta nepakankamai duomenų</string>
+    <string name="omnipod_eros_error_pod_fault">Aptikta Pod klaida (%1$03d %2$s). Deaktyvuokite Pod ir aktyvuokite naują</string>
+    <string name="omnipod_eros_error_pod_returned_error_response">Ryšio klaida: Pod pateikė klaidos atsakymą</string>
+    <string name="omnipod_eros_error_communication_failed_no_response_from_riley_link">Nėra atsakymo iš RileyLink</string>
+    <string name="omnipod_eros_error_communication_failed_riley_link_interrupted">RileyLink ryšys pertrauktas</string>
+    <string name="omnipod_eros_error_communication_failed_no_response_from_pod">Nėra atsakymo iš Pod</string>
+    <string name="omnipod_eros_error_set_basal_failed_delivery_might_be_suspended">Nepavyko nustatyti bazės profilio. Insulino leidimas gali būti nutrauktas! Rankiniu būdu atnaujinkite Pod būseną Omnipod skirtuke ir, jei reikia, atnaujinkite insulino leidimą.</string>
+    <string name="omnipod_eros_error_set_basal_might_have_failed_delivery_might_be_suspended">Gali būti, kad bazės profilis nebuvo nustatytas. Insulino leidimas gali būti nutrauktas! Rankiniu būdu atnaujinkite Pod būseną Omnipod skirtuke ir, jei reikia, atnaujinkite insulino leidimą.</string>
+    <string name="omnipod_eros_error_set_basal_failed_delivery_suspended">Nepavyko nustatyti bazės profilio. Insulino leidimas buvo sustabdytas! Rankiniu būdu iš Omnipod skirtuko atnaujinkite insulino leidimą.</string>
+    <string name="omnipod_eros_error_cancel_temp_basal_failed_uncertain">Gali būti, kad laikinos bazės atšaukti nepavyko. Omnipod skirtuke rankiniu būdu atnaujinkite Pod statusą.</string>
+    <string name="omnipod_eros_error_set_temp_basal_failed_old_tbr_might_be_cancelled">Nepavyko nustatyti laikinos valandinės bazės. Jei laikina bazė buvo pradėta anksčiau, ji gali būti atšaukta. Rakiniu būdu atnaujinkite Pod būseną Omnipod skirtuke.</string>
+    <string name="omnipod_eros_error_set_temp_basal_failed_old_tbr_cancelled_new_might_have_failed">Gali būti, kad nepavyko nustatyti laikinos valandinės bazės. Jei laikina bazė buvo nustatyta anksčiau, ji yra atšaukta. Rakiniu būdu atnaujinkite Pod būseną Omnipod skirtuke.</string>
+    <string name="omnipod_eros_error_set_temp_basal_failed_validation">Laikinos bazės trukmė turi būti didesnis už nulį %1$s min. kartotinis.</string>
+    <string name="omnipod_eros_error_set_time_failed_delivery_might_be_suspended">Gali būti, kad laikas nebuvo nustatytas. Insulino leidimas gali būti nutrauktas! Rankiniu būdu atnaujinkite Pod būseną Omnipod skirtuke ir, jei reikia, atnaujinkite insulino leidimą.</string>
+    <string name="omnipod_eros_error_set_time_failed_delivery_suspended">Nepavyko nustatyti laiko. Insulino leidimas sustabdytas! Rankiniu būdu atnaujinkite insulino leidimą iš Omnipod skirtuko.</string>
+    <string name="omnipod_eros_error_failed_to_read_pulse_log">Nepavyko perskaityti Pulse žurnalo</string>
+    <string name="omnipod_eros_error_automatic_time_or_timezone_change_failed">Nepavyko automatiškai pakeisti Pod laiko. Jūs turėtumėte sinchronizuoti laiką rankiniu būdu Omnipod skirtuke.</string>
+    <string name="omnipod_eros_error_operation_not_possible_no_configuration">Operacija negalima.\n\nPirmiausia turite sukonfigūruoti Omnipod pompą prieš atliekant šią operaciją.</string>
+    <string name="omnipod_eros_error_bolus_failed_uncertain">Nepavyko patikrinti, ar buvo suleistas bolusas. Patikrinkite, ar Pod leidžia bolusą (klausantis boluso garsų). <b>Jei esate tikri, kad bolusas nebuvo suleistas, turite rankiniu būdu ištrinti boluso įrašą iš Terapijos, net jei dabar spustelėjote mygtuką „Atšaukti bolusą“!</b></string>
+    <string name="omnipod_eros_error_bolus_failed_uncertain_smb">Nepavyko patikrinti, ar SMB (%1$.2fvv) suleistas. <b>Jei esate tikri, kad bolusas nebuvo suleistas, turite rankiniu būdu pašalinti SMB įrašą iš Terapijos.</b></string>
+    <string name="omnipod_eros_error_tbr_running_but_aaps_not_aware">Pod veikia laikina bazė, bet AAPS neinformuota apie šią laikiną bazę. Atšaukite laikiną bazę rankiniu būdu.</string>
     <!-- Omnipod Eros - Pod Management -->
+    <string name="omnipod_eros_pod_management_button_riley_link_stats">RileyLink statusas</string>
+    <string name="omnipod_eros_pod_management_waiting_for_riley_link_connection">Laukiama RileyLink ryšio…</string>
+    <string name="omnipod_eros_pod_management_button_reset_riley_link_config">Išvalyti RileyLink nustatymus</string>
+    <string name="omnipod_eros_pod_management_button_read_pulse_log">Skaityti Pulse žurnalą</string>
+    <string name="omnipod_eros_pod_management_button_reading_pulse_log">Skaitomas Pulse žurnalas…</string>
+    <string name="omnipod_eros_pod_management_pulse_log">Pulse žurnalas</string>
+    <string name="omnipod_eros_pod_management_pulse_log_value">Pulse žurnalas (nukopijuotas į mainų sritį)</string>
     <!-- Omnipod Eros - Pod Activation Wizard -->
+    <string name="omnipod_eros_pod_activation_wizard_start_pod_activation_text">Užpildykite naują Pod insulinu, kurio pakaktų 3 dienoms.\n\nTaip pat atkreipkite dėmesį į du pyptelėjimus iš Pod, kai pildote. Tai rodo, kad rezervuaras buvo užpildytas mažiausiai 80vv. Visiškai ištuštinkite švirkštą, net jei girdėjote du pyptelėjimus.\n\nUžpildę Pod, spustelėkite <b>Kitas</b>.\n\n<b>Pastaba:</b> vykdant šiuos veiksmus, nenuimkite Pod adatos apsauginio dangtelio.\n<b>Pastaba:</b> padėkite RileyLink vertikalioje pozicijoje ir Pod kelių colių atstumu vienas nuo kito.</string>
+    <string name="omnipod_eros_pod_activation_wizard_initialize_pod_text">Pabandykite suporuoti naują Pod ir užpildykite jį.\n\nKai inicijavimo procesas bus užbaigtas sėkmingai, galite spustelėti <b>Kitas</b>.\n\n <b>Pastaba:</b> padėkite RileyLink vertikalioje pozicijoje ir Pod kelių colių atstumu vienas nuo kito.</string>
     <!-- Omnipod Eros - Other -->
+    <string name="omnipod_eros_uncertain">neaiški</string>
 </resources>
diff --git a/omnipod-eros/src/main/res/values-nl-rNL/strings.xml b/omnipod-eros/src/main/res/values-nl-rNL/strings.xml
index 8e18d3f475..e4fe4c26e2 100644
--- a/omnipod-eros/src/main/res/values-nl-rNL/strings.xml
+++ b/omnipod-eros/src/main/res/values-nl-rNL/strings.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <!-- Omnipod Eros - Description -->
+    <string name="omnipod_eros_pump_description">Pompintegratie voor Omnipod Eros (het oudere model met een transparante naalddop). Vereist een RileyLink-apparaat met ten minste firmwareversie 2.0.</string>
     <!-- Omnipod Eros - Keys -->
     <!-- Omnipod Eros - Overview -->
     <!-- Omnipod Eros - Preferences -->
@@ -48,7 +49,25 @@
     <string name="omnipod_eros_error_set_temp_basal_failed_old_tbr_might_be_cancelled">Het instellen van een tijdelijke basaal is mislukt. Als een tijdelijk basaal eerder actief was, is deze mogelijk geannuleerd. Vernieuw de Pod-status handmatig vanaf het Omnipod tabblad.</string>
     <string name="omnipod_eros_error_set_temp_basal_failed_old_tbr_cancelled_new_might_have_failed">Het instellen van een tijdelijk basaal is mogelijk mislukt. Als een tijdelijke basaal eerder actief was, is deze geannuleerd. Vernieuw de Pod-status handmatig vanaf het Omnipod tabblad.</string>
     <string name="omnipod_eros_error_set_temp_basal_failed_validation">Tijdelijke basaal duur moet groter zijn dan nul en een veelvoud van %1$s minuten.</string>
+    <string name="omnipod_eros_error_set_time_failed_delivery_might_be_suspended">Instellen van de tijd is misschien mislukt. De insulinetoediening kan onderbroken zijn! Vernieuw de Pod-status handmatig in het Omnipod tabblad en hervat de toediening indien nodig.</string>
+    <string name="omnipod_eros_error_set_time_failed_delivery_suspended">Het instellen van de tijd is mislukt. Insulinetoediening is onderbroken! Hervat de toediening handmatig vanaf het Omnipod tabblad.</string>
+    <string name="omnipod_eros_error_failed_to_read_pulse_log">Lezen van Pulse log is mislukt</string>
+    <string name="omnipod_eros_error_automatic_time_or_timezone_change_failed">Het automatisch wijzigen van de tijd op de Pod is mislukt. Synchroniseer de tijd handmatig via het Omnipod-tabblad.</string>
+    <string name="omnipod_eros_error_operation_not_possible_no_configuration">Bewerking is niet mogelijk.\n\nJe moet eerst Omnipod ingesteld hebben, voordat je deze bewerking kunt gebruiken.</string>
+    <string name="omnipod_eros_error_bolus_failed_uncertain">Kan niet controleren of de bolus is geslaagd. Controleer handmatig of de Pod aan het bolussen is door te luisteren naar klik-geluidjes van de Pod. <b>Als je zeker weet dat de bolus niet is geslaagd, moet je deze bolus handmatig uit \'Behandelingen\' verwijderen, zelfs als je nu op \'Annuleren\' drukt!</b></string>
+    <string name="omnipod_eros_error_bolus_failed_uncertain_smb">Kan niet controleren of SMB bolus (%1$.2f E) geslaagd is. <b>Als je zeker weet dat de bolus niet is geslaagd, moet je deze handmatig verwijderen uit \'Behandelingen\'.</b></string>
+    <string name="omnipod_eros_error_tbr_running_but_aaps_not_aware">Er loopt een tijdelijk basaal op de Pod, maar AndroidAPS is zich niet bewust van deze tijdelijke basaal. Annuleer de tijdelijke basal handmatig.</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">Wachten op verbinding met RileyLink…</string>
+    <string name="omnipod_eros_pod_management_button_reset_riley_link_config">RileyLink Configuratie resetten</string>
+    <string name="omnipod_eros_pod_management_button_read_pulse_log">Pulse log uitlezen</string>
+    <string name="omnipod_eros_pod_management_button_reading_pulse_log">Pulse log aan het uitlezen…</string>
+    <string name="omnipod_eros_pod_management_pulse_log">Pulse Log</string>
+    <string name="omnipod_eros_pod_management_pulse_log_value">Pulse log (gekopieerd naar klembord)</string>
     <!-- Omnipod Eros - Pod Activation Wizard -->
+    <string name="omnipod_eros_pod_activation_wizard_start_pod_activation_text">Vul een nieuw Pod in met voldoende insuline voor 3 dagen.\n\nLuister naar twee piepjes van de Pod tijdens het vulproces. Deze geven aan dat de minimale hoeveelheid van 80E is bereikt. Ga door met vullen (ook na het horen van de twee piepjes) totdat het vulspuitje volledig leeg is.\n\nNa het vullen van de Pod kun je op <b>Volgende</b>drukken.\n\n<b>Opmerking:</b> verwijder op dit moment de naaldbeschermer van de Pod.\n<b>Opmerking:</b> Zet de RileyLink rechtop en plaats de Pod ongeveer vijf centimeter ervandaan.</string>
+    <string name="omnipod_eros_pod_activation_wizard_initialize_pod_text">Er wordt nu geprobeerd om de Pod te koppelen en de canule te vullen.\n\nWanneer deze stap successvol is afgerond, kan er op <b>Volgende</b> worden gedrukt.\n\n<b>Opmerking:</b> zet de RileyLink rechtop en leg de Pod er ongeveer 5 centimeter vandaan.</string>
     <!-- Omnipod Eros - Other -->
+    <string name="omnipod_eros_uncertain">onzeker</string>
 </resources>
diff --git a/omnipod-eros/src/main/res/values-sv-rSE/strings.xml b/omnipod-eros/src/main/res/values-sv-rSE/strings.xml
index 298379b1d7..87e60d364c 100644
--- a/omnipod-eros/src/main/res/values-sv-rSE/strings.xml
+++ b/omnipod-eros/src/main/res/values-sv-rSE/strings.xml
@@ -66,6 +66,7 @@
     <string name="omnipod_eros_pod_management_pulse_log">Pulslogg</string>
     <string name="omnipod_eros_pod_management_pulse_log_value">Pulslogg (kopierad till klippbordet)</string>
     <!-- Omnipod Eros - Pod Activation Wizard -->
+    <string name="omnipod_eros_pod_activation_wizard_start_pod_activation_text">Fyll en ny podd med insulin för 3 dagar.\n\nDet ska höras 2 pip när podden fyllts med minsta nödvändiga mängd insulin (80 IE). Fortsätt fylla tills du har tillräcklig mängd för 3 dagars insulinbehov.\n\nEfter att ha fyllt din nya podd, klicka på <b>Fortsätt</b>.\n\n<b>Obs:</b> ta inte bort kanylskyddet ännu.\n<b>Obs:</b> placera din RileyLink i upprätt läge ca 1 decimeter från podden.</string>
     <string name="omnipod_eros_pod_activation_wizard_initialize_pod_text">Försöker parkoppla den nya Poden och förfylla den.\n\nNär initieringsprocessen har slutförts kan du trycka på <b>Nästa</b>.\n\n<b>Obs:</b> placera Riley Link i ett upprätt läge och placera Pod några centimeter bort från den.</string>
     <!-- Omnipod Eros - Other -->
     <string name="omnipod_eros_uncertain">osäker</string>
diff --git a/omnipod-eros/src/test/java/info/nightscout/androidaps/TestBase.kt b/omnipod-eros/src/test/java/info/nightscout/androidaps/TestBase.kt
new file mode 100644
index 0000000000..ff88739ba2
--- /dev/null
+++ b/omnipod-eros/src/test/java/info/nightscout/androidaps/TestBase.kt
@@ -0,0 +1,39 @@
+package info.nightscout.androidaps
+
+import info.nightscout.androidaps.logging.AAPSLoggerTest
+import info.nightscout.androidaps.utils.rx.AapsSchedulers
+import info.nightscout.androidaps.utils.rx.TestAapsSchedulers
+import org.junit.Before
+import org.junit.Rule
+import org.mockito.Mockito
+import org.mockito.junit.MockitoJUnit
+import org.mockito.junit.MockitoRule
+import java.util.*
+
+open class TestBase {
+
+    val aapsLogger = AAPSLoggerTest()
+    val aapsSchedulers: AapsSchedulers = TestAapsSchedulers()
+
+    // Add a JUnit rule that will setup the @Mock annotated vars and log.
+    // Another possibility would be to add `MockitoAnnotations.initMocks(this) to the setup method.
+    @get:Rule
+    val mockitoRule: MockitoRule = MockitoJUnit.rule()
+
+    @Before
+    fun setupLocale() {
+        Locale.setDefault(Locale.ENGLISH)
+        System.setProperty("disableFirebase", "true")
+    }
+
+    // Workaround for Kotlin nullability.
+    // https://medium.com/@elye.project/befriending-kotlin-and-mockito-1c2e7b0ef791
+    // https://stackoverflow.com/questions/30305217/is-it-possible-to-use-mockito-in-kotlin
+    fun <T> anyObject(): T {
+        Mockito.any<T>()
+        return uninitialized()
+    }
+
+    @Suppress("Unchecked_Cast")
+    fun <T> uninitialized(): T = null as T
+}
\ No newline at end of file
diff --git a/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/OmnipodErosPumpPluginTest.java b/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/OmnipodErosPumpPluginTest.java
deleted file mode 100644
index 0bc6625a5f..0000000000
--- a/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/OmnipodErosPumpPluginTest.java
+++ /dev/null
@@ -1,149 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.omnipod.eros;
-
-import static org.junit.Assert.assertEquals;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyInt;
-import static org.mockito.ArgumentMatchers.anyLong;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-import android.os.Looper;
-
-import org.joda.time.DateTimeZone;
-import org.joda.time.tz.UTCProvider;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.Mock;
-import org.powermock.api.mockito.PowerMockito;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import java.util.ArrayList;
-
-import dagger.android.HasAndroidInjector;
-import info.nightscout.androidaps.interfaces.Profile;
-import info.nightscout.androidaps.data.PumpEnactResult;
-import info.nightscout.androidaps.interfaces.ActivePlugin;
-import info.nightscout.androidaps.interfaces.CommandQueueProvider;
-import info.nightscout.androidaps.interfaces.PumpSync;
-import info.nightscout.androidaps.logging.AAPSLogger;
-import info.nightscout.androidaps.logging.AAPSLoggerTest;
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper;
-import info.nightscout.androidaps.plugins.pump.common.defs.PumpType;
-import info.nightscout.androidaps.plugins.pump.common.defs.TempBasalPair;
-import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkUtil;
-import info.nightscout.androidaps.plugins.pump.omnipod.eros.manager.AapsOmnipodErosManager;
-import info.nightscout.androidaps.utils.resources.ResourceHelper;
-import info.nightscout.androidaps.utils.rx.TestAapsSchedulers;
-
-
-@RunWith(PowerMockRunner.class)
-public class OmnipodErosPumpPluginTest {
-
-    @Mock HasAndroidInjector injector;
-    AAPSLogger aapsLogger = new AAPSLoggerTest();
-    RxBusWrapper rxBusWrapper = new RxBusWrapper(new TestAapsSchedulers());
-    @Mock ResourceHelper resourceHelper;
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS) ActivePlugin activePlugin;
-    @Mock AapsOmnipodErosManager aapsOmnipodErosManager;
-    @Mock CommandQueueProvider commandQueueProvider;
-    @Mock RileyLinkUtil rileyLinkUtil;
-    @Mock PumpSync pumpSync;
-
-    @Before
-    public void prepare() {
-        when(resourceHelper.gs(anyInt(), anyLong())).thenReturn("");
-    }
-
-    @Test
-    @PrepareForTest(Looper.class)
-    public <T> void testSetTempBasalPercent() {
-
-        DateTimeZone.setProvider(new UTCProvider());
-
-        // mock all the things
-        PowerMockito.mockStatic(Looper.class);
-        OmnipodErosPumpPlugin plugin = new OmnipodErosPumpPlugin(injector, aapsLogger, new TestAapsSchedulers(), rxBusWrapper, null,
-                resourceHelper, activePlugin, null, null, aapsOmnipodErosManager, commandQueueProvider,
-                null, null, null, null,
-                rileyLinkUtil, null, null, pumpSync
-        );
-        PumpSync.PumpState pumpState = new PumpSync.PumpState(null, null, null, null);
-        when(pumpSync.expectedPumpState()).thenReturn(pumpState);
-        when(rileyLinkUtil.getRileyLinkHistory()).thenReturn(new ArrayList<>());
-        when(injector.androidInjector()).thenReturn(instance -> {
-        });
-        Profile profile = mock(Profile.class);
-
-
-        // always return a PumpEnactResult containing same rate and duration as input
-        when(aapsOmnipodErosManager.setTemporaryBasal(any(TempBasalPair.class))).thenAnswer(
-                invocation -> {
-                    TempBasalPair pair = invocation.getArgument(0);
-                    PumpEnactResult result = new PumpEnactResult(injector);
-                    result.absolute(pair.getInsulinRate());
-                    result.duration(pair.getDurationMinutes());
-                    return result;
-                });
-
-
-        // Given standard basal
-        when(profile.getBasal()).thenReturn(0.5d);
-        // When
-        PumpEnactResult result1 = plugin.setTempBasalPercent(80, 30, profile, false, PumpSync.TemporaryBasalType.NORMAL);
-        PumpEnactResult result2 = plugin.setTempBasalPercent(5000, 30000, profile, false, PumpSync.TemporaryBasalType.NORMAL);
-        PumpEnactResult result3 = plugin.setTempBasalPercent(0, 30, profile, false, PumpSync.TemporaryBasalType.NORMAL);
-        PumpEnactResult result4 = plugin.setTempBasalPercent(0, 0, profile, false, PumpSync.TemporaryBasalType.NORMAL);
-        PumpEnactResult result5 = plugin.setTempBasalPercent(-50, 60, profile, false, PumpSync.TemporaryBasalType.NORMAL);
-        // Then return correct values
-        assertEquals(result1.getAbsolute(), 0.4d, 0.01d);
-        assertEquals(result1.getDuration(), 30);
-        assertEquals(result2.getAbsolute(), 25d, 0.01d);
-        assertEquals(result2.getDuration(), 30000);
-        assertEquals(result3.getAbsolute(), 0d, 0.01d);
-        assertEquals(result3.getDuration(), 30);
-        assertEquals(result4.getAbsolute(), -1d, 0.01d);
-        assertEquals(result4.getDuration(), -1);
-        // this is validated downstream, see TempBasalExtraCommand
-        assertEquals(result5.getAbsolute(), -0.25d, 0.01d);
-        assertEquals(result5.getDuration(), 60);
-
-        // Given zero basal
-        when(profile.getBasal()).thenReturn(0d);
-        // When
-        result1 = plugin.setTempBasalPercent(8000, 90, profile, false, PumpSync.TemporaryBasalType.NORMAL);
-        result2 = plugin.setTempBasalPercent(0, 0, profile, false, PumpSync.TemporaryBasalType.NORMAL);
-        // Then return zero values
-        assertEquals(result1.getAbsolute(), 0d, 0.01d);
-        assertEquals(result1.getDuration(), 90);
-        assertEquals(result2.getAbsolute(), -1d, 0.01d);
-        assertEquals(result2.getDuration(), -1);
-
-        // Given unhealthy basal
-        when(profile.getBasal()).thenReturn(500d);
-        // When treatment
-        result1 = plugin.setTempBasalPercent(80, 30, profile, false, PumpSync.TemporaryBasalType.NORMAL);
-        // Then return sane values
-        assertEquals(result1.getAbsolute(), PumpType.OMNIPOD_EROS.determineCorrectBasalSize(500d * 0.8), 0.01d);
-        assertEquals(result1.getDuration(), 30);
-
-        // Given weird basal
-        when(profile.getBasal()).thenReturn(1.234567d);
-        // When treatment
-        result1 = plugin.setTempBasalPercent(280, 600, profile, false, PumpSync.TemporaryBasalType.NORMAL);
-        // Then return sane values
-        assertEquals(result1.getAbsolute(), 3.4567876, 0.01d);
-        assertEquals(result1.getDuration(), 600);
-
-        // Given negative basal
-        when(profile.getBasal()).thenReturn(-1.234567d);
-        // When treatment
-        result1 = plugin.setTempBasalPercent(280, 510, profile, false, PumpSync.TemporaryBasalType.NORMAL);
-        // Then return negative value (this is validated further downstream, see TempBasalExtraCommand)
-        assertEquals(result1.getAbsolute(), -3.4567876, 0.01d);
-        assertEquals(result1.getDuration(), 510);
-    }
-
-}
diff --git a/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/OmnipodErosPumpPluginTest.kt b/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/OmnipodErosPumpPluginTest.kt
new file mode 100644
index 0000000000..9655fe8bb7
--- /dev/null
+++ b/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/OmnipodErosPumpPluginTest.kt
@@ -0,0 +1,157 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.eros
+
+import dagger.android.AndroidInjector
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.TestBase
+import info.nightscout.androidaps.data.PumpEnactResult
+import info.nightscout.androidaps.interfaces.ActivePlugin
+import info.nightscout.androidaps.interfaces.CommandQueueProvider
+import info.nightscout.androidaps.interfaces.Profile
+import info.nightscout.androidaps.interfaces.PumpSync
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.pump.common.defs.PumpType
+import info.nightscout.androidaps.plugins.pump.common.defs.TempBasalPair
+import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkUtil
+import info.nightscout.androidaps.plugins.pump.omnipod.eros.manager.AapsOmnipodErosManager
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import info.nightscout.androidaps.utils.rx.TestAapsSchedulers
+import org.joda.time.DateTimeZone
+import org.joda.time.tz.UTCProvider
+import org.junit.Assert
+import org.junit.Before
+import org.junit.Test
+import org.mockito.Answers
+import org.mockito.ArgumentMatchers
+import org.mockito.Mock
+import org.mockito.Mockito
+import org.mockito.Mockito.`when`
+import org.mockito.invocation.InvocationOnMock
+import java.util.*
+
+class OmnipodErosPumpPluginTest : TestBase() {
+
+    @Mock lateinit var injector: HasAndroidInjector
+    @Mock lateinit var resourceHelper: ResourceHelper
+    @Mock(answer = Answers.RETURNS_DEEP_STUBS) lateinit var activePlugin: ActivePlugin
+    @Mock lateinit var aapsOmnipodErosManager: AapsOmnipodErosManager
+    @Mock lateinit var commandQueueProvider: CommandQueueProvider
+    @Mock lateinit var rileyLinkUtil: RileyLinkUtil
+    @Mock lateinit var pumpSync: PumpSync
+
+    var rxBusWrapper = RxBusWrapper(TestAapsSchedulers())
+
+    @Before fun prepare() {
+        `when`(resourceHelper.gs(ArgumentMatchers.anyInt(), ArgumentMatchers.anyLong()))
+            .thenReturn("")
+    }
+
+    @Test fun testSetTempBasalPercent() {
+        DateTimeZone.setProvider(UTCProvider())
+
+        // mock all the things
+        val plugin = OmnipodErosPumpPlugin(
+            injector, aapsLogger, TestAapsSchedulers(), rxBusWrapper, null,
+            resourceHelper, activePlugin, null, null, aapsOmnipodErosManager, commandQueueProvider,
+            null, null, null, null,
+            rileyLinkUtil, null, null, pumpSync
+        )
+        val pumpState = PumpSync.PumpState(null, null, null, null)
+        `when`(pumpSync.expectedPumpState()).thenReturn(pumpState)
+        `when`(rileyLinkUtil.rileyLinkHistory).thenReturn(ArrayList())
+        `when`(injector.androidInjector()).thenReturn(
+            AndroidInjector { })
+        val profile = Mockito.mock(
+            Profile::class.java
+        )
+
+        // always return a PumpEnactResult containing same rate and duration as input
+        `when`(
+            aapsOmnipodErosManager.setTemporaryBasal(
+                ArgumentMatchers.any(
+                    TempBasalPair::class.java
+                )
+            )
+        ).thenAnswer { invocation: InvocationOnMock ->
+            val pair = invocation.getArgument<TempBasalPair>(0)
+            val result = PumpEnactResult(injector)
+            result.absolute(pair.insulinRate)
+            result.duration(pair.durationMinutes)
+            result
+        }
+
+        // Given standard basal
+        `when`(profile.getBasal()).thenReturn(0.5)
+        // When
+        var result1 =
+            plugin.setTempBasalPercent(80, 30, profile, false, PumpSync.TemporaryBasalType.NORMAL)
+        var result2 = plugin.setTempBasalPercent(
+            5000,
+            30000,
+            profile,
+            false,
+            PumpSync.TemporaryBasalType.NORMAL
+        )
+        val result3 =
+            plugin.setTempBasalPercent(0, 30, profile, false, PumpSync.TemporaryBasalType.NORMAL)
+        val result4 =
+            plugin.setTempBasalPercent(0, 0, profile, false, PumpSync.TemporaryBasalType.NORMAL)
+        val result5 =
+            plugin.setTempBasalPercent(-50, 60, profile, false, PumpSync.TemporaryBasalType.NORMAL)
+        // Then return correct values
+        Assert.assertEquals(result1.absolute, 0.4, 0.01)
+        Assert.assertEquals(result1.duration, 30)
+        Assert.assertEquals(result2.absolute, 25.0, 0.01)
+        Assert.assertEquals(result2.duration, 30000)
+        Assert.assertEquals(result3.absolute, 0.0, 0.01)
+        Assert.assertEquals(result3.duration, 30)
+        Assert.assertEquals(result4.absolute, -1.0, 0.01)
+        Assert.assertEquals(result4.duration, -1)
+        // this is validated downstream, see TempBasalExtraCommand
+        Assert.assertEquals(result5.absolute, -0.25, 0.01)
+        Assert.assertEquals(result5.duration, 60)
+
+        // Given zero basal
+        `when`(profile.getBasal()).thenReturn(0.0)
+        // When
+        result1 =
+            plugin.setTempBasalPercent(8000, 90, profile, false, PumpSync.TemporaryBasalType.NORMAL)
+        result2 =
+            plugin.setTempBasalPercent(0, 0, profile, false, PumpSync.TemporaryBasalType.NORMAL)
+        // Then return zero values
+        Assert.assertEquals(result1.absolute, 0.0, 0.01)
+        Assert.assertEquals(result1.duration, 90)
+        Assert.assertEquals(result2.absolute, -1.0, 0.01)
+        Assert.assertEquals(result2.duration, -1)
+
+        // Given unhealthy basal
+        `when`(profile.getBasal()).thenReturn(500.0)
+        // When treatment
+        result1 =
+            plugin.setTempBasalPercent(80, 30, profile, false, PumpSync.TemporaryBasalType.NORMAL)
+        // Then return sane values
+        Assert.assertEquals(
+            result1.absolute,
+            PumpType.OMNIPOD_EROS.determineCorrectBasalSize(500.0 * 0.8),
+            0.01
+        )
+        Assert.assertEquals(result1.duration, 30)
+
+        // Given weird basal
+        `when`(profile.getBasal()).thenReturn(1.234567)
+        // When treatment
+        result1 =
+            plugin.setTempBasalPercent(280, 600, profile, false, PumpSync.TemporaryBasalType.NORMAL)
+        // Then return sane values
+        Assert.assertEquals(result1.absolute, 3.4567876, 0.01)
+        Assert.assertEquals(result1.duration, 600)
+
+        // Given negative basal
+        `when`(profile.getBasal()).thenReturn(-1.234567)
+        // When treatment
+        result1 =
+            plugin.setTempBasalPercent(280, 510, profile, false, PumpSync.TemporaryBasalType.NORMAL)
+        // Then return negative value (this is validated further downstream, see TempBasalExtraCommand)
+        Assert.assertEquals(result1.absolute, -3.4567876, 0.01)
+        Assert.assertEquals(result1.duration, 510)
+    }
+}
\ No newline at end of file
diff --git a/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/AapsOmnipodErosManagerTest.java b/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/AapsOmnipodErosManagerTest.java
index fb14b39eda..487c24861c 100644
--- a/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/AapsOmnipodErosManagerTest.java
+++ b/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/driver/communication/AapsOmnipodErosManagerTest.java
@@ -1,10 +1,12 @@
 package info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.communication;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertThrows;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
 import org.joda.time.Duration;
-import org.junit.Rule;
 import org.junit.Test;
-import org.junit.rules.ExpectedException;
-import org.powermock.api.mockito.PowerMockito;
 
 import java.util.List;
 
@@ -13,33 +15,16 @@ import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.sc
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.schedule.BasalScheduleEntry;
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.manager.AapsOmnipodErosManager;
 
-import static org.junit.Assert.assertEquals;
-import static org.mockito.Mockito.mock;
-
 public class AapsOmnipodErosManagerTest {
-    @Rule
-    public ExpectedException thrown = ExpectedException.none();
 
     @Test
     public void validProfile() {
         Profile profile = mock(Profile.class);
 
-        Profile.ProfileValue value1 = mock(Profile.ProfileValue.class);
-        value1.setTimeAsSeconds(0);
-        value1.setValue(0.5D);
-
-        Profile.ProfileValue value2 = mock(Profile.ProfileValue.class);
-        value2.setTimeAsSeconds(18000);
-        value2.setValue(1.0D);
-
-        Profile.ProfileValue value3 = mock(Profile.ProfileValue.class);
-        value3.setTimeAsSeconds(50400);
-        value3.setValue(3.05D);
-
-        PowerMockito.when(profile.getBasalValues()).thenReturn(new Profile.ProfileValue[]{
-                value1,
-                value2,
-                value3
+        when(profile.getBasalValues()).thenReturn(new Profile.ProfileValue[]{
+                new Profile.ProfileValue(0, 0.5),
+                new Profile.ProfileValue(18000, 1.0),
+                new Profile.ProfileValue(50400, 3.05)
         });
 
         BasalSchedule basalSchedule = AapsOmnipodErosManager.mapProfileToBasalSchedule(profile);
@@ -62,98 +47,63 @@ public class AapsOmnipodErosManagerTest {
 
     @Test
     public void invalidProfileNullProfile() {
-        thrown.expect(IllegalArgumentException.class);
-        thrown.expectMessage("Profile can not be null");
-        AapsOmnipodErosManager.mapProfileToBasalSchedule(null);
+        assertThrows("Profile can not be null", IllegalArgumentException.class, () -> AapsOmnipodErosManager.mapProfileToBasalSchedule(null));
     }
 
     @Test
     public void invalidProfileNullEntries() {
-        thrown.expect(IllegalArgumentException.class);
-        thrown.expectMessage("Basal values can not be null");
-        AapsOmnipodErosManager.mapProfileToBasalSchedule(mock(Profile.class));
+        assertThrows("Basal values can not be null", IllegalArgumentException.class, () -> AapsOmnipodErosManager.mapProfileToBasalSchedule(mock(Profile.class)));
     }
 
     @Test
     public void invalidProfileZeroEntries() {
-        thrown.expect(IllegalArgumentException.class);
-        thrown.expectMessage("Entries can not be empty");
         Profile profile = mock(Profile.class);
 
-        PowerMockito.when(profile.getBasalValues()).thenReturn(new Profile.ProfileValue[0]);
+        when(profile.getBasalValues()).thenReturn(new Profile.ProfileValue[0]);
 
-        AapsOmnipodErosManager.mapProfileToBasalSchedule(profile);
+        assertThrows("Entries can not be empty", IllegalArgumentException.class, () -> AapsOmnipodErosManager.mapProfileToBasalSchedule(profile));
     }
 
     @Test
     public void invalidProfileNonZeroOffset() {
-        thrown.expect(IllegalArgumentException.class);
-        thrown.expectMessage("First basal schedule entry should have 0 offset");
-
         Profile profile = mock(Profile.class);
 
-        Profile.ProfileValue value = mock(Profile.ProfileValue.class);
-        value.setTimeAsSeconds(1800);
-        value.setValue(0.5D);
-
-        PowerMockito.when(profile.getBasalValues()).thenReturn(new Profile.ProfileValue[]{
-                value,
+        when(profile.getBasalValues()).thenReturn(new Profile.ProfileValue[]{
+                new Profile.ProfileValue(1800, 0.5)
         });
 
-        AapsOmnipodErosManager.mapProfileToBasalSchedule(profile);
+        assertThrows("First basal schedule entry should have 0 offset", IllegalArgumentException.class, () -> AapsOmnipodErosManager.mapProfileToBasalSchedule(profile));
     }
 
     @Test
     public void invalidProfileMoreThan24Hours() {
-        thrown.expect(IllegalArgumentException.class);
-        thrown.expectMessage("Invalid start time");
-
         Profile profile = mock(Profile.class);
 
-        Profile.ProfileValue value1 = mock(Profile.ProfileValue.class);
-        value1.setTimeAsSeconds(0);
-        value1.setValue(0.5D);
-
-        Profile.ProfileValue value2 = mock(Profile.ProfileValue.class);
-        value2.setTimeAsSeconds(86400);
-        value2.setValue(0.5D);
-
-        PowerMockito.when(profile.getBasalValues()).thenReturn(new Profile.ProfileValue[]{
-                value1,
-                value2
+        when(profile.getBasalValues()).thenReturn(new Profile.ProfileValue[]{
+                new Profile.ProfileValue(0, 0.5),
+                new Profile.ProfileValue(86400, 0.5)
         });
 
-        AapsOmnipodErosManager.mapProfileToBasalSchedule(profile);
+        assertThrows("Invalid start time", IllegalArgumentException.class, () -> AapsOmnipodErosManager.mapProfileToBasalSchedule(profile));
     }
 
     @Test
     public void invalidProfileNegativeOffset() {
-        thrown.expect(IllegalArgumentException.class);
-        thrown.expectMessage("Invalid start time");
-
         Profile profile = mock(Profile.class);
 
-        Profile.ProfileValue value = mock(Profile.ProfileValue.class);
-        value.setTimeAsSeconds(-1);
-        value.setValue(0.5D);
-
-        PowerMockito.when(profile.getBasalValues()).thenReturn(new Profile.ProfileValue[]{
-                value,
+        when(profile.getBasalValues()).thenReturn(new Profile.ProfileValue[]{
+                new Profile.ProfileValue(-1, 0.5)
         });
 
-        AapsOmnipodErosManager.mapProfileToBasalSchedule(profile);
+        assertThrows("Invalid start time", IllegalArgumentException.class, () -> AapsOmnipodErosManager.mapProfileToBasalSchedule(profile));
     }
 
     @Test
     public void roundsToSupportedPrecision() {
         Profile profile = mock(Profile.class);
 
-        Profile.ProfileValue value = mock(Profile.ProfileValue.class);
-        value.setTimeAsSeconds(0);
-        value.setValue(0.04D);
-
-        PowerMockito.when(profile.getBasalValues()).thenReturn(new Profile.ProfileValue[]{
-                value,
+        when(profile.getBasalValues()).thenReturn(new Profile.ProfileValue[]{
+                new Profile.ProfileValue(0, 0.04),
         });
 
         BasalSchedule basalSchedule = AapsOmnipodErosManager.mapProfileToBasalSchedule(profile);
diff --git a/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/manager/AapsErosPodStateManagerTest.java b/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/manager/AapsErosPodStateManagerTest.java
deleted file mode 100644
index 595cad0672..0000000000
--- a/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/manager/AapsErosPodStateManagerTest.java
+++ /dev/null
@@ -1,98 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.omnipod.eros.manager;
-
-import org.joda.time.DateTime;
-import org.joda.time.DateTimeUtils;
-import org.joda.time.DateTimeZone;
-import org.joda.time.Duration;
-import org.junit.After;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.nightscout.androidaps.logging.AAPSLogger;
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper;
-import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.FirmwareVersion;
-import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.PodProgressStatus;
-import info.nightscout.androidaps.utils.rx.TestAapsSchedulers;
-import info.nightscout.androidaps.utils.sharedPreferences.SP;
-
-import static org.junit.Assert.assertEquals;
-
-@RunWith(PowerMockRunner.class)
-public class AapsErosPodStateManagerTest {
-    @Mock AAPSLogger aapsLogger;
-    @Mock SP sp;
-
-    private RxBusWrapper rxBus = new RxBusWrapper(new TestAapsSchedulers());
-
-    @Test
-    public void times() {
-        DateTimeZone timeZone = DateTimeZone.UTC;
-        DateTimeZone.setDefault(timeZone);
-
-        DateTime now = new DateTime(2020, 1, 1, 1, 2, 3, timeZone);
-
-        DateTimeUtils.setCurrentMillisFixed(now.getMillis());
-
-        AapsErosPodStateManager podStateManager = new AapsErosPodStateManager(aapsLogger, sp, rxBus);
-        podStateManager.initState(0x0);
-        podStateManager.setInitializationParameters(0, 0, new FirmwareVersion(1, 1, 1),
-                new FirmwareVersion(2, 2, 2), timeZone, PodProgressStatus.ABOVE_FIFTY_UNITS);
-
-        assertEquals(now, podStateManager.getTime());
-        assertEquals(Duration.standardHours(1).plus(Duration.standardMinutes(2).plus(Duration.standardSeconds(3))), podStateManager.getScheduleOffset());
-    }
-
-    @Test
-    public void changeSystemTimeZoneWithoutChangingPodTimeZone() {
-        DateTimeZone timeZone = DateTimeZone.UTC;
-        DateTimeZone.setDefault(timeZone);
-
-        DateTime now = new DateTime(2020, 1, 1, 1, 2, 3, timeZone);
-
-        DateTimeUtils.setCurrentMillisFixed(now.getMillis());
-
-        AapsErosPodStateManager podStateManager = new AapsErosPodStateManager(aapsLogger, sp, rxBus);
-        podStateManager.initState(0x0);
-        podStateManager.setInitializationParameters(0, 0, new FirmwareVersion(1, 1, 1),
-                new FirmwareVersion(2, 2, 2), timeZone, PodProgressStatus.ABOVE_FIFTY_UNITS);
-
-        DateTimeZone newTimeZone = DateTimeZone.forOffsetHours(2);
-        DateTimeZone.setDefault(newTimeZone);
-
-        // The system time zone has been updated, but the pod session state's time zone hasn't
-        // So the pods time should not have been changed
-        assertEquals(now, podStateManager.getTime());
-        assertEquals(Duration.standardHours(1).plus(Duration.standardMinutes(2).plus(Duration.standardSeconds(3))), podStateManager.getScheduleOffset());
-    }
-
-    @Test
-    public void changeSystemTimeZoneAndChangePodTimeZone() {
-        DateTimeZone timeZone = DateTimeZone.UTC;
-        DateTimeZone.setDefault(timeZone);
-
-        DateTime now = new DateTime(2020, 1, 1, 1, 2, 3, timeZone);
-
-        DateTimeUtils.setCurrentMillisFixed(now.getMillis());
-
-        AapsErosPodStateManager podStateManager = new AapsErosPodStateManager(aapsLogger, sp, rxBus);
-        podStateManager.initState(0x0);
-        podStateManager.setInitializationParameters(0, 0, new FirmwareVersion(1, 1, 1),
-                new FirmwareVersion(2, 2, 2), timeZone, PodProgressStatus.ABOVE_FIFTY_UNITS);
-
-        DateTimeZone newTimeZone = DateTimeZone.forOffsetHours(2);
-        DateTimeZone.setDefault(newTimeZone);
-        podStateManager.setTimeZone(newTimeZone);
-
-        // Both the system time zone have been updated
-        // So the pods time should have been changed (to +2 hours)
-        assertEquals(now.withZone(newTimeZone), podStateManager.getTime());
-        assertEquals(Duration.standardHours(3).plus(Duration.standardMinutes(2).plus(Duration.standardSeconds(3))), podStateManager.getScheduleOffset());
-    }
-
-    @After
-    public void tearDown() {
-        DateTimeUtils.setCurrentMillisSystem();
-    }
-}
\ No newline at end of file
diff --git a/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/manager/AapsErosPodStateManagerTest.kt b/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/manager/AapsErosPodStateManagerTest.kt
new file mode 100644
index 0000000000..6d21e22ac2
--- /dev/null
+++ b/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/manager/AapsErosPodStateManagerTest.kt
@@ -0,0 +1,95 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.eros.manager
+
+import info.nightscout.androidaps.TestBase
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.FirmwareVersion
+import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.PodProgressStatus
+import info.nightscout.androidaps.utils.rx.TestAapsSchedulers
+import info.nightscout.androidaps.utils.sharedPreferences.SP
+import org.joda.time.DateTime
+import org.joda.time.DateTimeUtils
+import org.joda.time.DateTimeZone
+import org.joda.time.Duration
+import org.junit.After
+import org.junit.Assert
+import org.junit.Test
+import org.mockito.Mock
+
+class AapsErosPodStateManagerTest : TestBase() {
+
+    @Mock lateinit var sp: SP
+
+    private val rxBus = RxBusWrapper(TestAapsSchedulers())
+
+    @Test fun times() {
+        val timeZone = DateTimeZone.UTC
+        DateTimeZone.setDefault(timeZone)
+        val now = DateTime(2020, 1, 1, 1, 2, 3, timeZone)
+        DateTimeUtils.setCurrentMillisFixed(now.millis)
+        val podStateManager = AapsErosPodStateManager(aapsLogger, sp, rxBus)
+        podStateManager.initState(0x0)
+        podStateManager.setInitializationParameters(
+            0, 0, FirmwareVersion(1, 1, 1),
+            FirmwareVersion(2, 2, 2), timeZone, PodProgressStatus.ABOVE_FIFTY_UNITS
+        )
+        Assert.assertEquals(now, podStateManager.time)
+        Assert.assertEquals(
+            Duration.standardHours(1)
+                .plus(Duration.standardMinutes(2).plus(Duration.standardSeconds(3))),
+            podStateManager.scheduleOffset
+        )
+    }
+
+    @Test fun changeSystemTimeZoneWithoutChangingPodTimeZone() {
+        val timeZone = DateTimeZone.UTC
+        DateTimeZone.setDefault(timeZone)
+        val now = DateTime(2020, 1, 1, 1, 2, 3, timeZone)
+        DateTimeUtils.setCurrentMillisFixed(now.millis)
+        val podStateManager = AapsErosPodStateManager(aapsLogger, sp, rxBus)
+        podStateManager.initState(0x0)
+        podStateManager.setInitializationParameters(
+            0, 0, FirmwareVersion(1, 1, 1),
+            FirmwareVersion(2, 2, 2), timeZone, PodProgressStatus.ABOVE_FIFTY_UNITS
+        )
+        val newTimeZone = DateTimeZone.forOffsetHours(2)
+        DateTimeZone.setDefault(newTimeZone)
+
+        // The system time zone has been updated, but the pod session state's time zone hasn't
+        // So the pods time should not have been changed
+        Assert.assertEquals(now, podStateManager.time)
+        Assert.assertEquals(
+            Duration.standardHours(1)
+                .plus(Duration.standardMinutes(2).plus(Duration.standardSeconds(3))),
+            podStateManager.scheduleOffset
+        )
+    }
+
+    @Test fun changeSystemTimeZoneAndChangePodTimeZone() {
+        val timeZone = DateTimeZone.UTC
+        DateTimeZone.setDefault(timeZone)
+        val now = DateTime(2020, 1, 1, 1, 2, 3, timeZone)
+        DateTimeUtils.setCurrentMillisFixed(now.millis)
+        val podStateManager = AapsErosPodStateManager(aapsLogger, sp, rxBus)
+        podStateManager.initState(0x0)
+        podStateManager.setInitializationParameters(
+            0, 0, FirmwareVersion(1, 1, 1),
+            FirmwareVersion(2, 2, 2), timeZone, PodProgressStatus.ABOVE_FIFTY_UNITS
+        )
+        val newTimeZone = DateTimeZone.forOffsetHours(2)
+        DateTimeZone.setDefault(newTimeZone)
+        podStateManager.timeZone = newTimeZone
+
+        // Both the system time zone have been updated
+        // So the pods time should have been changed (to +2 hours)
+        Assert.assertEquals(now.withZone(newTimeZone), podStateManager.time)
+        Assert.assertEquals(
+            Duration.standardHours(3)
+                .plus(Duration.standardMinutes(2).plus(Duration.standardSeconds(3))),
+            podStateManager.scheduleOffset
+        )
+    }
+
+    @After fun tearDown() {
+        DateTimeUtils.setCurrentMillisSystem()
+    }
+}
\ No newline at end of file
diff --git a/openhumans/.gitignore b/openhumans/.gitignore
new file mode 100644
index 0000000000..42afabfd2a
--- /dev/null
+++ b/openhumans/.gitignore
@@ -0,0 +1 @@
+/build
\ No newline at end of file
diff --git a/openhumans/build.gradle b/openhumans/build.gradle
new file mode 100644
index 0000000000..5e06a3e587
--- /dev/null
+++ b/openhumans/build.gradle
@@ -0,0 +1,16 @@
+apply plugin: 'com.android.library'
+apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-kapt'
+apply plugin: 'kotlin-allopen'
+apply plugin: 'com.hiya.jacoco-android'
+
+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"
+
+
+dependencies {
+    implementation project(':core')
+    implementation project(':database')
+}
\ No newline at end of file
diff --git a/openhumans/consumer-rules.pro b/openhumans/consumer-rules.pro
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/openhumans/proguard-rules.pro b/openhumans/proguard-rules.pro
new file mode 100644
index 0000000000..481bb43481
--- /dev/null
+++ b/openhumans/proguard-rules.pro
@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
\ No newline at end of file
diff --git a/openhumans/src/main/AndroidManifest.xml b/openhumans/src/main/AndroidManifest.xml
new file mode 100644
index 0000000000..ed6ea8dc06
--- /dev/null
+++ b/openhumans/src/main/AndroidManifest.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="info.nightscout.androidaps.plugin.general.openhumans">
+
+    <application>
+        <activity
+            android:name=".ui.OHLoginActivity"
+            android:launchMode="singleTop"
+            android:theme="@style/OpenHumans"
+            android:label="Setup Open Humans"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data
+                    android:host="setup-openhumans"
+                    android:scheme="androidaps" />
+            </intent-filter>
+        </activity>
+    </application>
+</manifest>
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/openhumans/AllowedPreferenceKeys.kt b/openhumans/src/main/java/info/nightscout/androidaps/plugin/general/openhumans/AllowedPreferenceKeys.kt
similarity index 95%
rename from app/src/main/java/info/nightscout/androidaps/plugins/general/openhumans/AllowedPreferenceKeys.kt
rename to openhumans/src/main/java/info/nightscout/androidaps/plugin/general/openhumans/AllowedPreferenceKeys.kt
index 0398af2892..90350cdcaa 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/openhumans/AllowedPreferenceKeys.kt
+++ b/openhumans/src/main/java/info/nightscout/androidaps/plugin/general/openhumans/AllowedPreferenceKeys.kt
@@ -1,11 +1,9 @@
-package info.nightscout.androidaps.plugins.general.openhumans
+package info.nightscout.androidaps.plugin.general.openhumans
 
 import java.util.*
 
-@kotlin.ExperimentalStdlibApi
-fun String.isAllowedKey() = if (startsWith("ConfigBuilder_")) true else allowedKeys.contains(this.uppercase(Locale.ROOT))
+internal fun String.isAllowedKey() = if (startsWith("ConfigBuilder_")) true else allowedKeys.contains(this.uppercase(Locale.ROOT))
 
-@kotlin.ExperimentalStdlibApi
 private val allowedKeys = """
     absorption
     absorption_maxtime
diff --git a/openhumans/src/main/java/info/nightscout/androidaps/plugin/general/openhumans/OpenHumansAPI.kt b/openhumans/src/main/java/info/nightscout/androidaps/plugin/general/openhumans/OpenHumansAPI.kt
new file mode 100644
index 0000000000..69bca72f66
--- /dev/null
+++ b/openhumans/src/main/java/info/nightscout/androidaps/plugin/general/openhumans/OpenHumansAPI.kt
@@ -0,0 +1,183 @@
+package info.nightscout.androidaps.plugin.general.openhumans
+
+import android.annotation.SuppressLint
+import android.util.Base64
+import info.nightscout.androidaps.plugin.general.openhumans.dagger.BaseUrl
+import info.nightscout.androidaps.plugin.general.openhumans.dagger.ClientId
+import info.nightscout.androidaps.plugin.general.openhumans.dagger.ClientSecret
+import info.nightscout.androidaps.plugin.general.openhumans.dagger.RedirectUrl
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.suspendCancellableCoroutine
+import okhttp3.*
+import okio.BufferedSink
+import org.json.JSONArray
+import org.json.JSONObject
+import java.io.IOException
+import java.text.SimpleDateFormat
+import java.util.*
+import javax.inject.Inject
+import kotlin.coroutines.resumeWithException
+
+internal class OpenHumansAPI @Inject constructor(
+    @BaseUrl
+    private val baseUrl: String,
+    @ClientId
+    clientId: String,
+    @ClientSecret
+    clientSecret: String,
+    @RedirectUrl
+    private val redirectUrl: String
+) {
+    private val authHeader = "Basic " + Base64.encodeToString("$clientId:$clientSecret".toByteArray(), Base64.NO_WRAP)
+    private val client = OkHttpClient()
+
+    suspend fun exchangeBearerToken(bearerToken: String) = sendTokenRequest(FormBody.Builder()
+        .add("grant_type", "authorization_code")
+        .add("redirect_uri", redirectUrl)
+        .add("code", bearerToken)
+        .build())
+
+    suspend fun refreshAccessToken(refreshToken: String) = sendTokenRequest(FormBody.Builder()
+        .add("grant_type", "refresh_token")
+        .add("redirect_uri", redirectUrl)
+        .add("refresh_token", refreshToken)
+        .build())
+
+    private suspend fun sendTokenRequest(body: FormBody): OAuthTokens {
+        val timestamp = System.currentTimeMillis()
+        val request = Request.Builder()
+            .url("$baseUrl/oauth2/token/")
+            .addHeader("Authorization", authHeader)
+            .post(body)
+            .build()
+        val response = request.await()
+        val json = response.body?.let { JSONObject(it.string()) }
+        if (json == null || !response.isSuccessful) throw OHHttpException(response.code, response.message, json?.getString("error"))
+        val accessToken = json.getString("access_token") ?: throw OHProtocolViolationException("access_token missing")
+        val refreshToken = json.getString("refresh_token") ?: throw OHProtocolViolationException("refresh_token missing")
+        if (!json.has("expires_in")) throw OHProtocolViolationException("expires_in missing")
+        val expiresAt = timestamp + json.getInt("expires_in") * 1000L
+        return OAuthTokens(accessToken, refreshToken, expiresAt)
+    }
+
+    suspend fun getProjectMemberId(accessToken: String): String {
+        val request = Request.Builder()
+            .url("$baseUrl/api/direct-sharing/project/exchange-member/?access_token=$accessToken")
+            .get()
+            .build()
+        val response = request.await()
+        val json = response.body?.let { JSONObject(it.string()) }
+        if (json == null || !response.isSuccessful) throw OHHttpException(response.code, response.message, json?.getString("detail"))
+        return json.getString("project_member_id") ?: throw OHProtocolViolationException("project_member_id missing")
+    }
+
+    suspend fun prepareFileUpload(accessToken: String, fileName: String, metadata: FileMetadata): PreparedUpload {
+        val request = Request.Builder()
+            .url("$baseUrl/api/direct-sharing/project/files/upload/direct/?access_token=$accessToken")
+            .post(FormBody.Builder()
+                .add("filename", fileName)
+                .add("metadata", metadata.toJSON().toString())
+                .build())
+            .build()
+        val response = request.await()
+        val json = response.body?.let { JSONObject(it.string()) }
+        if (json == null || !response.isSuccessful) throw OHHttpException(response.code, response.message, json?.getString("detail"))
+        return PreparedUpload(
+            fileId = json.getString("id") ?: throw OHProtocolViolationException("id missing"),
+            uploadURL = json.getString("url") ?: throw OHProtocolViolationException("url missing")
+        )
+    }
+
+    suspend fun uploadFile(url: String, content: ByteArray) {
+        val request = Request.Builder()
+            .url(url)
+            .put(object : RequestBody() {
+                override fun contentType(): MediaType? = null
+
+                override fun contentLength(): Long = content.size.toLong()
+
+                override fun writeTo(sink: BufferedSink) {
+                    sink.write(content)
+                }
+            })
+            .build()
+        val response = request.await()
+        if (!response.isSuccessful) throw OHHttpException(response.code, response.message, null)
+    }
+
+    suspend fun completeFileUpload(accessToken: String, fileId: String) {
+        val request = Request.Builder()
+            .url("$baseUrl/api/direct-sharing/project/files/upload/complete/?access_token=$accessToken")
+            .post(FormBody.Builder()
+                .add("file_id", fileId)
+                .build())
+            .build()
+        val response = request.await()
+        if (!response.isSuccessful) throw OHHttpException(response.code, response.message, null)
+    }
+
+    private suspend fun Request.await(): Response {
+        val call = client.newCall(this)
+        return suspendCancellableCoroutine {
+            call.enqueue(object : Callback {
+                override fun onFailure(call: Call, e: IOException) {
+                    it.resumeWithException(e)
+                }
+
+                override fun onResponse(call: Call, response: Response) {
+                    it.resume(response, null)
+                }
+            })
+            it.invokeOnCancellation { call.cancel() }
+        }
+    }
+
+    data class FileMetadata(
+        val tags: List<String>,
+        val description: String,
+        val md5: String? = null,
+        val creationDate: Long? = null,
+        val startDate: Long? = null,
+        val endDate: Long? = null
+    ) {
+
+        fun toJSON(): JSONObject {
+            val jsonObject = JSONObject()
+            jsonObject.put("tags", JSONArray().apply { tags.forEach { put(it) } })
+            jsonObject.put("description", description)
+            jsonObject.put("md5", md5)
+            creationDate?.let { jsonObject.put("creation_date", iso8601DateFormatter.format(Date(it))) }
+            startDate?.let { jsonObject.put("start_date", iso8601DateFormatter.format(Date(it))) }
+            endDate?.let { jsonObject.put("end_date", iso8601DateFormatter.format(Date(it))) }
+            return jsonObject
+        }
+    }
+
+    data class PreparedUpload(
+        val fileId: String,
+        val uploadURL: String
+    )
+
+    data class OAuthTokens(
+        val accessToken: String,
+        val refreshToken: String,
+        val expiresAt: Long
+    )
+
+    data class OHHttpException(
+        val code: Int,
+        val meaning: String,
+        val detail: String?
+    ) : RuntimeException() {
+        override val message: String get() = toString()
+    }
+
+    class OHProtocolViolationException(
+        override val message: String
+    ) : RuntimeException()
+
+    private companion object {
+        @SuppressLint("SimpleDateFormat")
+        val iso8601DateFormatter = SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSXXX")
+    }
+}
\ No newline at end of file
diff --git a/openhumans/src/main/java/info/nightscout/androidaps/plugin/general/openhumans/OpenHumansState.kt b/openhumans/src/main/java/info/nightscout/androidaps/plugin/general/openhumans/OpenHumansState.kt
new file mode 100644
index 0000000000..b981bbb60c
--- /dev/null
+++ b/openhumans/src/main/java/info/nightscout/androidaps/plugin/general/openhumans/OpenHumansState.kt
@@ -0,0 +1,9 @@
+package info.nightscout.androidaps.plugin.general.openhumans
+
+internal data class OpenHumansState(
+    val accessToken: String,
+    val refreshToken: String,
+    val expiresAt: Long,
+    val projectMemberId: String,
+    val uploadOffset: Long
+)
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
new file mode 100644
index 0000000000..469f4aa346
--- /dev/null
+++ b/openhumans/src/main/java/info/nightscout/androidaps/plugin/general/openhumans/OpenHumansUploader.kt
@@ -0,0 +1,659 @@
+package info.nightscout.androidaps.plugin.general.openhumans
+
+import android.app.NotificationChannel
+import android.app.NotificationManager
+import android.app.PendingIntent
+import android.content.Context
+import android.content.Intent
+import android.util.DisplayMetrics
+import android.view.WindowManager
+import androidx.core.app.NotificationCompat
+import androidx.core.app.NotificationManagerCompat
+import androidx.work.*
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.database.AppRepository
+import info.nightscout.androidaps.database.data.Block
+import info.nightscout.androidaps.database.interfaces.TraceableDBEntry
+import info.nightscout.androidaps.events.EventPreferenceChange
+import info.nightscout.androidaps.interfaces.PluginBase
+import info.nightscout.androidaps.interfaces.PluginDescription
+import info.nightscout.androidaps.interfaces.PluginType
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.plugin.general.openhumans.delegates.OHAppIDDelegate
+import info.nightscout.androidaps.plugin.general.openhumans.delegates.OHCounterDelegate
+import info.nightscout.androidaps.plugin.general.openhumans.delegates.OHStateDelegate
+import info.nightscout.androidaps.plugin.general.openhumans.ui.OHFragment
+import info.nightscout.androidaps.plugin.general.openhumans.ui.OHLoginActivity
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import info.nightscout.androidaps.utils.sharedPreferences.SP
+import io.reactivex.disposables.CompositeDisposable
+import io.reactivex.rxkotlin.plusAssign
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.NonCancellable
+import kotlinx.coroutines.withContext
+import org.json.JSONArray
+import org.json.JSONObject
+import java.io.ByteArrayOutputStream
+import java.security.MessageDigest
+import java.text.SimpleDateFormat
+import java.util.*
+import java.util.concurrent.TimeUnit
+import java.util.zip.ZipEntry
+import java.util.zip.ZipOutputStream
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class OpenHumansUploader @Inject internal constructor(
+    injector: HasAndroidInjector,
+    resourceHelper: ResourceHelper,
+    aapsLogger: AAPSLogger,
+    private val sp: SP,
+    private val context: Context,
+    private val repository: AppRepository,
+    private val openHumansAPI: OpenHumansAPI,
+    stateDelegate: OHStateDelegate,
+    counterDelegate: OHCounterDelegate,
+    appIdDelegate: OHAppIDDelegate,
+    private val rxBus: RxBusWrapper
+) : PluginBase(
+    PluginDescription()
+        .mainType(PluginType.GENERAL)
+        .pluginIcon(R.drawable.open_humans_white)
+        .pluginName(R.string.open_humans)
+        .shortName(R.string.open_humans_short)
+        .description(R.string.open_humans_description)
+        .preferencesId(R.xml.pref_openhumans)
+        .fragmentClass(OHFragment::class.qualifiedName),
+    aapsLogger, resourceHelper, injector
+) {
+
+    private var openHumansState by stateDelegate
+    private var uploadCounter by counterDelegate
+    private val appId by appIdDelegate
+
+    private val preferenceChangeDisposable = CompositeDisposable()
+
+    override fun onStart() {
+        super.onStart()
+        setupNotificationChannels()
+        if (openHumansState != null) scheduleWorker(false)
+        preferenceChangeDisposable += rxBus.toObservable(EventPreferenceChange::class.java).subscribe {
+            onSharedPreferenceChanged(it)
+        }
+    }
+
+    override fun onStop() {
+        super.onStop()
+        cancelWorker()
+        preferenceChangeDisposable.clear()
+    }
+
+    private fun onSharedPreferenceChanged(event: EventPreferenceChange) {
+        if (event.changedKey in arrayOf("key_oh_charging_only", "key_oh_wifi_only")  && openHumansState != null) scheduleWorker(true)
+    }
+
+    suspend fun login(bearerToken: String) = withContext(Dispatchers.IO) {
+        try {
+            val oAuthTokens = openHumansAPI.exchangeBearerToken(bearerToken)
+            val projectMemberId = openHumansAPI.getProjectMemberId(oAuthTokens.accessToken)
+            withContext(Dispatchers.Main) {
+                openHumansState = OpenHumansState(
+                    accessToken = oAuthTokens.accessToken,
+                    refreshToken = oAuthTokens.refreshToken,
+                    expiresAt = oAuthTokens.expiresAt,
+                    projectMemberId = projectMemberId,
+                    uploadOffset = 0L
+                )
+            }
+            scheduleWorker(false)
+        } catch (e: Exception) {
+            aapsLogger.error("Error while logging in to Open Humans", e)
+            throw e
+        }
+    }
+
+    private fun String.sha256(): String {
+        val messageDigest = MessageDigest.getInstance("SHA-256")
+        messageDigest.update(toByteArray())
+        return messageDigest.digest().toHexString()
+    }
+
+    private fun <T : TraceableDBEntry> ZipOutputStream.writeDBEntryFile(name: String, list: List<T>, block: JSONObject.(entry: T) -> Unit) = writeJSONArrayFile(name, list) {
+        put("structureVersion", 2)
+        put("id", it.id)
+        put("version", it.version)
+        put("dateCreated", it.dateCreated)
+        put("isValid", it)
+        put("referenceId", it.referenceId)
+        put("pumpType", it.interfaceIDs.pumpType)
+        put("pumpSerialHash", it.interfaceIDs.pumpSerial?.sha256())
+        put("pumpId", it.interfaceIDs.pumpId)
+        put("startId", it.interfaceIDs.startId)
+        put("endId", it.interfaceIDs.endId)
+        block(it)
+    }
+
+    private fun <T> ZipOutputStream.writeJSONArrayFile(name: String, list: List<T>, block: JSONObject.(entry: T) -> Unit) {
+        val jsonArray = JSONArray()
+        list.forEach { entry ->
+            val jsonObject = JSONObject()
+            jsonObject.block(entry)
+            jsonArray.put(jsonObject)
+        }
+        writeFile(name, jsonArray.toString().toByteArray())
+    }
+
+    private fun ZipOutputStream.writeFile(name: String, bytes: ByteArray) {
+        putNextEntry(ZipEntry(name))
+        write(bytes)
+        closeEntry()
+    }
+
+    private fun List<Block>.serialize(): JSONArray {
+        val jsonArray = JSONArray()
+        forEach {
+            val jsonObject = JSONObject()
+            jsonObject.put("duration", it.duration)
+            jsonObject.put("amount", it.amount)
+            jsonArray.put(jsonObject)
+        }
+        return jsonArray
+    }
+
+    internal suspend fun uploadData() {
+        try {
+            withContext(Dispatchers.Default) {
+                val timestamp = System.currentTimeMillis()
+                val offset = openHumansState!!.uploadOffset
+                var page = 0
+                while (uploadDataPaged(offset, timestamp, page++));
+                withContext(Dispatchers.Main) {
+                    openHumansState = openHumansState!!.copy(uploadOffset = timestamp)
+                }
+            }
+        } catch (e: OpenHumansAPI.OHHttpException) {
+            if (e.code == 401 && e.detail == "Invalid token.") {
+                withContext(NonCancellable) {
+                    handleSignOut()
+                }
+            }
+        }
+    }
+
+    private suspend fun uploadDataPaged(since: Long, until: Long, page: Int): Boolean {
+        val data = repository
+            .collectNewEntriesSince(since, until, 1000, 1000 * page)
+            .let { data -> data.copy(preferencesChanges = data.preferencesChanges.filter { it.key.isAllowedKey() }) }
+        val hasData = with(data) {
+            apsResults.isNotEmpty() ||
+                apsResultLinks.isNotEmpty() ||
+                bolusCalculatorResults.isNotEmpty() ||
+                boluses.isNotEmpty() ||
+                carbs.isNotEmpty() ||
+                effectiveProfileSwitches.isNotEmpty() ||
+                extendedBoluses.isNotEmpty() ||
+                glucoseValues.isNotEmpty() ||
+                multiwaveBolusLinks.isNotEmpty() ||
+                offlineEvents.isNotEmpty() ||
+                preferencesChanges.isNotEmpty() ||
+                profileSwitches.isNotEmpty() ||
+                temporaryBasals.isNotEmpty() ||
+                temporaryTarget.isNotEmpty() ||
+                therapyEvents.isNotEmpty() ||
+                totalDailyDoses.isNotEmpty() ||
+                versionChanges.isNotEmpty()
+        }
+        if (!hasData) return false
+
+        val baos = ByteArrayOutputStream()
+        val zos = ZipOutputStream(baos)
+        val tags = mutableListOf<String>()
+
+        val applicationInfo = JSONObject()
+        //TODO: Move build configuration to core module
+        /*applicationInfo.put("versionName", BuildConfig.VERSION_NAME)
+        applicationInfo.put("versionCode", BuildConfig.VERSION_CODE)
+        val hasGitInfo = !BuildConfig.HEAD.endsWith("NoGitSystemAvailable", true)
+        val customRemote = !BuildConfig.REMOTE.equals("https://github.com/nightscout/AndroidAPS.git", true)
+        applicationInfo.put("hasGitInfo", hasGitInfo)
+        applicationInfo.put("customRemote", customRemote)*/
+        applicationInfo.put("applicationId", appId.toString())
+        zos.writeFile("ApplicationInfo.json", applicationInfo.toString().toByteArray())
+        tags.add("ApplicationInfo")
+
+        val deviceInfo = JSONObject()
+        deviceInfo.put("brand", android.os.Build.BRAND)
+        deviceInfo.put("device", android.os.Build.DEVICE)
+        deviceInfo.put("manufacturer", android.os.Build.MANUFACTURER)
+        deviceInfo.put("model", android.os.Build.MODEL)
+        deviceInfo.put("product", android.os.Build.PRODUCT)
+        zos.writeFile("DeviceInfo.json", deviceInfo.toString().toByteArray())
+        tags.add("DeviceInfo")
+
+        val displayMetrics = DisplayMetrics()
+        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.R)
+            context.display?.getRealMetrics(displayMetrics)
+        else
+            @Suppress("DEPRECATION") (context.getSystemService(Context.WINDOW_SERVICE) as WindowManager).defaultDisplay.getMetrics(displayMetrics)
+
+        val displayInfo = JSONObject()
+        displayInfo.put("height", displayMetrics.heightPixels)
+        displayInfo.put("width", displayMetrics.widthPixels)
+        displayInfo.put("density", displayMetrics.density)
+        displayInfo.put("scaledDensity", displayMetrics.scaledDensity)
+        displayInfo.put("xdpi", displayMetrics.xdpi)
+        displayInfo.put("ydpi", displayMetrics.ydpi)
+        zos.writeFile("DisplayInfo.json", displayInfo.toString().toByteArray())
+        tags.add("DisplayInfo")
+
+        val uploadNumber = this.uploadCounter++
+        val uploadDate = Date()
+        val uploadInfo = JSONObject()
+        uploadInfo.put("fileVersion", 2)
+        uploadInfo.put("counter", uploadNumber)
+        uploadInfo.put("timestamp", until)
+        uploadInfo.put("utcOffset", TimeZone.getDefault().getOffset(uploadDate.time))
+        zos.writeFile("UploadInfo.json", uploadInfo.toString().toByteArray())
+        tags.add("UploadInfo")
+
+        if (data.apsResults.isNotEmpty()) {
+            zos.writeDBEntryFile("APSResults.json", data.apsResults) {
+                put("timestamp", it.timestamp)
+                put("utcOffset", it.utcOffset)
+                put("algorithm", it.algorithm.toString())
+                put("glucoseStatus", JSONObject(it.glucoseStatusJson))
+                put("currentTemp", JSONObject(it.currentTempJson))
+                put("iobData", JSONObject(it.iobDataJson))
+                put("profile", JSONObject(it.profileJson))
+                put("autosensData", JSONObject(it.autosensDataJson ?: ""))
+                put("mealData", JSONObject(it.mealDataJson))
+                put("isMicroBolusAllowed", it.isMicroBolusAllowed)
+                put("result", JSONObject(it.resultJson))
+            }
+            tags.add("APSResults")
+        }
+
+        if (data.apsResultLinks.isNotEmpty()) {
+            zos.writeDBEntryFile("APSResultLinks.json", data.apsResultLinks) {
+                put("apsResultId", it.apsResultId)
+                put("smbId", it.smbId)
+                put("tbrId", it.tbrId)
+            }
+            tags.add("APSResultLinks")
+        }
+
+        if (data.bolusCalculatorResults.isNotEmpty()) {
+            zos.writeDBEntryFile("BolusCalculatorResults.json", data.bolusCalculatorResults) {
+                put("timestamp", it.timestamp)
+                put("utcOffset", it.utcOffset)
+                put("targetBGLow", it.targetBGLow)
+                put("targetBGHigh", it.targetBGHigh)
+                put("isf", it.isf)
+                put("ic", it.ic)
+                put("bolusIOB", it.bolusIOB)
+                put("wasBolusIOBUsed", it.wasBolusIOBUsed)
+                put("basalIOB", it.basalIOB)
+                put("wasBasalIOBUsed", it.wasBasalIOBUsed)
+                put("glucoseValue", it.glucoseValue)
+                put("wasGlucoseUsed", it.wasGlucoseUsed)
+                put("glucoseDifference", it.glucoseDifference)
+                put("glucoseInsulin", it.glucoseInsulin)
+                put("glucoseTrend", it.glucoseTrend)
+                put("wasTrendUsed", it.wasTrendUsed)
+                put("trendInsulin", it.trendInsulin)
+                put("cob", it.cob)
+                put("wasCOBUsed", it.wasCOBUsed)
+                put("cobInsulin", it.cobInsulin)
+                put("carbs", it.carbs)
+                put("wereCarbsUsed", it.wereCarbsUsed)
+                put("carbsInsulin", it.carbsInsulin)
+                put("otherCorrection", it.otherCorrection)
+                put("wasSuperbolusUsed", it.wasSuperbolusUsed)
+                put("superbolusInsulin", it.superbolusInsulin)
+                put("wasTempTargetUsed", it.wasTempTargetUsed)
+                put("totalInsulin", it.totalInsulin)
+                put("percentageCorrection", it.percentageCorrection)
+            }
+            tags.add("BolusCalculatorResults")
+        }
+
+        if (data.boluses.isNotEmpty()) {
+            zos.writeDBEntryFile("Boluses.json", data.boluses) {
+                put("timestamp", it.timestamp)
+                put("utcOffset", it.utcOffset)
+                put("amount", it.amount)
+                put("type", it.type.toString())
+                put("isBasalInsulin", it.isBasalInsulin)
+                put("insulinEndTime", it.insulinConfiguration?.insulinEndTime)
+                put("peak", it.insulinConfiguration?.peak)
+            }
+            tags.add("Boluses")
+        }
+
+        if (data.carbs.isNotEmpty()) {
+            zos.writeDBEntryFile("Carbs.json", data.carbs) {
+                put("timestamp", it.timestamp)
+                put("utcOffset", it.utcOffset)
+                put("duration", it.duration)
+                put("amount", it.amount)
+            }
+            tags.add("Carbs")
+        }
+
+        if (data.effectiveProfileSwitches.isNotEmpty()) {
+            zos.writeDBEntryFile("EffectiveProfileSwitches.json", data.effectiveProfileSwitches) {
+                put("timestamp", it.timestamp)
+                put("utcOffset", it.utcOffset)
+                put("basalBlocks", it.basalBlocks.serialize())
+                put("isfBlocks", it.isfBlocks.serialize())
+                put("icBlocks", it.icBlocks.serialize())
+                put("icBlocks", it.icBlocks.serialize())
+                val targetBlocks = JSONArray()
+                it.targetBlocks.forEach { block ->
+                    val jsonObject = JSONObject()
+                    jsonObject.put("duration", block.duration)
+                    jsonObject.put("lowTarget", block.lowTarget)
+                    jsonObject.put("highTarget", block.highTarget)
+                    targetBlocks.put(jsonObject)
+                }
+                put("targetBlocks", it.targetBlocks)
+                put("glucoseUnit", it.glucoseUnit.toString())
+                put("originalTimeshift", it.originalTimeshift)
+                put("originalPercentage", it.originalPercentage)
+                put("originalDuration", it.originalDuration)
+                put("originalEnd", it.originalEnd)
+                put("insulinEndTime", it.insulinConfiguration.insulinEndTime)
+                put("insulinEndTime", it.insulinConfiguration.peak)
+            }
+            tags.add("EffectiveProfileSwitches")
+        }
+
+        if (data.extendedBoluses.isNotEmpty()) {
+            zos.writeDBEntryFile("ExtendedBoluses.json", data.extendedBoluses) {
+                put("timestamp", it.timestamp)
+                put("utcOffset", it.utcOffset)
+                put("duration", it.duration)
+                put("amount", it.amount)
+                put("isEmulatingTempBasal", it.isEmulatingTempBasal)
+            }
+            tags.add("ExtendedBoluses")
+        }
+
+        if (data.glucoseValues.isNotEmpty()) {
+            zos.writeDBEntryFile("GlucoseValues.json", data.glucoseValues) {
+                put("timestamp", it.timestamp)
+                put("utcOffset", it.utcOffset)
+                put("raw", it.raw)
+                put("value", it.value)
+                put("trendArrow", it.trendArrow.toString())
+                put("noise", it.noise)
+                put("sourceSensor", it.sourceSensor.toString())
+            }
+            tags.add("GlucoseValues")
+        }
+
+        if (data.multiwaveBolusLinks.isNotEmpty()) {
+            zos.writeDBEntryFile("MultiwaveBolusLinks.json", data.multiwaveBolusLinks) {
+                put("bolusId", it.bolusId)
+                put("extendedBolusId", it.extendedBolusId)
+            }
+            tags.add("MultiwaveBolusLinks")
+        }
+
+        if (data.offlineEvents.isNotEmpty()) {
+            zos.writeDBEntryFile("OfflineEvents.json", data.offlineEvents) {
+                put("timestamp", it.timestamp)
+                put("utcOffset", it.utcOffset)
+                put("reason", it.reason.toString())
+                put("duration", it.duration)
+            }
+            tags.add("OfflineEvents")
+        }
+
+        if (data.preferencesChanges.isNotEmpty()) {
+            zos.writeJSONArrayFile("PreferenceChanges.json", data.preferencesChanges) {
+                put("structureVersion", 2)
+                put("id", it.id)
+                put("timestamp", it.timestamp)
+                put("utcOffset", it.utcOffset)
+                put("structureVersion", 2)
+                put("key", it.key)
+                put("value", it.value)
+            }
+            tags.add("PreferenceChanges")
+        }
+
+        if (data.profileSwitches.isNotEmpty()) {
+            zos.writeDBEntryFile("ProfileSwitches.json", data.profileSwitches) {
+                put("timestamp", it.timestamp)
+                put("utcOffset", it.utcOffset)
+                put("basalBlocks", it.basalBlocks.serialize())
+                put("isfBlocks", it.basalBlocks.serialize())
+                put("icBlocks", it.icBlocks.serialize())
+                put("basalBlocks", it.basalBlocks.serialize())
+                val targetBlocks = JSONArray()
+                it.targetBlocks.forEach { block ->
+                    val jsonObject = JSONObject()
+                    jsonObject.put("duration", block.duration)
+                    jsonObject.put("lowTarget", block.lowTarget)
+                    jsonObject.put("highTarget", block.highTarget)
+                    targetBlocks.put(jsonObject)
+                }
+                put("glucoseUnit", it.glucoseUnit.toString())
+                put("timeshift", it.timeshift)
+                put("percentage", it.percentage)
+                put("duration", it.duration)
+                put("insulinEndTime", it.insulinConfiguration.insulinEndTime)
+                put("peak", it.insulinConfiguration.peak)
+            }
+            tags.add("ProfileSwitches")
+        }
+
+        if (data.temporaryBasals.isNotEmpty()) {
+            zos.writeDBEntryFile("TemporaryBasals.json", data.temporaryBasals) {
+                put("timestamp", it.timestamp)
+                put("utcOffset", it.utcOffset)
+                put("type", it.type.toString())
+                put("isAbsolute", it.isAbsolute)
+                put("rate", it.rate)
+                put("duration", it.duration)
+            }
+            tags.add("TemporaryBasals")
+        }
+
+        if (data.temporaryTarget.isNotEmpty()) {
+            zos.writeDBEntryFile("TemporaryTargets.json", data.temporaryTarget) {
+                put("timestamp", it.timestamp)
+                put("utcOffset", it.utcOffset)
+                put("reason", it.reason.toString())
+                put("highTarget", it.highTarget)
+                put("lowTarget", it.lowTarget)
+                put("duration", it.duration)
+            }
+            tags.add("TemporaryTargets")
+        }
+
+        if (data.therapyEvents.isNotEmpty()) {
+            zos.writeDBEntryFile("TherapyEvents.json", data.therapyEvents) {
+                put("timestamp", it.timestamp)
+                put("utcOffset", it.utcOffset)
+                put("type", it.type.toString())
+                put("glucose", it.glucose)
+                put("glucoseType", it.glucoseType?.toString())
+                put("glucoseUnit", it.glucoseUnit.toString())
+            }
+            tags.add("TherapyEvents")
+        }
+
+        if (data.totalDailyDoses.isNotEmpty()) {
+            zos.writeDBEntryFile("TotalDailyDoses.json", data.totalDailyDoses) {
+                put("timestamp", it.timestamp)
+                put("utcOffset", it.utcOffset)
+                put("basalAmount", it.basalAmount)
+                put("bolusAmount", it.bolusAmount)
+                put("totalAmount", it.totalAmount)
+                put("carbs", it.carbs)
+            }
+            tags.add("TotalDailyDoses")
+        }
+
+        if (data.versionChanges.isNotEmpty()) {
+            zos.writeJSONArrayFile("VersionChanges.json", data.versionChanges) {
+                put("structureVersion", 2)
+                put("id", it.id)
+                put("timestamp", it.timestamp)
+                put("utcOffset", it.utcOffset)
+                put("versionCode", it.versionCode)
+                put("versionName", it.versionName)
+                val customGitRemote = it.gitRemote != "https://github.com/nightscout/AndroidAPS.git"
+                put("customGitRemote", customGitRemote)
+                put("commitHash", if (customGitRemote) null else it.commitHash)
+            }
+            tags.add("VersionChanges")
+        }
+
+        zos.close()
+        val bytes = baos.toByteArray()
+
+        val fileName = "upload-num$uploadNumber-ver2-date${FILE_NAME_DATE_FORMAT.format(uploadDate)}-appid${appId.toString().replace("-", "")}.zip"
+
+        val metaData = OpenHumansAPI.FileMetadata(
+            tags = tags,
+            description = "AndroidAPS Database Upload",
+            md5 = MessageDigest.getInstance("MD5").digest(bytes).toHexString(),
+            creationDate = uploadDate.time
+        )
+
+        refreshAccessTokenIfNeeded()
+
+        val preparedUpload = openHumansAPI.prepareFileUpload(openHumansState!!.accessToken, fileName, metaData)
+        openHumansAPI.uploadFile(preparedUpload.uploadURL, bytes)
+        openHumansAPI.completeFileUpload(openHumansState!!.accessToken, preparedUpload.fileId)
+
+        return true
+    }
+
+    private fun cancelWorker() = WorkManager.getInstance(context).cancelUniqueWork(WORK_NAME_PERIODIC)
+
+    private fun scheduleWorker(replace: Boolean, delay: Boolean = false) {
+        val constraints = Constraints.Builder()
+            .setRequiredNetworkType(if (sp.getBoolean("key_oh_wifi_only", true)) NetworkType.UNMETERED else NetworkType.CONNECTED)
+            .setRequiresCharging(sp.getBoolean("key_oh_charging_only", false))
+            .setRequiresBatteryNotLow(true)
+            .build()
+        val workRequest = PeriodicWorkRequestBuilder<OpenHumansWorker>(1, TimeUnit.DAYS)
+            .setConstraints(constraints)
+            .setBackoffCriteria(BackoffPolicy.LINEAR, 20, TimeUnit.MINUTES)
+            .setInitialDelay(if (delay) 1 else 0, TimeUnit.DAYS)
+            .build()
+        WorkManager.getInstance(context).enqueueUniquePeriodicWork(WORK_NAME_PERIODIC, if (replace) ExistingPeriodicWorkPolicy.REPLACE else ExistingPeriodicWorkPolicy.KEEP, workRequest)
+    }
+
+    internal fun uploadNow() {
+        val workRequest = OneTimeWorkRequestBuilder<OpenHumansWorker>()
+            .build()
+        WorkManager.getInstance(context).enqueueUniqueWork(WORK_NAME_MANUAL, ExistingWorkPolicy.KEEP, workRequest)
+        scheduleWorker(replace = true, delay = true)
+    }
+
+    private fun ByteArray.toHexString(): String {
+        val stringBuilder = StringBuilder()
+        map { it.toInt() }.forEach {
+            stringBuilder.append(HEX_DIGITS[(it shr 4) and 0x0F])
+            stringBuilder.append(HEX_DIGITS[it and 0x0F])
+        }
+        return stringBuilder.toString()
+    }
+
+    private suspend fun refreshAccessTokenIfNeeded() {
+        val state = openHumansState!!
+        if (state.expiresAt <= System.currentTimeMillis() - TimeUnit.HOURS.toMillis(1)) {
+            val newTokens = openHumansAPI.refreshAccessToken(state.refreshToken)
+            withContext(Dispatchers.Main) {
+                openHumansState = state.copy(
+                    accessToken = newTokens.accessToken,
+                    refreshToken = newTokens.refreshToken,
+                    expiresAt = newTokens.expiresAt
+                )
+            }
+        }
+    }
+
+    fun logout() {
+        cancelWorker()
+        openHumansState = null
+    }
+
+    private fun setupNotificationChannels() {
+        val notificationManagerCompat = NotificationManagerCompat.from(context)
+        notificationManagerCompat.createNotificationChannel(
+            NotificationChannel(
+                NOTIFICATION_CHANNEL_WORKER,
+                resourceHelper.gs(R.string.open_humans_uploading),
+                NotificationManager.IMPORTANCE_MIN
+            )
+        )
+        notificationManagerCompat.createNotificationChannel(
+            NotificationChannel(
+                NOTIFICATION_CHANNEL_MESSAGES,
+                resourceHelper.gs(R.string.open_humans_notifications),
+                NotificationManager.IMPORTANCE_DEFAULT
+            )
+        )
+    }
+
+    private suspend fun handleSignOut() {
+        val notification = NotificationCompat.Builder(context, NOTIFICATION_CHANNEL_MESSAGES)
+            .setContentTitle(resourceHelper.gs(R.string.you_have_been_signed_out_of_open_humans))
+            .setContentText(resourceHelper.gs(R.string.click_here_to_sign_in_again_if_this_wasnt_on_purpose))
+            .setStyle(NotificationCompat.BigTextStyle())
+            .setSmallIcon(R.drawable.open_humans_notification)
+            .setAutoCancel(true)
+            .setContentIntent(
+                PendingIntent.getActivity(
+                context,
+                0,
+                Intent(context, OHLoginActivity::class.java).apply {
+                    flags = Intent.FLAG_ACTIVITY_CLEAR_TOP
+                },
+                0
+            ))
+            .build()
+        NotificationManagerCompat.from(context).notify(SIGNED_OUT_NOTIFICATION_ID, notification)
+        withContext(Dispatchers.Main) {
+            logout()
+        }
+    }
+
+    internal fun createForegroundInfo(id: UUID): ForegroundInfo {
+        val cancel = context.getString(R.string.cancel)
+
+        val intent = WorkManager.getInstance(context)
+            .createCancelPendingIntent(id)
+
+        val notification = NotificationCompat.Builder(context, NOTIFICATION_CHANNEL_WORKER)
+            .setContentTitle(context.getString(R.string.open_humans_uploading))
+            .setContentText(context.getString(R.string.uploading_to_open_humans))
+            .setSmallIcon(R.drawable.open_humans_notification)
+            .setOngoing(true)
+            .addAction(android.R.drawable.ic_delete, cancel, intent)
+            .build()
+
+        return ForegroundInfo(UPLOAD_NOTIFICATION_ID, notification)
+    }
+
+    private companion object {
+        val HEX_DIGITS = "0123456789ABCDEF".toCharArray()
+        @Suppress("PrivatePropertyName")
+        private val FILE_NAME_DATE_FORMAT = SimpleDateFormat("yyyyMMdd'T'HHmmss", Locale.US).apply { timeZone = TimeZone.getTimeZone("UTC") }
+        const val WORK_NAME_PERIODIC = "Open Humans Periodic"
+        const val WORK_NAME_MANUAL = "Open Humans Manual"
+        const val NOTIFICATION_CHANNEL_WORKER = "OpenHumansWorker"
+        const val NOTIFICATION_CHANNEL_MESSAGES = "OpenHumansMessages"
+        const val SIGNED_OUT_NOTIFICATION_ID = 3125
+        const val UPLOAD_NOTIFICATION_ID = 3126
+    }
+
+}
\ No newline at end of file
diff --git a/openhumans/src/main/java/info/nightscout/androidaps/plugin/general/openhumans/OpenHumansWorker.kt b/openhumans/src/main/java/info/nightscout/androidaps/plugin/general/openhumans/OpenHumansWorker.kt
new file mode 100644
index 0000000000..10bce2b857
--- /dev/null
+++ b/openhumans/src/main/java/info/nightscout/androidaps/plugin/general/openhumans/OpenHumansWorker.kt
@@ -0,0 +1,38 @@
+package info.nightscout.androidaps.plugin.general.openhumans
+
+import android.content.Context
+import androidx.work.CoroutineWorker
+import androidx.work.WorkerParameters
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import javax.inject.Inject
+
+class OpenHumansWorker(
+    context: Context,
+    workerParameters: WorkerParameters
+) : CoroutineWorker(context, workerParameters) {
+
+    init {
+        (applicationContext as HasAndroidInjector).androidInjector().inject(this)
+    }
+
+    @Inject
+    lateinit var logger: AAPSLogger
+
+    @Inject
+    lateinit var openHumansUploader: OpenHumansUploader
+
+    override suspend fun doWork(): Result {
+        return try {
+            logger.info(LTag.OHUPLOADER, "Starting upload")
+            setForeground(openHumansUploader.createForegroundInfo(id))
+            openHumansUploader.uploadData()
+            logger.info(LTag.OHUPLOADER, "Upload finished")
+            Result.success()
+        } catch (e: Exception) {
+            logger.error(LTag.OHUPLOADER, "OH Uploader failed", e)
+            Result.failure()
+        }
+    }
+}
\ No newline at end of file
diff --git a/openhumans/src/main/java/info/nightscout/androidaps/plugin/general/openhumans/dagger/Helpers.kt b/openhumans/src/main/java/info/nightscout/androidaps/plugin/general/openhumans/dagger/Helpers.kt
new file mode 100644
index 0000000000..807bd04e92
--- /dev/null
+++ b/openhumans/src/main/java/info/nightscout/androidaps/plugin/general/openhumans/dagger/Helpers.kt
@@ -0,0 +1,40 @@
+package info.nightscout.androidaps.plugin.general.openhumans.dagger
+
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.ViewModelProvider
+import dagger.MapKey
+import javax.inject.Inject
+import javax.inject.Provider
+import javax.inject.Qualifier
+import kotlin.reflect.KClass
+
+@Qualifier
+@Retention(AnnotationRetention.RUNTIME)
+internal annotation class BaseUrl
+
+@Qualifier
+@Retention(AnnotationRetention.RUNTIME)
+internal annotation class ClientId
+
+@Qualifier
+@Retention(AnnotationRetention.RUNTIME)
+internal annotation class ClientSecret
+
+@Qualifier
+@Retention(AnnotationRetention.RUNTIME)
+internal annotation class RedirectUrl
+
+@Qualifier
+@Retention(AnnotationRetention.RUNTIME)
+internal annotation class AuthUrl
+
+@MapKey
+@Retention(AnnotationRetention.RUNTIME)
+internal annotation class ViewModelKey(val value: KClass<out ViewModel>)
+
+@Suppress("UNCHECKED_CAST")
+class ViewModelFactory @Inject constructor(
+    private val viewModels: MutableMap<Class<out ViewModel>, @JvmSuppressWildcards Provider<ViewModel>>
+) : ViewModelProvider.Factory {
+    override fun <T : ViewModel> create(modelClass: Class<T>): T = viewModels[modelClass]?.get() as T
+}
\ No newline at end of file
diff --git a/openhumans/src/main/java/info/nightscout/androidaps/plugin/general/openhumans/dagger/OpenHumansModule.kt b/openhumans/src/main/java/info/nightscout/androidaps/plugin/general/openhumans/dagger/OpenHumansModule.kt
new file mode 100644
index 0000000000..41ac8a53e3
--- /dev/null
+++ b/openhumans/src/main/java/info/nightscout/androidaps/plugin/general/openhumans/dagger/OpenHumansModule.kt
@@ -0,0 +1,58 @@
+package info.nightscout.androidaps.plugin.general.openhumans.dagger
+
+import androidx.lifecycle.ViewModel
+import dagger.Binds
+import dagger.Module
+import dagger.Provides
+import dagger.android.ContributesAndroidInjector
+import dagger.multibindings.IntoMap
+import info.nightscout.androidaps.plugin.general.openhumans.OpenHumansWorker
+import info.nightscout.androidaps.plugin.general.openhumans.delegates.OHStateDelegate
+import info.nightscout.androidaps.plugin.general.openhumans.ui.OHFragment
+import info.nightscout.androidaps.plugin.general.openhumans.ui.OHLoginActivity
+import info.nightscout.androidaps.plugin.general.openhumans.ui.OHLoginViewModel
+
+@Module
+abstract class OpenHumansModule {
+
+    @ContributesAndroidInjector
+    abstract fun contributesOHLoginActivity(): OHLoginActivity
+
+    @ContributesAndroidInjector
+    abstract fun contributesOHFragment(): OHFragment
+
+    @ContributesAndroidInjector abstract fun contributesOpenHumansWorker(): OpenHumansWorker
+
+    @Binds
+    @IntoMap
+    @ViewModelKey(OHLoginViewModel::class)
+    internal abstract fun bindLoginViewModel(viewModel: OHLoginViewModel): ViewModel
+
+    companion object {
+
+        @BaseUrl
+        @Provides
+        fun providesBaseUrl(): String = "https://www.openhumans.org"
+
+        @ClientId
+        @Provides
+        fun providesClientId(): String = "oie6DvnaEOagTxSoD6BukkLPwDhVr6cMlN74Ihz1"
+
+        @ClientSecret
+        @Provides
+        fun providesClientSecret(): String =
+            "jR0N8pkH1jOwtozHc7CsB1UPcJzFN95ldHcK4VGYIApecr8zGJox0v06xLwPLMASScngT12aIaIHXAVCJeKquEXAWG1XekZdbubSpccgNiQBmuVmIF8nc1xSKSNJltCf"
+
+        @RedirectUrl
+        @Provides
+        fun providesRedirectUri(): String = "androidaps://setup-openhumans"
+
+        @AuthUrl
+        @Provides
+        internal fun providesAuthUrl(@ClientId clientId: String): String =
+            "https://www.openhumans.org/direct-sharing/projects/oauth2/authorize/?client_id=$clientId&response_type=code"
+
+        @Provides
+        internal fun providesStateLiveData(ohStateDelegate: OHStateDelegate) = ohStateDelegate.value
+    }
+}
\ No newline at end of file
diff --git a/openhumans/src/main/java/info/nightscout/androidaps/plugin/general/openhumans/delegates/OHAppIDDelegate.kt b/openhumans/src/main/java/info/nightscout/androidaps/plugin/general/openhumans/delegates/OHAppIDDelegate.kt
new file mode 100644
index 0000000000..7d4506ecab
--- /dev/null
+++ b/openhumans/src/main/java/info/nightscout/androidaps/plugin/general/openhumans/delegates/OHAppIDDelegate.kt
@@ -0,0 +1,28 @@
+package info.nightscout.androidaps.plugin.general.openhumans.delegates
+
+import info.nightscout.androidaps.utils.sharedPreferences.SP
+import java.util.*
+import javax.inject.Inject
+import javax.inject.Singleton
+import kotlin.reflect.KProperty
+
+@Singleton
+internal class OHAppIDDelegate @Inject internal constructor(
+    private val sp: SP
+) {
+    private var value: UUID? = null
+
+    operator fun getValue(thisRef: Any?, property: KProperty<*>): UUID {
+        if (value == null) {
+            val saved = sp.getStringOrNull("openhumans_appid", null)
+            if (saved == null) {
+                val generated = UUID.randomUUID()
+                value = generated
+                sp.putString("openhumans_appid", generated.toString())
+            } else {
+                value = UUID.fromString(saved)
+            }
+        }
+        return value!!
+    }
+}
\ No newline at end of file
diff --git a/openhumans/src/main/java/info/nightscout/androidaps/plugin/general/openhumans/delegates/OHCounterDelegate.kt b/openhumans/src/main/java/info/nightscout/androidaps/plugin/general/openhumans/delegates/OHCounterDelegate.kt
new file mode 100644
index 0000000000..655ee87bf6
--- /dev/null
+++ b/openhumans/src/main/java/info/nightscout/androidaps/plugin/general/openhumans/delegates/OHCounterDelegate.kt
@@ -0,0 +1,20 @@
+package info.nightscout.androidaps.plugin.general.openhumans.delegates
+
+import info.nightscout.androidaps.utils.sharedPreferences.SP
+import javax.inject.Inject
+import javax.inject.Singleton
+import kotlin.reflect.KProperty
+
+@Singleton
+internal class OHCounterDelegate @Inject internal constructor(
+    private val sp: SP
+) {
+    private var value = sp.getLong("openhumans_counter", 1)
+
+    operator fun getValue(thisRef: Any?, property: KProperty<*>): Long = value
+
+    operator fun setValue(thisRef: Any?, property: KProperty<*>, value: Long) {
+        this.value = value
+        sp.putLong("openhumans_counter", value)
+    }
+}
\ No newline at end of file
diff --git a/openhumans/src/main/java/info/nightscout/androidaps/plugin/general/openhumans/delegates/OHStateDelegate.kt b/openhumans/src/main/java/info/nightscout/androidaps/plugin/general/openhumans/delegates/OHStateDelegate.kt
new file mode 100644
index 0000000000..460e965ff9
--- /dev/null
+++ b/openhumans/src/main/java/info/nightscout/androidaps/plugin/general/openhumans/delegates/OHStateDelegate.kt
@@ -0,0 +1,51 @@
+package info.nightscout.androidaps.plugin.general.openhumans.delegates
+
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
+import info.nightscout.androidaps.plugin.general.openhumans.OpenHumansState
+import info.nightscout.androidaps.utils.sharedPreferences.SP
+import javax.inject.Inject
+import javax.inject.Singleton
+import kotlin.reflect.KProperty
+
+@Singleton
+internal class OHStateDelegate @Inject internal constructor(
+    private val sp: SP
+) {
+
+    private var _value = MutableLiveData(loadState())
+    val value = _value as LiveData<OpenHumansState?>
+
+    private fun loadState(): OpenHumansState? {
+        return OpenHumansState(
+            accessToken = sp.getStringOrNull("openhumans_access_token", null) ?: return null,
+            refreshToken = sp.getStringOrNull("openhumans_refresh_token", null) ?: return null,
+            expiresAt = if (sp.contains("openhumans_expires_at"))
+                sp.getLong("openhumans_expires_at", 0)
+            else
+                return null,
+            projectMemberId = sp.getStringOrNull("openhumans_project_member_id", null)
+                ?: return null,
+            uploadOffset = sp.getLong("openhumans_upload_offset", 0)
+        )
+    }
+
+    operator fun getValue(thisRef: Any?, property: KProperty<*>): OpenHumansState? = _value.value
+
+    operator fun setValue(thisRef: Any?, property: KProperty<*>, value: OpenHumansState?) {
+        this._value.value = value
+        if (value == null) {
+            sp.remove("openhumans_access_token")
+            sp.remove("openhumans_refresh_token")
+            sp.remove("openhumans_expires_at")
+            sp.remove("openhumans_project_member_id")
+            sp.remove("openhumans_upload_offset")
+        } else {
+            sp.putString("openhumans_access_token", value.accessToken)
+            sp.putString("openhumans_refresh_token", value.refreshToken)
+            sp.putLong("openhumans_expires_at", value.expiresAt)
+            sp.putString("openhumans_project_member_id", value.projectMemberId)
+            sp.putLong("openhumans_upload_offset", value.uploadOffset)
+        }
+    }
+}
\ No newline at end of file
diff --git a/openhumans/src/main/java/info/nightscout/androidaps/plugin/general/openhumans/ui/OHFragment.kt b/openhumans/src/main/java/info/nightscout/androidaps/plugin/general/openhumans/ui/OHFragment.kt
new file mode 100644
index 0000000000..7983961776
--- /dev/null
+++ b/openhumans/src/main/java/info/nightscout/androidaps/plugin/general/openhumans/ui/OHFragment.kt
@@ -0,0 +1,70 @@
+package info.nightscout.androidaps.plugin.general.openhumans.ui
+
+import android.content.Intent
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.TextView
+import androidx.appcompat.view.ContextThemeWrapper
+import androidx.lifecycle.LiveData
+import com.google.android.material.button.MaterialButton
+import dagger.android.support.DaggerFragment
+import info.nightscout.androidaps.plugin.general.openhumans.R
+import info.nightscout.androidaps.plugin.general.openhumans.OpenHumansState
+import info.nightscout.androidaps.plugin.general.openhumans.OpenHumansUploader
+import javax.inject.Inject
+
+class OHFragment : DaggerFragment() {
+
+    @Inject
+    internal lateinit var stateLiveData: LiveData<OpenHumansState?>
+    @Inject
+    internal lateinit var plugin: OpenHumansUploader
+
+    private lateinit var setup: MaterialButton
+    private lateinit var logout: MaterialButton
+    private lateinit var uploadNow: MaterialButton
+    private lateinit var info: TextView
+    private lateinit var memberId: TextView
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? {
+        val contextWrapper = ContextThemeWrapper(requireActivity(), R.style.OpenHumans)
+        val wrappedInflater = inflater.cloneInContext(contextWrapper)
+        val view = wrappedInflater.inflate(R.layout.fragment_open_humans_new, container, false)
+        setup = view.findViewById(R.id.setup)
+        setup.setOnClickListener { startActivity(Intent(context, OHLoginActivity::class.java)) }
+        logout = view.findViewById(R.id.logout)
+        logout.setOnClickListener { plugin.logout() }
+        info = view.findViewById(R.id.info)
+        memberId = view.findViewById(R.id.member_id)
+        uploadNow = view.findViewById(R.id.upload_now)
+        uploadNow.setOnClickListener { plugin.uploadNow() }
+        return view
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        stateLiveData.observe(this) { state ->
+            if (state == null) {
+                setup.visibility = View.VISIBLE
+                logout.visibility = View.GONE
+                memberId.visibility = View.GONE
+                uploadNow.visibility = View.GONE
+                info.setText(R.string.not_setup_info)
+            } else {
+                setup.visibility = View.GONE
+                logout.visibility = View.VISIBLE
+                memberId.visibility = View.VISIBLE
+                uploadNow.visibility = View.VISIBLE
+                memberId.text = getString(R.string.project_member_id, state.projectMemberId)
+                info.setText(R.string.setup_completed_info)
+            }
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/openhumans/src/main/java/info/nightscout/androidaps/plugin/general/openhumans/ui/OHLoginActivity.kt b/openhumans/src/main/java/info/nightscout/androidaps/plugin/general/openhumans/ui/OHLoginActivity.kt
new file mode 100644
index 0000000000..a2972976a6
--- /dev/null
+++ b/openhumans/src/main/java/info/nightscout/androidaps/plugin/general/openhumans/ui/OHLoginActivity.kt
@@ -0,0 +1,121 @@
+package info.nightscout.androidaps.plugin.general.openhumans.ui
+
+import android.content.Intent
+import android.net.Uri
+import android.os.Bundle
+import android.view.MenuItem
+import android.view.View
+import android.widget.CheckBox
+import androidx.activity.viewModels
+import androidx.browser.customtabs.CustomTabsIntent
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowCompat
+import androidx.core.view.WindowInsetsCompat
+import androidx.core.view.updatePadding
+import androidx.core.widget.NestedScrollView
+import com.google.android.material.appbar.MaterialToolbar
+import com.google.android.material.button.MaterialButton
+import dagger.android.support.DaggerAppCompatActivity
+import info.nightscout.androidaps.plugin.general.openhumans.R
+import info.nightscout.androidaps.plugin.general.openhumans.dagger.AuthUrl
+import info.nightscout.androidaps.plugin.general.openhumans.dagger.ViewModelFactory
+import javax.inject.Inject
+
+class OHLoginActivity : DaggerAppCompatActivity() {
+
+    @Inject
+    internal lateinit var viewModelFactory: ViewModelFactory
+
+    @Inject
+    @AuthUrl
+    internal lateinit var authUrl: String
+
+    private val viewModel by viewModels<OHLoginViewModel> { viewModelFactory }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_open_humans_login_new)
+
+        val toolbar = findViewById<MaterialToolbar>(R.id.toolbar)
+        setSupportActionBar(toolbar)
+
+        supportActionBar!!.setDisplayHomeAsUpEnabled(true)
+        supportActionBar!!.setDisplayShowHomeEnabled(true)
+
+        WindowCompat.setDecorFitsSystemWindows(window, false)
+
+        ViewCompat.setOnApplyWindowInsetsListener(toolbar) { view, insets ->
+            view.updatePadding(top = insets.getInsets(WindowInsetsCompat.Type.systemBars()).top)
+            insets
+        }
+
+        val accept = findViewById<CheckBox>(R.id.accept)
+        val login = findViewById<MaterialButton>(R.id.login)
+        accept.setOnCheckedChangeListener { _, value -> login.isEnabled = value }
+
+        login.setOnClickListener {
+            CustomTabsIntent.Builder().build().launchUrl(this, Uri.parse(authUrl))
+        }
+
+        val cancel = findViewById<MaterialButton>(R.id.cancel)
+        cancel.setOnClickListener { viewModel.cancel() }
+
+        val proceed = findViewById<MaterialButton>(R.id.proceed)
+        proceed.setOnClickListener { viewModel.finish() }
+
+        val close = findViewById<MaterialButton>(R.id.close)
+        close.setOnClickListener { finish() }
+
+        val welcome = findViewById<NestedScrollView>(R.id.welcome)
+        val consent = findViewById<NestedScrollView>(R.id.consent)
+        val confirm = findViewById<NestedScrollView>(R.id.confirm)
+        val finishing = findViewById<NestedScrollView>(R.id.finishing)
+        val done = findViewById<NestedScrollView>(R.id.done)
+
+        val welcomeNext = findViewById<MaterialButton>(R.id.welcome_next)
+        welcomeNext.setOnClickListener {
+            viewModel.goToConsent()
+        }
+
+        viewModel.state.observe(this) { state ->
+            welcome.visibility =
+                if (state == OHLoginViewModel.State.WELCOME) View.VISIBLE else View.GONE
+            consent.visibility =
+                if (state == OHLoginViewModel.State.CONSENT) View.VISIBLE else View.GONE
+            confirm.visibility =
+                if (state == OHLoginViewModel.State.CONFIRM) View.VISIBLE else View.GONE
+            finishing.visibility =
+                if (state == OHLoginViewModel.State.FINISHING) View.VISIBLE else View.GONE
+            done.visibility =
+                if (state == OHLoginViewModel.State.DONE) View.VISIBLE else View.GONE
+        }
+
+        val code = intent.data?.getQueryParameter("code")
+        if (code != null) {
+            viewModel.submitBearerToken(code)
+        }
+    }
+
+    override fun onNewIntent(intent: Intent) {
+        super.onNewIntent(intent)
+        val code = intent.data?.getQueryParameter("code")
+        if (code != null) {
+            viewModel.submitBearerToken(code)
+        }
+    }
+
+    override fun onBackPressed() {
+        if (!viewModel.goBack()) {
+            super.onBackPressed()
+        }
+    }
+
+    override fun onOptionsItemSelected(item: MenuItem): Boolean =
+        if (item.itemId == android.R.id.home) {
+            onBackPressed()
+            true
+        } else {
+            super.onOptionsItemSelected(item)
+        }
+
+}
\ No newline at end of file
diff --git a/openhumans/src/main/java/info/nightscout/androidaps/plugin/general/openhumans/ui/OHLoginViewModel.kt b/openhumans/src/main/java/info/nightscout/androidaps/plugin/general/openhumans/ui/OHLoginViewModel.kt
new file mode 100644
index 0000000000..a1faea2782
--- /dev/null
+++ b/openhumans/src/main/java/info/nightscout/androidaps/plugin/general/openhumans/ui/OHLoginViewModel.kt
@@ -0,0 +1,72 @@
+package info.nightscout.androidaps.plugin.general.openhumans.ui
+
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.ViewModel
+import info.nightscout.androidaps.plugin.general.openhumans.OpenHumansUploader
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.MainScope
+import kotlinx.coroutines.launch
+import javax.inject.Inject
+
+internal class OHLoginViewModel @Inject constructor(
+    private val plugin: OpenHumansUploader
+) : ViewModel(), CoroutineScope by MainScope() {
+
+    private val _state = MutableLiveData(State.WELCOME)
+    val state = _state as LiveData<State>
+
+    private var bearerToken = ""
+
+    fun goToConsent() {
+        _state.value = State.CONSENT
+    }
+
+    fun goBack() = when (_state.value) {
+        State.CONSENT -> {
+            _state.value = State.WELCOME
+            true
+        }
+        State.CONFIRM -> {
+            _state.value = State.CONSENT
+            true
+        }
+        else -> false
+    }
+
+    fun submitBearerToken(bearerToken: String) {
+        if (_state.value == State.WELCOME || _state.value == State.CONSENT) {
+            this.bearerToken = bearerToken
+            _state.value = State.CONFIRM
+        }
+    }
+
+    fun cancel() {
+        _state.value = State.CONSENT
+    }
+
+    fun finish() {
+        _state.value = State.FINISHING
+        launch {
+            try {
+                plugin.login(bearerToken)
+                _state.value = State.DONE
+            } catch (e: Exception) {
+                _state.value = State.CONSENT
+            }
+        }
+    }
+
+    override fun onCleared() {
+        cancel()
+        super.onCleared()
+    }
+
+    enum class State {
+        WELCOME,
+        CONSENT,
+        CONFIRM,
+        FINISHING,
+        DONE
+    }
+}
\ No newline at end of file
diff --git a/openhumans/src/main/res/drawable/dot.xml b/openhumans/src/main/res/drawable/dot.xml
new file mode 100644
index 0000000000..55557ad99b
--- /dev/null
+++ b/openhumans/src/main/res/drawable/dot.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval">
+    <solid
+        android:color="?colorOnBackground"/>
+</shape>
\ No newline at end of file
diff --git a/openhumans/src/main/res/drawable/open_humans.xml b/openhumans/src/main/res/drawable/open_humans.xml
new file mode 100644
index 0000000000..40bb4628e3
--- /dev/null
+++ b/openhumans/src/main/res/drawable/open_humans.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector android:height="100.5272dp" android:viewportHeight="108.36626"
+    android:viewportWidth="107.79796" android:width="100dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="?colorPrimary" android:pathData="m59.75,62.316c5.179,-2.256 8.801,-7.417 8.801,-13.427 0,-8.086 -6.555,-14.641 -14.641,-14.641 -8.086,0 -14.641,6.555 -14.641,14.641 0,6.01 3.622,11.171 8.801,13.427 -7.849,1.589 -14.555,6.318 -18.76,12.817 5.968,6.896 14.774,11.272 24.589,11.272 9.821,0 18.633,-4.382 24.601,-11.286 -4.205,-6.491 -10.907,-11.215 -18.75,-12.803z"/>
+    <path android:fillColor="?colorPrimary" android:pathData="M21.689,33.33 L10.002,21.643c-5.155,7 -8.677,15.271 -10.002,24.25l16.523,0c0.968,-4.535 2.741,-8.776 5.166,-12.563z"/>
+    <path android:fillColor="?colorPrimary" android:pathData="m91.275,45.893l16.523,0C106.473,36.909 102.947,28.634 97.787,21.631L86.101,33.317c2.429,3.79 4.205,8.035 5.174,12.576z"/>
+    <path android:fillColor="?colorPrimary" android:pathData="M86.305,10.106C79.304,4.91 71.02,1.351 62.022,0l0,15.422l13.059,5.908z"/>
+    <path android:fillColor="?colorPrimary" android:pathData="M45.754,15.339L45.754,0.003c-8.995,1.354 -17.276,4.915 -24.274,10.113l10.963,10.963z"/>
+    <path android:fillColor="?colorSecondary" android:pathData="m26.558,80.554c-4.881,-5.002 -8.405,-11.333 -9.971,-18.394l-16.546,0c4.001,26.128 26.629,46.206 53.858,46.206 27.229,0 49.857,-20.077 53.858,-46.206l-16.546,0c-1.564,7.053 -5.082,13.378 -9.955,18.378 -6.946,7.127 -16.643,11.56 -27.357,11.56 -10.706,0 -20.396,-4.427 -27.341,-11.544z"/>
+</vector>
\ No newline at end of file
diff --git a/openhumans/src/main/res/drawable/open_humans_notification.xml b/openhumans/src/main/res/drawable/open_humans_notification.xml
new file mode 100644
index 0000000000..823e5eb354
--- /dev/null
+++ b/openhumans/src/main/res/drawable/open_humans_notification.xml
@@ -0,0 +1,24 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="410dp"
+    android:height="410dp"
+    android:viewportWidth="410"
+    android:viewportHeight="410">
+  <path
+      android:fillColor="@android:color/black"
+      android:pathData="M227.1,235.731c19.569,-8.537 33.248,-28.056 33.248,-50.77c0,-30.552 -24.761,-55.313 -55.313,-55.313c-30.552,0 -55.313,24.761 -55.313,55.313c0,22.714 13.679,42.234 33.248,50.77c-29.654,5.991 -55.014,23.863 -70.889,48.424c22.565,26.059 55.862,42.583 92.954,42.583c37.142,0 70.44,-16.574 93.004,-42.633C282.064,259.593 256.754,241.721 227.1,235.731L227.1,235.731z"/>
+  <path
+      android:fillColor="@android:color/black"
+      android:pathData="M83.276,126.202l-44.181,-44.181c-19.469,26.459 -32.799,57.71 -37.791,91.656l62.452,0C67.401,156.505 74.09,140.48 83.276,126.202L83.276,126.202z"/>
+  <path
+      android:fillColor="@android:color/black"
+      android:pathData="M346.264,173.678l62.452,0c-4.992,-33.947 -18.321,-65.248 -37.841,-91.706l-44.181,44.181C335.88,140.48 342.619,156.505 346.264,173.678z"/>
+  <path
+      android:fillColor="@android:color/black"
+      android:pathData="M327.493,38.39C301.035,18.771 269.734,5.342 235.687,0.2l0,58.309l49.373,22.315L327.493,38.39z"/>
+  <path
+      android:fillColor="@android:color/black"
+      android:pathData="M174.233,58.209L174.233,0.25C140.236,5.342 108.936,18.821 82.477,38.44l41.435,41.435L174.233,58.209z"/>
+  <path
+      android:fillColor="@android:color/black"
+      android:pathData="M101.647,304.673c-18.471,-18.92 -31.75,-42.833 -37.691,-69.541L1.454,235.132c15.126,98.745 100.642,174.626 203.581,174.626s188.455,-75.881 203.581,-174.626L346.014,235.132c-5.891,26.658 -19.22,50.571 -37.641,69.441c-26.259,26.958 -62.901,43.682 -103.388,43.682C164.548,348.304 127.906,331.581 101.647,304.673z"/>
+</vector>
diff --git a/app/src/main/res/drawable/open_humans_white.xml b/openhumans/src/main/res/drawable/open_humans_white.xml
similarity index 100%
rename from app/src/main/res/drawable/open_humans_white.xml
rename to openhumans/src/main/res/drawable/open_humans_white.xml
diff --git a/openhumans/src/main/res/drawable/tick_mark.xml b/openhumans/src/main/res/drawable/tick_mark.xml
new file mode 100644
index 0000000000..54be283bde
--- /dev/null
+++ b/openhumans/src/main/res/drawable/tick_mark.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="160dp"
+    android:height="121.82dp"
+    android:viewportWidth="160"
+    android:viewportHeight="121.82">
+  <path
+      android:pathData="M12.73,58.18 L50.91,96.36v25.46L0,70.91Z"
+      android:fillColor="?colorSecondary"/>
+  <path
+      android:pathData="M160,12.73 L50.91,121.82V96.36L147.27,0Z"
+      android:fillColor="?colorPrimary"/>
+</vector>
diff --git a/openhumans/src/main/res/font/montserrat.xml b/openhumans/src/main/res/font/montserrat.xml
new file mode 100644
index 0000000000..8d513810be
--- /dev/null
+++ b/openhumans/src/main/res/font/montserrat.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<font-family xmlns:android="http://schemas.android.com/apk/res/android">
+    <font
+        android:fontStyle="normal"
+        android:fontWeight="300"
+        android:font="@font/montserrat_light" />
+    <font
+        android:fontStyle="normal"
+        android:fontWeight="400"
+        android:font="@font/montserrat_regular" />
+    <font
+        android:fontStyle="normal"
+        android:fontWeight="500"
+        android:font="@font/montserrat_medium" />
+    <font
+        android:fontStyle="normal"
+        android:fontWeight="700"
+        android:font="@font/montserrat_bold" />
+</font-family>
\ No newline at end of file
diff --git a/openhumans/src/main/res/font/montserrat_bold.ttf b/openhumans/src/main/res/font/montserrat_bold.ttf
new file mode 100644
index 0000000000..221819bca0
Binary files /dev/null and b/openhumans/src/main/res/font/montserrat_bold.ttf differ
diff --git a/openhumans/src/main/res/font/montserrat_light.ttf b/openhumans/src/main/res/font/montserrat_light.ttf
new file mode 100644
index 0000000000..990857de8e
Binary files /dev/null and b/openhumans/src/main/res/font/montserrat_light.ttf differ
diff --git a/openhumans/src/main/res/font/montserrat_medium.ttf b/openhumans/src/main/res/font/montserrat_medium.ttf
new file mode 100644
index 0000000000..6e079f6984
Binary files /dev/null and b/openhumans/src/main/res/font/montserrat_medium.ttf differ
diff --git a/openhumans/src/main/res/font/montserrat_regular.ttf b/openhumans/src/main/res/font/montserrat_regular.ttf
new file mode 100644
index 0000000000..8d443d5d56
Binary files /dev/null and b/openhumans/src/main/res/font/montserrat_regular.ttf differ
diff --git a/openhumans/src/main/res/layout/activity_open_humans_login_new.xml b/openhumans/src/main/res/layout/activity_open_humans_login_new.xml
new file mode 100644
index 0000000000..f7c138056e
--- /dev/null
+++ b/openhumans/src/main/res/layout/activity_open_humans_login_new.xml
@@ -0,0 +1,723 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout 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:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:animateLayoutChanges="true"
+    tools:context="info.nightscout.androidaps.plugin.general.openhumans.ui.OHLoginActivity">
+
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:animateLayoutChanges="true"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/toolbar">
+
+        <androidx.core.widget.NestedScrollView
+            android:id="@+id/welcome"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:background="?android:windowBackground"
+            android:fillViewport="true"
+            android:visibility="gone">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:orientation="vertical"
+                android:padding="16dp">
+
+                <ImageView
+                    android:layout_width="160dp"
+                    android:layout_height="160dp"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:srcCompat="@drawable/open_humans" />
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="16dp"
+                    android:gravity="center"
+                    android:text="Welcome to Open Humans"
+                    android:textAppearance="?textAppearanceHeadline5"
+                    android:textColor="?colorPrimary"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent" />
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="16dp"
+                    android:gravity="center"
+                    android:text="@string/open_humans_description"
+                    android:textAppearance="?textAppearanceBody1"
+                    android:textColor="?colorOnBackground" />
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="16dp"
+                    android:gravity="center"
+                    android:text="To setup data upload, click 'Next'."
+                    android:textAppearance="?textAppearanceSubtitle1"
+                    android:textColor="?colorSecondary" />
+
+                <com.google.android.material.button.MaterialButton
+                    android:id="@+id/welcome_next"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="16dp"
+                    android:text="Next" />
+            </LinearLayout>
+        </androidx.core.widget.NestedScrollView>
+
+        <androidx.core.widget.NestedScrollView
+            android:id="@+id/consent"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:background="?android:windowBackground"
+            android:fillViewport="true"
+            android:visibility="gone">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:orientation="vertical"
+                android:padding="16dp">
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="Consent"
+                    android:textAppearance="?textAppearanceHeadline5"
+                    android:textColor="?colorPrimary" />
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="8dp"
+                    android:text="Please carefully read the following information and accept the terms of use to proceed."
+                    android:textAppearance="?textAppearanceSubtitle1"
+                    android:textColor="?colorSecondary" />
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="16dp"
+                    android:layout_marginBottom="8dp"
+                    android:text="Terms of Use"
+                    android:textAppearance="?textAppearanceHeadline6"
+                    android:textColor="?colorPrimary" />
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="This is an open source tool that will copy your data to Open Humans. We retain no rights to share your data with third parties without your explicit authorization. The data the project and app receive are identified via a random user ID and will only be securely transmitted to an Open Humans account with your authorization of that process. You can stop uploading and delete your upload data at any time via www.openhumans.org."
+                    android:textAppearance="?textAppearanceBody2"
+                    android:textColor="?colorOnBackground" />
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="16dp"
+                    android:layout_marginBottom="8dp"
+                    android:text="Data Uploaded"
+                    android:textAppearance="?textAppearanceHeadline6"
+                    android:textColor="?colorPrimary" />
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="48dp"
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal">
+
+                    <View
+                        android:layout_width="4dp"
+                        android:layout_height="4dp"
+                        android:layout_marginStart="4dp"
+                        android:layout_marginEnd="16dp"
+                        android:background="@drawable/dot" />
+
+                    <TextView
+                        android:layout_width="0dp"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1"
+                        android:gravity="center_vertical"
+                        android:text="Glucose values"
+                        android:textAppearance="?textAppearanceBody1"
+                        android:textColor="?colorOnBackground" />
+                </LinearLayout>
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="48dp"
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal">
+
+                    <View
+                        android:layout_width="4dp"
+                        android:layout_height="4dp"
+                        android:layout_marginStart="4dp"
+                        android:layout_marginEnd="16dp"
+                        android:background="@drawable/dot" />
+
+                    <TextView
+                        android:layout_width="0dp"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1"
+                        android:gravity="center_vertical"
+                        android:text="Boluses"
+                        android:textAppearance="?textAppearanceBody1"
+                        android:textColor="?colorOnBackground" />
+                </LinearLayout>
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="48dp"
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal">
+
+                    <View
+                        android:layout_width="4dp"
+                        android:layout_height="4dp"
+                        android:layout_marginStart="4dp"
+                        android:layout_marginEnd="16dp"
+                        android:background="@drawable/dot" />
+
+                    <TextView
+                        android:layout_width="0dp"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1"
+                        android:gravity="center_vertical"
+                        android:text="Extended boluses"
+                        android:textAppearance="?textAppearanceBody1"
+                        android:textColor="?colorOnBackground" />
+                </LinearLayout>
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="48dp"
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal">
+
+                    <View
+                        android:layout_width="4dp"
+                        android:layout_height="4dp"
+                        android:layout_marginStart="4dp"
+                        android:layout_marginEnd="16dp"
+                        android:background="@drawable/dot" />
+
+                    <TextView
+                        android:layout_width="0dp"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1"
+                        android:gravity="center_vertical"
+                        android:text="Carbohydrates"
+                        android:textAppearance="?textAppearanceBody1"
+                        android:textColor="?colorOnBackground" />
+                </LinearLayout>
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="48dp"
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal">
+
+                    <View
+                        android:layout_width="4dp"
+                        android:layout_height="4dp"
+                        android:layout_marginStart="4dp"
+                        android:layout_marginEnd="16dp"
+                        android:background="@drawable/dot" />
+
+                    <TextView
+                        android:layout_width="0dp"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1"
+                        android:gravity="center_vertical"
+                        android:text="Careportal Events (except notes)"
+                        android:textAppearance="?textAppearanceBody1"
+                        android:textColor="?colorOnBackground" />
+                </LinearLayout>
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="48dp"
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal">
+
+                    <View
+                        android:layout_width="4dp"
+                        android:layout_height="4dp"
+                        android:layout_marginStart="4dp"
+                        android:layout_marginEnd="16dp"
+                        android:background="@drawable/dot" />
+
+                    <TextView
+                        android:layout_width="0dp"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1"
+                        android:gravity="center_vertical"
+                        android:text="Profile Switches"
+                        android:textAppearance="?textAppearanceBody1"
+                        android:textColor="?colorOnBackground" />
+                </LinearLayout>
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="48dp"
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal">
+
+                    <View
+                        android:layout_width="4dp"
+                        android:layout_height="4dp"
+                        android:layout_marginStart="4dp"
+                        android:layout_marginEnd="16dp"
+                        android:background="@drawable/dot" />
+
+                    <TextView
+                        android:layout_width="0dp"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1"
+                        android:gravity="center_vertical"
+                        android:text="Total Daily Doses"
+                        android:textAppearance="?textAppearanceBody1"
+                        android:textColor="?colorOnBackground" />
+                </LinearLayout>
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="48dp"
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal">
+
+                    <View
+                        android:layout_width="4dp"
+                        android:layout_height="4dp"
+                        android:layout_marginStart="4dp"
+                        android:layout_marginEnd="16dp"
+                        android:background="@drawable/dot" />
+
+                    <TextView
+                        android:layout_width="0dp"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1"
+                        android:gravity="center_vertical"
+                        android:text="Temporary Basal Rates"
+                        android:textAppearance="?textAppearanceBody1"
+                        android:textColor="?colorOnBackground" />
+                </LinearLayout>
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="48dp"
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal">
+
+                    <View
+                        android:layout_width="4dp"
+                        android:layout_height="4dp"
+                        android:layout_marginStart="4dp"
+                        android:layout_marginEnd="16dp"
+                        android:background="@drawable/dot" />
+
+                    <TextView
+                        android:layout_width="0dp"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1"
+                        android:gravity="center_vertical"
+                        android:text="Temporary Targets"
+                        android:textAppearance="?textAppearanceBody1"
+                        android:textColor="?colorOnBackground" />
+                </LinearLayout>
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="48dp"
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal">
+
+                    <View
+                        android:layout_width="4dp"
+                        android:layout_height="4dp"
+                        android:layout_marginStart="4dp"
+                        android:layout_marginEnd="16dp"
+                        android:background="@drawable/dot" />
+
+                    <TextView
+                        android:layout_width="0dp"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1"
+                        android:gravity="center_vertical"
+                        android:text="Settings"
+                        android:textAppearance="?textAppearanceBody1"
+                        android:textColor="?colorOnBackground" />
+                </LinearLayout>
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="48dp"
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal">
+
+                    <View
+                        android:layout_width="4dp"
+                        android:layout_height="4dp"
+                        android:layout_marginStart="4dp"
+                        android:layout_marginEnd="16dp"
+                        android:background="@drawable/dot" />
+
+                    <TextView
+                        android:layout_width="0dp"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1"
+                        android:gravity="center_vertical"
+                        android:text="Application Version"
+                        android:textAppearance="?textAppearanceBody1"
+                        android:textColor="?colorOnBackground" />
+                </LinearLayout>
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="48dp"
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal">
+
+                    <View
+                        android:layout_width="4dp"
+                        android:layout_height="4dp"
+                        android:layout_marginStart="4dp"
+                        android:layout_marginEnd="16dp"
+                        android:background="@drawable/dot" />
+
+                    <TextView
+                        android:layout_width="0dp"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1"
+                        android:gravity="center_vertical"
+                        android:text="Device Model"
+                        android:textAppearance="?textAppearanceBody1"
+                        android:textColor="?colorOnBackground" />
+                </LinearLayout>
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="48dp"
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal">
+
+                    <View
+                        android:layout_width="4dp"
+                        android:layout_height="4dp"
+                        android:layout_marginStart="4dp"
+                        android:layout_marginEnd="16dp"
+                        android:background="@drawable/dot" />
+
+                    <TextView
+                        android:layout_width="0dp"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1"
+                        android:gravity="center_vertical"
+                        android:text="Screen Dimensions"
+                        android:textAppearance="?textAppearanceBody1"
+                        android:textColor="?colorOnBackground" />
+                </LinearLayout>
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="48dp"
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal">
+
+                    <View
+                        android:layout_width="4dp"
+                        android:layout_height="4dp"
+                        android:layout_marginStart="4dp"
+                        android:layout_marginEnd="16dp"
+                        android:background="@drawable/dot" />
+
+                    <TextView
+                        android:layout_width="0dp"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1"
+                        android:gravity="center_vertical"
+                        android:text="Algorithm Debug Data"
+                        android:textAppearance="?textAppearanceBody1"
+                        android:textColor="?colorOnBackground" />
+                </LinearLayout>
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="16dp"
+                    android:layout_marginBottom="8dp"
+                    android:text="Data NOT Uploaded"
+                    android:textAppearance="?textAppearanceHeadline6"
+                    android:textColor="?colorPrimary" />
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="48dp"
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal">
+
+                    <View
+                        android:layout_width="4dp"
+                        android:layout_height="4dp"
+                        android:layout_marginStart="4dp"
+                        android:layout_marginEnd="16dp"
+                        android:background="@drawable/dot" />
+
+                    <TextView
+                        android:layout_width="0dp"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1"
+                        android:gravity="center_vertical"
+                        android:text="Passwords"
+                        android:textAppearance="?textAppearanceBody1"
+                        android:textColor="?colorOnBackground" />
+                </LinearLayout>
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="48dp"
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal">
+
+                    <View
+                        android:layout_width="4dp"
+                        android:layout_height="4dp"
+                        android:layout_marginStart="4dp"
+                        android:layout_marginEnd="16dp"
+                        android:background="@drawable/dot" />
+
+                    <TextView
+                        android:layout_width="0dp"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1"
+                        android:gravity="center_vertical"
+                        android:text="Nightscout URL"
+                        android:textAppearance="?textAppearanceBody1"
+                        android:textColor="?colorOnBackground" />
+                </LinearLayout>
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="48dp"
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal">
+
+                    <View
+                        android:layout_width="4dp"
+                        android:layout_height="4dp"
+                        android:layout_marginStart="4dp"
+                        android:layout_marginEnd="16dp"
+                        android:background="@drawable/dot" />
+
+                    <TextView
+                        android:layout_width="0dp"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1"
+                        android:gravity="center_vertical"
+                        android:text="Nightscout API Secret"
+                        android:textAppearance="?textAppearanceBody1"
+                        android:textColor="?colorOnBackground" />
+                </LinearLayout>
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="48dp"
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal">
+
+                    <View
+                        android:layout_width="4dp"
+                        android:layout_height="4dp"
+                        android:layout_marginStart="4dp"
+                        android:layout_marginEnd="16dp"
+                        android:background="@drawable/dot" />
+
+                    <TextView
+                        android:layout_width="0dp"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1"
+                        android:gravity="center_vertical"
+                        android:text="Free Text Fields"
+                        android:textAppearance="?textAppearanceBody1"
+                        android:textColor="?colorOnBackground" />
+                </LinearLayout>
+
+                <CheckBox
+                    android:id="@+id/accept"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_horizontal"
+                    android:text="I understand and agree." />
+
+                <com.google.android.material.button.MaterialButton
+                    android:id="@+id/login"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_horizontal"
+                    android:layout_marginTop="8dp"
+                    android:layout_marginBottom="32dp"
+                    android:enabled="false"
+                    android:text="Login to Open Humans" />
+            </LinearLayout>
+        </androidx.core.widget.NestedScrollView>
+
+        <androidx.core.widget.NestedScrollView
+            android:id="@+id/confirm"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:background="?android:windowBackground"
+            android:fillViewport="true"
+            android:visibility="gone">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:orientation="vertical"
+                android:padding="16dp">
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:gravity="center"
+                    android:text="Final touches"
+                    android:textAppearance="?textAppearanceHeadline4"
+                    android:textColor="?colorPrimary" />
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="8dp"
+                    android:gravity="center"
+                    android:text="You are just one step away from uploading your data to Open Humans. Do you want to proceed?"
+                    android:textAppearance="?textAppearanceBody1" />
+
+                <LinearLayout
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="16dp"
+                    android:orientation="horizontal">
+
+                    <com.google.android.material.button.MaterialButton
+                        android:id="@+id/cancel"
+                        style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginEnd="8dp"
+                        android:text="Cancel" />
+
+                    <com.google.android.material.button.MaterialButton
+                        android:id="@+id/proceed"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="8dp"
+                        android:text="Proceed" />
+                </LinearLayout>
+            </LinearLayout>
+        </androidx.core.widget.NestedScrollView>
+
+        <androidx.core.widget.NestedScrollView
+            android:id="@+id/finishing"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:background="?android:windowBackground"
+            android:fillViewport="true"
+            android:visibility="gone">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:orientation="vertical"
+                android:padding="16dp">
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:gravity="center"
+                    android:text="Finishing..."
+                    android:textAppearance="?textAppearanceHeadline4"
+                    android:textColor="?colorPrimary" />
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="8dp"
+                    android:gravity="center"
+                    android:text="This may take a few seconds."
+                    android:textAppearance="?textAppearanceBody1" />
+
+                <com.google.android.material.progressindicator.LinearProgressIndicator
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="16dp"
+                    android:indeterminate="true" />
+            </LinearLayout>
+        </androidx.core.widget.NestedScrollView>
+
+        <androidx.core.widget.NestedScrollView
+            android:id="@+id/done"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:background="?android:windowBackground"
+            android:fillViewport="true"
+            android:visibility="gone">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:orientation="vertical"
+                android:padding="16dp">
+
+                <ImageView
+                    android:layout_width="160dp"
+                    android:layout_height="wrap_content"
+                    app:srcCompat="@drawable/tick_mark" />
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="16dp"
+                    android:gravity="center"
+                    android:text="We're done!"
+                    android:textAppearance="?textAppearanceHeadline4"
+                    android:textColor="?colorPrimary" />
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="8dp"
+                    android:gravity="center"
+                    android:text="From now on, your phone will silently upload data in the background from time to time."
+                    android:textAppearance="?textAppearanceBody1" />
+
+                <com.google.android.material.button.MaterialButton
+                    android:id="@+id/close"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="8dp"
+                    android:text="Close" />
+            </LinearLayout>
+        </androidx.core.widget.NestedScrollView>
+    </FrameLayout>
+
+    <com.google.android.material.appbar.MaterialToolbar
+        android:id="@+id/toolbar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="?colorSurface"
+        android:elevation="4dp"
+        app:layout_constraintTop_toTopOf="parent" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_open_humans.xml b/openhumans/src/main/res/layout/fragment_open_humans_new.xml
similarity index 59%
rename from app/src/main/res/layout/fragment_open_humans.xml
rename to openhumans/src/main/res/layout/fragment_open_humans_new.xml
index 5d9db835a1..bc317ff21e 100644
--- a/app/src/main/res/layout/fragment_open_humans.xml
+++ b/openhumans/src/main/res/layout/fragment_open_humans_new.xml
@@ -4,6 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:animateLayoutChanges="true"
     android:fillViewport="true">
 
     <LinearLayout
@@ -11,7 +12,8 @@
         android:layout_height="wrap_content"
         android:layout_gravity="center"
         android:gravity="center"
-        android:orientation="vertical">
+        android:orientation="vertical"
+        android:padding="16dp">
 
         <ImageView
             android:layout_width="200dp"
@@ -20,44 +22,51 @@
             android:paddingBottom="16dp"
             app:srcCompat="@drawable/open_humans" />
 
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:text="@string/open_humans"
+            android:textAppearance="?textAppearanceHeadline5"
+            android:textColor="?colorPrimary" />
+
+        <TextView
+            android:id="@+id/info"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="8dp"
+            android:gravity="center"
+            android:text="@string/setup_completed_info"
+            android:textAppearance="?textAppearanceBody2" />
+
         <TextView
             android:id="@+id/member_id"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:textAlignment="center"
-            android:textAppearance="@style/TextAppearance.AppCompat.Body1"
+            android:layout_marginTop="16dp"
+            android:gravity="center"
+            android:textAppearance="?textAppearanceBody1"
             tools:text="Project Member ID: 5151515" />
 
-        <TextView
-            android:layout_marginTop="8dp"
-            android:id="@+id/queue_size"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:textAlignment="center"
-            android:textAppearance="@style/TextAppearance.AppCompat.Body1"
-            tools:text="Queue Size: 155" />
-
-        <TextView
-            android:layout_marginTop="8dp"
-            android:id="@+id/worker_state"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:textAlignment="center"
-            android:textAppearance="@style/TextAppearance.AppCompat.Body1"
-            tools:text="Worker State: Running" />
-
-        <Button
-            android:layout_marginTop="16dp"
-            android:id="@+id/login"
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/setup"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="@string/login" />
+            android:layout_marginTop="16dp"
+            android:text="@string/setup" />
 
-        <Button
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/upload_now"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="16dp"
+            android:text="@string/upload_now" />
+
+        <com.google.android.material.button.MaterialButton
             android:id="@+id/logout"
-            android:layout_marginTop="16dp"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_marginTop="16dp"
             android:text="@string/logout" />
     </LinearLayout>
 </ScrollView>
\ No newline at end of file
diff --git a/openhumans/src/main/res/values-af-rZA/strings.xml b/openhumans/src/main/res/values-af-rZA/strings.xml
new file mode 100644
index 0000000000..3ea04e700d
--- /dev/null
+++ b/openhumans/src/main/res/values-af-rZA/strings.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>
diff --git a/openhumans/src/main/res/values-bg-rBG/strings.xml b/openhumans/src/main/res/values-bg-rBG/strings.xml
new file mode 100644
index 0000000000..f5a10ce1ce
--- /dev/null
+++ b/openhumans/src/main/res/values-bg-rBG/strings.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="open_humans">Open Humans</string>
+    <string name="open_humans_short">OH</string>
+    <string name="logout">Изход</string>
+    <string name="only_upload_if_connected_to_wifi">Качване, само при свързано WiFi</string>
+    <string name="only_upload_if_charging">Качване само при зареждане</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>
+</resources>
diff --git a/openhumans/src/main/res/values-ca-rES/strings.xml b/openhumans/src/main/res/values-ca-rES/strings.xml
new file mode 100644
index 0000000000..9868d0e25d
--- /dev/null
+++ b/openhumans/src/main/res/values-ca-rES/strings.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="open_humans">Open Humans</string>
+    <string name="open_humans_short">OH</string>
+    <string name="logout">Tancar sessió</string>
+    <string name="only_upload_if_connected_to_wifi">Enviar només si hi ha connexió WiFi</string>
+    <string name="only_upload_if_charging">Enviar només si carregant</string>
+    <string name="you_have_been_signed_out_of_open_humans">Heu tancat la sessió amb Open Humans</string>
+    <string name="click_here_to_sign_in_again_if_this_wasnt_on_purpose">Cliqueu aquí si no era la intenció.</string>
+</resources>
diff --git a/openhumans/src/main/res/values-cs-rCZ/strings.xml b/openhumans/src/main/res/values-cs-rCZ/strings.xml
new file mode 100644
index 0000000000..47b8dbd15d
--- /dev/null
+++ b/openhumans/src/main/res/values-cs-rCZ/strings.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="open_humans">Open Humans</string>
+    <string name="open_humans_short">OH</string>
+    <string name="open_humans_description">Open Humans vám umožňuje nahrát data z diabetu a darovat je vědeckým projektům.</string>
+    <string name="logout">Odhlášení</string>
+    <string name="setup">Nastavení</string>
+    <string name="setup_completed_info">Opem Humans byl nastaven. Pokud chcete přestat nahrávat, klikněte na \"Odhlásit\".</string>
+    <string name="not_setup_info">Open Humans je momentálně neaktivní. Chcete-li začít nahrávat data, klepněte na tlačítko \"Nastavit\".</string>
+    <string name="project_member_id">ID člena projektu: %1$s</string>
+    <string name="only_upload_if_connected_to_wifi">Odeslat pouze při připojení k Wi-Fi</string>
+    <string name="only_upload_if_charging">Odeslat pouze při nabíjení</string>
+    <string name="open_humans_uploading">Nahrávání na Open Humans…</string>
+    <string name="open_humans_notifications">Oznámení Open Humans</string>
+    <string name="uploading_to_open_humans">AndroidAPS nahrává na Open Humans. To může chvíli trvat.</string>
+    <string name="you_have_been_signed_out_of_open_humans">Byl jste odhlášen z Open Humans</string>
+    <string name="click_here_to_sign_in_again_if_this_wasnt_on_purpose">Chcete-li se znovu přihlásit, klepněte zde, pokud to nebylo schválně.</string>
+    <string name="upload_now">Nahrát nyní</string>
+</resources>
diff --git a/openhumans/src/main/res/values-da-rDK/strings.xml b/openhumans/src/main/res/values-da-rDK/strings.xml
new file mode 100644
index 0000000000..3ea04e700d
--- /dev/null
+++ b/openhumans/src/main/res/values-da-rDK/strings.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>
diff --git a/openhumans/src/main/res/values-de-rDE/strings.xml b/openhumans/src/main/res/values-de-rDE/strings.xml
new file mode 100644
index 0000000000..f31bb0cf22
--- /dev/null
+++ b/openhumans/src/main/res/values-de-rDE/strings.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="open_humans">Open Humans</string>
+    <string name="open_humans_short">OH</string>
+    <string name="open_humans_description">Open Humans ermöglicht Dir, Deine Diabetesdaten in eine große Datenbank hochzuladen und wissenschaftlichen Projekten zur Verfügung zu stellen.</string>
+    <string name="logout">Logout</string>
+    <string name="setup">Einrichtung</string>
+    <string name="setup_completed_info">Open Humans wurde eingerichtet. Wenn Du den Upload stoppen willst, klicke auf \'Logout\'.</string>
+    <string name="not_setup_info">Open Humans ist inaktiv. Klicke auf \'Setup\', um den Upload zu starten.</string>
+    <string name="project_member_id">Project Member ID: %1$s</string>
+    <string name="only_upload_if_connected_to_wifi">Nur über WLAN hochladen</string>
+    <string name="only_upload_if_charging">Nur beim Laden hochladen</string>
+    <string name="open_humans_uploading">Upload zu Open Humans läuft...</string>
+    <string name="open_humans_notifications">Open Humans Benachrichtigungen</string>
+    <string name="uploading_to_open_humans">AndroidAPS lädt zu Open Humans hoch. Dies kann eine Weile dauern.</string>
+    <string name="you_have_been_signed_out_of_open_humans">Du wurdest von Open Humans abgemeldet.</string>
+    <string name="click_here_to_sign_in_again_if_this_wasnt_on_purpose">Klicke hier, um Dich erneut anzumelden, falls dies versehentlich passiert ist.</string>
+    <string name="upload_now">Jetzt hochladen</string>
+</resources>
diff --git a/openhumans/src/main/res/values-el-rGR/strings.xml b/openhumans/src/main/res/values-el-rGR/strings.xml
new file mode 100644
index 0000000000..3ea04e700d
--- /dev/null
+++ b/openhumans/src/main/res/values-el-rGR/strings.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>
diff --git a/openhumans/src/main/res/values-es-rES/strings.xml b/openhumans/src/main/res/values-es-rES/strings.xml
new file mode 100644
index 0000000000..b3c6b52b78
--- /dev/null
+++ b/openhumans/src/main/res/values-es-rES/strings.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="open_humans">Open Humans</string>
+    <string name="open_humans_short">OH</string>
+    <string name="logout">Cerrar sesión</string>
+    <string name="only_upload_if_connected_to_wifi">Subir datos solo si está conectado a WiFi</string>
+    <string name="only_upload_if_charging">Sólo subir datos si se está cargando</string>
+    <string name="you_have_been_signed_out_of_open_humans">Has cerrado la sesión de Open Humans</string>
+    <string name="click_here_to_sign_in_again_if_this_wasnt_on_purpose">Haga clic aquí para iniciar sesión de nuevo si no tenía esa intención.</string>
+</resources>
diff --git a/openhumans/src/main/res/values-fr-rFR/strings.xml b/openhumans/src/main/res/values-fr-rFR/strings.xml
new file mode 100644
index 0000000000..6a121d0575
--- /dev/null
+++ b/openhumans/src/main/res/values-fr-rFR/strings.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="open_humans">Open Humans</string>
+    <string name="open_humans_short">OH</string>
+    <string name="open_humans_description">Open Humans vous permet de télécharger vos données sur le diabète et de les donner à des projets scientifiques.</string>
+    <string name="logout">Déconnexion</string>
+    <string name="setup">Configuration</string>
+    <string name="setup_completed_info">Open Humans a été configuré. Si vous souhaitez arrêter le téléchargement, cliquez sur «Déconnexion».</string>
+    <string name="not_setup_info">Open Humans est actuellement inactif. Pour commencer à télécharger des données, cliquez sur «Configuration».</string>
+    <string name="project_member_id">ID utilisateur : %1$s</string>
+    <string name="only_upload_if_connected_to_wifi">Ne télécharger que si connecté au WiFi</string>
+    <string name="only_upload_if_charging">Ne télécharger que si en charge</string>
+    <string name="open_humans_uploading">Téléchargement vers Open Humans…</string>
+    <string name="open_humans_notifications">Notifications Open Humans</string>
+    <string name="uploading_to_open_humans">AndroidAPS télécharge vers Open Humans. Cela peut prendre un certain temps.</string>
+    <string name="you_have_been_signed_out_of_open_humans">Vous avez été déconnecté d\'Open Humans</string>
+    <string name="click_here_to_sign_in_again_if_this_wasnt_on_purpose">Cliquez ici pour vous connecter à nouveau si ce n\'était pas volontaire.</string>
+    <string name="upload_now">Télécharger maintenant</string>
+</resources>
diff --git a/openhumans/src/main/res/values-ga-rIE/strings.xml b/openhumans/src/main/res/values-ga-rIE/strings.xml
new file mode 100644
index 0000000000..3ea04e700d
--- /dev/null
+++ b/openhumans/src/main/res/values-ga-rIE/strings.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>
diff --git a/openhumans/src/main/res/values-hr-rHR/strings.xml b/openhumans/src/main/res/values-hr-rHR/strings.xml
new file mode 100644
index 0000000000..3ea04e700d
--- /dev/null
+++ b/openhumans/src/main/res/values-hr-rHR/strings.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>
diff --git a/openhumans/src/main/res/values-it-rIT/strings.xml b/openhumans/src/main/res/values-it-rIT/strings.xml
new file mode 100644
index 0000000000..6ef4309f8e
--- /dev/null
+++ b/openhumans/src/main/res/values-it-rIT/strings.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="open_humans">Open Humans</string>
+    <string name="open_humans_short">OH</string>
+    <string name="open_humans_description">Open Humans ti permette di caricare i tuoi dati sul diabete e donarli a progetti scientifici.</string>
+    <string name="logout">Logout</string>
+    <string name="setup">Configurazione</string>
+    <string name="setup_completed_info">Open Humans è stato configurato. In caso tu voglia fermare il caricamento, fai click su \'Logout\'.</string>
+    <string name="not_setup_info">Open Humans è attualmente inattivo. Per avviare il caricamento dei dati, fai click su \'Configurazione\'.</string>
+    <string name="project_member_id">Project Member ID: %1$s</string>
+    <string name="only_upload_if_connected_to_wifi">Upload solo se connesso a WiFi</string>
+    <string name="only_upload_if_charging">Upload solo se in carica</string>
+    <string name="open_humans_uploading">Caricamento su Open Humans…</string>
+    <string name="open_humans_notifications">Notifiche Open Humans</string>
+    <string name="uploading_to_open_humans">AndroidAPS sta caricando i dati su Open Humans. Potrebbe volerci un po\' di tempo.</string>
+    <string name="you_have_been_signed_out_of_open_humans">Sei stato disconnesso da Open Humans</string>
+    <string name="click_here_to_sign_in_again_if_this_wasnt_on_purpose">Fare click qui per accedere di nuovo.</string>
+    <string name="upload_now">Carica adesso</string>
+</resources>
diff --git a/openhumans/src/main/res/values-iw-rIL/strings.xml b/openhumans/src/main/res/values-iw-rIL/strings.xml
new file mode 100644
index 0000000000..fbb62cf13c
--- /dev/null
+++ b/openhumans/src/main/res/values-iw-rIL/strings.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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">מספר זיהוי משתמש: %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/openhumans/src/main/res/values-ko-rKR/strings.xml b/openhumans/src/main/res/values-ko-rKR/strings.xml
new file mode 100644
index 0000000000..969971395d
--- /dev/null
+++ b/openhumans/src/main/res/values-ko-rKR/strings.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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/openhumans/src/main/res/values-lt-rLT/strings.xml b/openhumans/src/main/res/values-lt-rLT/strings.xml
new file mode 100644
index 0000000000..25762fc281
--- /dev/null
+++ b/openhumans/src/main/res/values-lt-rLT/strings.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="open_humans">Open Humans</string>
+    <string name="open_humans_short">OH</string>
+    <string name="logout">Atsijungti</string>
+    <string name="only_upload_if_connected_to_wifi">Tik įkelti, jei prijungta prie WiFi</string>
+    <string name="only_upload_if_charging">Įkelti tik akumuliatoriaus įkrovimo metu</string>
+    <string name="you_have_been_signed_out_of_open_humans">Jūs buvote atjungtas iš Open Humans</string>
+    <string name="click_here_to_sign_in_again_if_this_wasnt_on_purpose">Spustelėkite čia, kad prisijungtumėte dar kartą, jei tai atsitiko netyčia.</string>
+</resources>
diff --git a/openhumans/src/main/res/values-nl-rNL/strings.xml b/openhumans/src/main/res/values-nl-rNL/strings.xml
new file mode 100644
index 0000000000..4be13a090f
--- /dev/null
+++ b/openhumans/src/main/res/values-nl-rNL/strings.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="open_humans">Open Humans</string>
+    <string name="open_humans_short">OH</string>
+    <string name="logout">Uitloggen</string>
+    <string name="only_upload_if_connected_to_wifi">Alleen uploaden indien verbonden met WiFi</string>
+    <string name="only_upload_if_charging">Alleen uploaden tijdens opladen</string>
+    <string name="you_have_been_signed_out_of_open_humans">Je bent uitgelogd van Open Humans</string>
+    <string name="click_here_to_sign_in_again_if_this_wasnt_on_purpose">Klik hier om opnieuw in te loggen als dit niet opzettelijk was.</string>
+</resources>
diff --git a/openhumans/src/main/res/values-no-rNO/strings.xml b/openhumans/src/main/res/values-no-rNO/strings.xml
new file mode 100644
index 0000000000..6382ea3829
--- /dev/null
+++ b/openhumans/src/main/res/values-no-rNO/strings.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="open_humans">Open Humans</string>
+    <string name="open_humans_short">OH</string>
+    <string name="logout">Utlogging</string>
+    <string name="only_upload_if_connected_to_wifi">Last opp kun dersom du er koblet til WiFi</string>
+    <string name="only_upload_if_charging">Last opp kun ved mobillading</string>
+    <string name="you_have_been_signed_out_of_open_humans">Du har blitt logget ut fra Open Humans</string>
+    <string name="click_here_to_sign_in_again_if_this_wasnt_on_purpose">Klikk her for å logge inn igjen hvis dette ikke var hensikten.</string>
+</resources>
diff --git a/openhumans/src/main/res/values-pl-rPL/strings.xml b/openhumans/src/main/res/values-pl-rPL/strings.xml
new file mode 100644
index 0000000000..dd9ff5dbbf
--- /dev/null
+++ b/openhumans/src/main/res/values-pl-rPL/strings.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="open_humans">Open Humans</string>
+    <string name="open_humans_short">OH</string>
+    <string name="logout">Wyloguj się</string>
+    <string name="only_upload_if_connected_to_wifi">Prześlij tylko jeśli połączono poprzez WiFi</string>
+    <string name="only_upload_if_charging">Prześlij tylko gdy telefon jest ładowany</string>
+    <string name="you_have_been_signed_out_of_open_humans">Zostałeś wylogowany z Open Humans</string>
+    <string name="click_here_to_sign_in_again_if_this_wasnt_on_purpose">Kliknij tutaj, aby zalogować się ponownie, jeśli wylogowanie nie było celowe.</string>
+</resources>
diff --git a/openhumans/src/main/res/values-pt-rBR/strings.xml b/openhumans/src/main/res/values-pt-rBR/strings.xml
new file mode 100644
index 0000000000..3ea04e700d
--- /dev/null
+++ b/openhumans/src/main/res/values-pt-rBR/strings.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>
diff --git a/openhumans/src/main/res/values-pt-rPT/strings.xml b/openhumans/src/main/res/values-pt-rPT/strings.xml
new file mode 100644
index 0000000000..349992ff5d
--- /dev/null
+++ b/openhumans/src/main/res/values-pt-rPT/strings.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="open_humans">Open Humans</string>
+    <string name="open_humans_short">OH</string>
+    <string name="logout">Terminar Sessão</string>
+    <string name="only_upload_if_connected_to_wifi">Apenas enviar se ligado ao Wi-Fi</string>
+    <string name="only_upload_if_charging">Apenas enviar se estiver a carregar</string>
+    <string name="you_have_been_signed_out_of_open_humans">Sessão do Open Humans foi encerrada</string>
+    <string name="click_here_to_sign_in_again_if_this_wasnt_on_purpose">Clique aqui para entrar novamente, se não era de propósito.</string>
+</resources>
diff --git a/openhumans/src/main/res/values-ro-rRO/strings.xml b/openhumans/src/main/res/values-ro-rRO/strings.xml
new file mode 100644
index 0000000000..ccf049edb5
--- /dev/null
+++ b/openhumans/src/main/res/values-ro-rRO/strings.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="open_humans">Open Humans</string>
+    <string name="open_humans_short">OH</string>
+    <string name="logout">Deconectare</string>
+    <string name="only_upload_if_connected_to_wifi">Încarcă numai pe conexiune WiFi</string>
+    <string name="only_upload_if_charging">Încărca numai dacă telefonul este la încărcat</string>
+    <string name="you_have_been_signed_out_of_open_humans">Ai fost deconectat de la Open Humans</string>
+    <string name="click_here_to_sign_in_again_if_this_wasnt_on_purpose">Dați click aici pentru a vă conecta din nou, dacă a fost din greșeală.</string>
+</resources>
diff --git a/openhumans/src/main/res/values-ru-rRU/strings.xml b/openhumans/src/main/res/values-ru-rRU/strings.xml
new file mode 100644
index 0000000000..8827371bc6
--- /dev/null
+++ b/openhumans/src/main/res/values-ru-rRU/strings.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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 неактивна. Чтобы начать загрузку данных, нажмите \'Setup\'.</string>
+    <string name="project_member_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/openhumans/src/main/res/values-sk-rSK/strings.xml b/openhumans/src/main/res/values-sk-rSK/strings.xml
new file mode 100644
index 0000000000..46eee7e8e7
--- /dev/null
+++ b/openhumans/src/main/res/values-sk-rSK/strings.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="open_humans">Open Humans</string>
+    <string name="open_humans_short">OH</string>
+    <string name="open_humans_description">Open Humans vám umožňuje nahrávať dáta vášho diabetu a darovať ich vedeckým projektom.</string>
+    <string name="logout">Odhlásiť</string>
+    <string name="setup">Nastaviť</string>
+    <string name="setup_completed_info">Open Humans bol nastavený. Pokiaľ chcete prestať nahrávať, kliknite na \"Odhlásiť\".</string>
+    <string name="not_setup_info">Open Humans je momentálne neaktívny. Ak chcete začať nahrávať dáta, kliknite na tlačítko \"Nastaviť\".</string>
+    <string name="project_member_id">ID člena projektu: %1$s</string>
+    <string name="only_upload_if_connected_to_wifi">Odoslať iba ak ste pripojený k Wi-Fi</string>
+    <string name="only_upload_if_charging">Odoslať iba pri nabíjaní</string>
+    <string name="open_humans_uploading">Nahrávanie na Open Humans…</string>
+    <string name="open_humans_notifications">Notifikácie Open Humans</string>
+    <string name="uploading_to_open_humans">AndroidAPS nahráva na Open Humans. To môže chvíľu trvať.</string>
+    <string name="you_have_been_signed_out_of_open_humans">Boli ste odhlásený z Open Humans</string>
+    <string name="click_here_to_sign_in_again_if_this_wasnt_on_purpose">Kliknite sem, ak sa chcete prihlásiť znova, v prípade, že sa to stalo nedopatrením.</string>
+    <string name="upload_now">Nahrať teraz</string>
+</resources>
diff --git a/openhumans/src/main/res/values-sl-rSI/strings.xml b/openhumans/src/main/res/values-sl-rSI/strings.xml
new file mode 100644
index 0000000000..3ea04e700d
--- /dev/null
+++ b/openhumans/src/main/res/values-sl-rSI/strings.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>
diff --git a/openhumans/src/main/res/values-sv-rSE/strings.xml b/openhumans/src/main/res/values-sv-rSE/strings.xml
new file mode 100644
index 0000000000..e874779e5a
--- /dev/null
+++ b/openhumans/src/main/res/values-sv-rSE/strings.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="open_humans">Open Humans</string>
+    <string name="open_humans_short">OH</string>
+    <string name="logout">Logga ut</string>
+    <string name="only_upload_if_connected_to_wifi">Ladda bara upp om ansluten till WiFi</string>
+    <string name="only_upload_if_charging">Ladda bara upp vid laddning</string>
+    <string name="you_have_been_signed_out_of_open_humans">Du har loggats ut från Open Humans</string>
+    <string name="click_here_to_sign_in_again_if_this_wasnt_on_purpose">Klicka här om du vill logga in igen.</string>
+</resources>
diff --git a/openhumans/src/main/res/values-ta-rIN/strings.xml b/openhumans/src/main/res/values-ta-rIN/strings.xml
new file mode 100644
index 0000000000..3ea04e700d
--- /dev/null
+++ b/openhumans/src/main/res/values-ta-rIN/strings.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>
diff --git a/openhumans/src/main/res/values-tr-rTR/strings.xml b/openhumans/src/main/res/values-tr-rTR/strings.xml
new file mode 100644
index 0000000000..3ea04e700d
--- /dev/null
+++ b/openhumans/src/main/res/values-tr-rTR/strings.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>
diff --git a/openhumans/src/main/res/values-zh-rCN/strings.xml b/openhumans/src/main/res/values-zh-rCN/strings.xml
new file mode 100644
index 0000000000..3ea04e700d
--- /dev/null
+++ b/openhumans/src/main/res/values-zh-rCN/strings.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>
diff --git a/openhumans/src/main/res/values/colors.xml b/openhumans/src/main/res/values/colors.xml
new file mode 100644
index 0000000000..690c43ae2b
--- /dev/null
+++ b/openhumans/src/main/res/values/colors.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="open_humans_orange">#ff9161</color>
+    <color name="open_humans_orange_variant">#fe6315</color>
+    <color name="open_humans_blue">#009fa8</color>
+    <color name="open_humans_blue_variant">#036866</color>
+</resources>
\ No newline at end of file
diff --git a/openhumans/src/main/res/values/strings.xml b/openhumans/src/main/res/values/strings.xml
new file mode 100644
index 0000000000..0578e0e80d
--- /dev/null
+++ b/openhumans/src/main/res/values/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="open_humans">Open Humans</string>
+    <string name="open_humans_short">OH</string>
+    <string name="open_humans_description">Open Humans allows you to upload your diabetes data and donate it to scientific projects.</string>
+    <string name="logout">Logout</string>
+    <string name="setup">Setup</string>
+    <string name="setup_completed_info">Open Humans has been setup. In case you want to stop uploading, click \'Logout\'.</string>
+    <string name="not_setup_info">Open Humans is currently inactive. To start uploading data, click \'Setup\'.</string>
+    <string name="project_member_id">Project Member ID: %1$s</string>
+    <string name="only_upload_if_connected_to_wifi">Only upload if connected to WiFi</string>
+    <string name="only_upload_if_charging">Only upload if charging</string>
+    <string name="key_open_humans_settings" translatable="false">open_humans</string>
+    <string name="open_humans_uploading">Uploading to Open Humans…</string>
+    <string name="open_humans_notifications">Open Humans Notifications</string>
+    <string name="uploading_to_open_humans">AndroidAPS is uploading to Open Humans. This may take a while.</string>
+    <string name="you_have_been_signed_out_of_open_humans">You have been signed out of Open Humans</string>
+    <string name="click_here_to_sign_in_again_if_this_wasnt_on_purpose">Click here to sign in again if this wasn\'t on purpose.</string>
+    <string name="upload_now">Upload now</string>
+</resources>
\ No newline at end of file
diff --git a/openhumans/src/main/res/values/styles.xml b/openhumans/src/main/res/values/styles.xml
new file mode 100644
index 0000000000..42398b5ee4
--- /dev/null
+++ b/openhumans/src/main/res/values/styles.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="OpenHumans" parent="Theme.MaterialComponents.DayNight.NoActionBar">
+        <item name="colorPrimary">@color/open_humans_orange</item>
+        <item name="colorSecondary">@color/open_humans_blue</item>
+        <item name="colorPrimaryVariant">@color/open_humans_orange_variant</item>
+        <item name="colorSecondaryVariant">@color/open_humans_blue_variant</item>
+        <item name="colorOnPrimary">@android:color/white</item>
+        <item name="colorOnSecondary">@android:color/white</item>
+        <item name="fontFamily">@font/montserrat</item>
+        <item name="android:statusBarColor">@android:color/transparent</item>
+    </style>
+</resources>
\ No newline at end of file
diff --git a/openhumans/src/main/res/xml/pref_openhumans.xml b/openhumans/src/main/res/xml/pref_openhumans.xml
new file mode 100644
index 0000000000..b4b1fee2d4
--- /dev/null
+++ b/openhumans/src/main/res/xml/pref_openhumans.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:validate="http://schemas.android.com/apk/res-auto">
+
+    <PreferenceCategory
+        android:key="@string/key_open_humans_settings"
+        android:title="@string/open_humans">
+
+        <CheckBoxPreference
+            android:defaultValue="true"
+            android:key="key_oh_wifi_only"
+            android:title="@string/only_upload_if_connected_to_wifi" />
+
+        <CheckBoxPreference
+            android:defaultValue="false"
+            android:key="key_oh_charging_only"
+            android:title="@string/only_upload_if_charging" />
+
+    </PreferenceCategory>
+
+</androidx.preference.PreferenceScreen>
\ No newline at end of file
diff --git a/pump-common/.gitignore b/pump-common/.gitignore
new file mode 100644
index 0000000000..42afabfd2a
--- /dev/null
+++ b/pump-common/.gitignore
@@ -0,0 +1 @@
+/build
\ No newline at end of file
diff --git a/pump-common/build.gradle b/pump-common/build.gradle
new file mode 100644
index 0000000000..5457b18d34
--- /dev/null
+++ b/pump-common/build.gradle
@@ -0,0 +1,19 @@
+apply plugin: 'com.android.library'
+apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-kapt'
+apply plugin: 'kotlin-allopen'
+apply plugin: 'com.hiya.jacoco-android'
+
+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"
+
+dependencies {
+    implementation project(':core')
+    //implementation project(':database')
+
+    implementation('com.thoughtworks.xstream:xstream:1.4.18') {
+        exclude group: 'xmlpull', module: 'xmlpull'
+    }
+}
diff --git a/pump-common/consumer-rules.pro b/pump-common/consumer-rules.pro
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/pump-common/proguard-rules.pro b/pump-common/proguard-rules.pro
new file mode 100644
index 0000000000..f1b424510d
--- /dev/null
+++ b/pump-common/proguard-rules.pro
@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
diff --git a/pump-common/src/main/AndroidManifest.xml b/pump-common/src/main/AndroidManifest.xml
new file mode 100644
index 0000000000..d4055a4210
--- /dev/null
+++ b/pump-common/src/main/AndroidManifest.xml
@@ -0,0 +1,7 @@
+<manifest package="info.nightscout.androidaps.plugins.pump.common">
+
+    <application>
+
+    </application>
+
+</manifest>
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
new file mode 100644
index 0000000000..39c4f9ecd6
--- /dev/null
+++ b/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/PumpPluginAbstract.kt
@@ -0,0 +1,383 @@
+package info.nightscout.androidaps.plugins.pump.common
+
+import android.content.Context
+import android.content.Intent
+import android.content.ServiceConnection
+import android.text.format.DateFormat
+import com.google.gson.GsonBuilder
+import dagger.android.HasAndroidInjector
+
+import info.nightscout.androidaps.data.DetailedBolusInfo
+import info.nightscout.androidaps.data.PumpEnactResult
+import info.nightscout.androidaps.events.EventAppExit
+import info.nightscout.androidaps.events.EventCustomActionsChanged
+import info.nightscout.androidaps.extensions.convertedToAbsolute
+import info.nightscout.androidaps.extensions.plannedRemainingMinutes
+import info.nightscout.androidaps.extensions.toStringFull
+import info.nightscout.androidaps.interfaces.*
+import info.nightscout.androidaps.interfaces.PumpSync.TemporaryBasalType
+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.overview.events.EventOverviewBolusProgress
+import info.nightscout.androidaps.plugins.pump.common.data.PumpStatus
+import info.nightscout.androidaps.plugins.pump.common.defs.PumpDriverState
+import info.nightscout.androidaps.plugins.pump.common.defs.PumpType
+import info.nightscout.androidaps.utils.DateUtil
+import info.nightscout.androidaps.utils.DecimalFormatter.to0Decimal
+import info.nightscout.androidaps.utils.DecimalFormatter.to2Decimal
+import info.nightscout.androidaps.utils.FabricPrivacy
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import info.nightscout.androidaps.utils.rx.AapsSchedulers
+import info.nightscout.androidaps.utils.sharedPreferences.SP
+import io.reactivex.disposables.CompositeDisposable
+import org.json.JSONException
+import org.json.JSONObject
+
+/**
+ * Created by andy on 23.04.18.
+ */
+// When using this class, make sure that your first step is to create mConnection (see MedtronicPumpPlugin)
+abstract class PumpPluginAbstract protected constructor(
+    pluginDescription: PluginDescription?,
+    pumpType: PumpType,
+    injector: HasAndroidInjector?,
+    resourceHelper: ResourceHelper,
+    aapsLogger: AAPSLogger,
+    commandQueue: CommandQueueProvider,
+    var rxBus: RxBusWrapper,
+    var activePlugin: ActivePlugin,
+    var sp: SP,
+    var context: Context,
+    var fabricPrivacy: FabricPrivacy,
+    var dateUtil: DateUtil,
+    var aapsSchedulers: AapsSchedulers,
+    var pumpSync: PumpSync,
+    var pumpSyncStorage: info.nightscout.androidaps.plugins.pump.common.sync.PumpSyncStorage
+) : PumpPluginBase(pluginDescription!!, injector!!, aapsLogger, resourceHelper, commandQueue), Pump, Constraints, info.nightscout.androidaps.plugins.pump.common.sync.PumpSyncEntriesCreator {
+
+    private val disposable = CompositeDisposable()
+
+    // Pump capabilities
+    final override var pumpDescription = PumpDescription()
+    //protected set
+
+    protected var serviceConnection: ServiceConnection? = null
+    protected var serviceRunning = false
+    protected var pumpState = PumpDriverState.NotInitialized
+    protected var displayConnectionMessages = false
+
+    var pumpType: PumpType = PumpType.GENERIC_AAPS
+        set(value) {
+            field = value
+            pumpDescription.fillFor(value)
+        }
+
+    protected var gson = GsonBuilder().excludeFieldsWithoutExposeAnnotation().create()
+
+    abstract fun initPumpStatusData()
+
+    override fun onStart() {
+        super.onStart()
+        initPumpStatusData()
+        val intent = Intent(context, serviceClass)
+        context.bindService(intent, serviceConnection!!, Context.BIND_AUTO_CREATE)
+        serviceRunning = true
+        disposable.add(rxBus
+            .toObservable(EventAppExit::class.java)
+            .observeOn(aapsSchedulers.io)
+            .subscribe({ _ -> context.unbindService(serviceConnection!!) }) { throwable: Throwable? -> fabricPrivacy.logException(throwable!!) }
+        )
+        onStartCustomActions()
+    }
+
+    override fun onStop() {
+        aapsLogger.debug(LTag.PUMP, deviceID() + " onStop()")
+        context.unbindService(serviceConnection!!)
+        serviceRunning = false
+        disposable.clear()
+        super.onStop()
+    }
+
+    /**
+     * If we need to run any custom actions in onStart (triggering events, etc)
+     */
+    abstract fun onStartCustomActions()
+
+    /**
+     * Service class (same one you did serviceConnection for)
+     *
+     * @return Class
+     */
+    abstract val serviceClass: Class<*>?
+    abstract val pumpStatusData: PumpStatus
+
+    override fun isInitialized(): Boolean {
+        return pumpState.isInitialized()
+    }
+
+    override fun isSuspended(): Boolean {
+        return pumpState === PumpDriverState.Suspended
+    }
+
+    override fun isBusy(): Boolean {
+        return pumpState === PumpDriverState.Busy
+    }
+
+    override fun isConnected(): Boolean {
+        if (displayConnectionMessages) aapsLogger.debug(LTag.PUMP, "isConnected [PumpPluginAbstract].")
+        return pumpState.isConnected()
+    }
+
+    override fun isConnecting(): Boolean {
+        if (displayConnectionMessages) aapsLogger.debug(LTag.PUMP, "isConnecting [PumpPluginAbstract].")
+        return pumpState === PumpDriverState.Connecting
+    }
+
+    override fun connect(reason: String) {
+        if (displayConnectionMessages) aapsLogger.debug(LTag.PUMP, "connect (reason={}) [PumpPluginAbstract] - default (empty) implementation.$reason")
+    }
+
+    override fun disconnect(reason: String) {
+        if (displayConnectionMessages) aapsLogger.debug(LTag.PUMP, "disconnect (reason={}) [PumpPluginAbstract] - default (empty) implementation.$reason")
+    }
+
+    override fun stopConnecting() {
+        if (displayConnectionMessages) aapsLogger.debug(LTag.PUMP, "stopConnecting [PumpPluginAbstract] - default (empty) implementation.")
+    }
+
+    override fun isHandshakeInProgress(): Boolean {
+        if (displayConnectionMessages) aapsLogger.debug(LTag.PUMP, "isHandshakeInProgress [PumpPluginAbstract] - default (empty) implementation.")
+        return false
+    }
+
+    override fun finishHandshaking() {
+        if (displayConnectionMessages) aapsLogger.debug(LTag.PUMP, "finishHandshaking [PumpPluginAbstract] - default (empty) implementation.")
+    }
+
+    // Upload to pump new basal profile
+    override fun setNewBasalProfile(profile: Profile): PumpEnactResult {
+        aapsLogger.debug(LTag.PUMP, "setNewBasalProfile [PumpPluginAbstract] - Not implemented.")
+        return getOperationNotSupportedWithCustomText(R.string.pump_operation_not_supported_by_pump_driver)
+    }
+
+    override fun isThisProfileSet(profile: Profile): Boolean {
+        aapsLogger.debug(LTag.PUMP, "isThisProfileSet [PumpPluginAbstract] - Not implemented.")
+        return true
+    }
+
+    override fun lastDataTime(): Long {
+        aapsLogger.debug(LTag.PUMP, "lastDataTime [PumpPluginAbstract].")
+        return pumpStatusData.lastConnection
+    }
+
+    // base basal rate, not temp basal
+    override val baseBasalRate: Double
+        get() {
+            aapsLogger.debug(LTag.PUMP, "getBaseBasalRate [PumpPluginAbstract] - Not implemented.")
+            return 0.0
+        }
+
+    override fun stopBolusDelivering() {
+        aapsLogger.debug(LTag.PUMP, "stopBolusDelivering [PumpPluginAbstract] - Not implemented.")
+    }
+
+    override fun setTempBasalAbsolute(absoluteRate: Double, durationInMinutes: Int, profile: Profile, enforceNew: Boolean, tbrType: TemporaryBasalType): PumpEnactResult {
+        aapsLogger.debug(LTag.PUMP, "setTempBasalAbsolute [PumpPluginAbstract] - Not implemented.")
+        return getOperationNotSupportedWithCustomText(R.string.pump_operation_not_supported_by_pump_driver)
+    }
+
+    override fun setTempBasalPercent(percent: Int, durationInMinutes: Int, profile: Profile, enforceNew: Boolean, tbrType: TemporaryBasalType): PumpEnactResult {
+        aapsLogger.debug(LTag.PUMP, "setTempBasalPercent [PumpPluginAbstract] - Not implemented.")
+        return getOperationNotSupportedWithCustomText(R.string.pump_operation_not_supported_by_pump_driver)
+    }
+
+    override fun setExtendedBolus(insulin: Double, durationInMinutes: Int): PumpEnactResult {
+        aapsLogger.debug(LTag.PUMP, "setExtendedBolus [PumpPluginAbstract] - Not implemented.")
+        return getOperationNotSupportedWithCustomText(R.string.pump_operation_not_supported_by_pump_driver)
+    }
+
+    // some pumps might set a very short temp close to 100% as cancelling a temp can be noisy
+    // when the cancel request is requested by the user (forced), the pump should always do a real cancel
+    override fun cancelTempBasal(enforceNew: Boolean): PumpEnactResult {
+        aapsLogger.debug(LTag.PUMP, "cancelTempBasal [PumpPluginAbstract] - Not implemented.")
+        return getOperationNotSupportedWithCustomText(R.string.pump_operation_not_supported_by_pump_driver)
+    }
+
+    override fun cancelExtendedBolus(): PumpEnactResult {
+        aapsLogger.debug(LTag.PUMP, "cancelExtendedBolus [PumpPluginAbstract] - Not implemented.")
+        return getOperationNotSupportedWithCustomText(R.string.pump_operation_not_supported_by_pump_driver)
+    }
+
+    // Status to be passed to NS
+    // public JSONObject getJSONStatus(Profile profile, String profileName) {
+    // return pumpDriver.getJSONStatus(profile, profileName);
+    // }
+    open fun deviceID(): String {
+        aapsLogger.debug(LTag.PUMP, "deviceID [PumpPluginAbstract] - Not implemented.")
+        return "FakeDevice"
+    }
+
+    // Short info for SMS, Wear etc
+    override val isFakingTempsByExtendedBoluses: Boolean
+        get() {
+            aapsLogger.debug(LTag.PUMP, "isFakingTempsByExtendedBoluses [PumpPluginAbstract] - Not implemented.")
+            return false
+        }
+
+    override fun loadTDDs(): PumpEnactResult {
+        aapsLogger.debug(LTag.PUMP, "loadTDDs [PumpPluginAbstract] - Not implemented.")
+        return getOperationNotSupportedWithCustomText(R.string.pump_operation_not_supported_by_pump_driver)
+    }
+
+    override fun getJSONStatus(profile: Profile, profileName: String, version: String): JSONObject {
+        if (pumpStatusData.lastConnection + 60 * 60 * 1000L < System.currentTimeMillis()) {
+            return JSONObject()
+        }
+        val now = System.currentTimeMillis()
+        val pump = JSONObject()
+        val battery = JSONObject()
+        val status = JSONObject()
+        val extended = JSONObject()
+        try {
+            battery.put("percent", pumpStatusData.batteryRemaining)
+            status.put("status", pumpStatusData.pumpStatusType.status)
+            extended.put("Version", version)
+            try {
+                extended.put("ActiveProfile", profileName)
+            } catch (ignored: Exception) {
+            }
+            val tb = pumpSync.expectedPumpState().temporaryBasal
+            if (tb != null) {
+                extended.put("TempBasalAbsoluteRate", tb.convertedToAbsolute(now, profile))
+                extended.put("TempBasalStart", dateUtil.dateAndTimeString(tb.timestamp))
+                extended.put("TempBasalRemaining", tb.plannedRemainingMinutes)
+            }
+            val eb = pumpSync.expectedPumpState().extendedBolus
+            if (eb != null) {
+                extended.put("ExtendedBolusAbsoluteRate", eb.rate)
+                extended.put("ExtendedBolusStart", dateUtil.dateAndTimeString(eb.timestamp))
+                extended.put("ExtendedBolusRemaining", eb.plannedRemainingMinutes)
+            }
+            status.put("timestamp", dateUtil.toISOString(dateUtil.now()))
+            pump.put("battery", battery)
+            pump.put("status", status)
+            pump.put("extended", extended)
+            pump.put("reservoir", pumpStatusData.reservoirRemainingUnits)
+            pump.put("clock", dateUtil.toISOString(dateUtil.now()))
+        } catch (e: JSONException) {
+            aapsLogger.error("Unhandled exception", e)
+        }
+        return pump
+    }
+
+    // FIXME i18n, null checks: iob, TDD
+    override fun shortStatus(veryShort: Boolean): String {
+        var ret = ""
+
+        if (pumpStatusData.lastConnection == 0L) {
+            ret += "LastConn: never\n"
+        } else {
+            val agoMsec = System.currentTimeMillis() - pumpStatusData.lastConnection
+            val agoMin = (agoMsec / 60.0 / 1000.0).toInt()
+            ret += "LastConn: $agoMin min ago\n"
+        }
+
+        if (pumpStatusData.lastBolusTime != null && pumpStatusData.lastBolusTime!!.time != 0L) {
+            ret += """
+                LastBolus: ${to2Decimal(pumpStatusData.lastBolusAmount!!)}U @${DateFormat.format("HH:mm", pumpStatusData.lastBolusTime)}
+                
+                """.trimIndent()
+        }
+        val activeTemp = pumpSync.expectedPumpState().temporaryBasal
+        if (activeTemp != null) {
+            ret += """
+                Temp: ${activeTemp.toStringFull(dateUtil)}
+                
+                """.trimIndent()
+        }
+        val activeExtendedBolus = pumpSync.expectedPumpState().extendedBolus
+        if (activeExtendedBolus != null) {
+            ret += """
+                Extended: ${activeExtendedBolus.toStringFull(dateUtil)}
+                
+                """.trimIndent()
+        }
+        // if (!veryShort) {
+        // ret += "TDD: " + DecimalFormatter.to0Decimal(pumpStatus.dailyTotalUnits) + " / "
+        // + pumpStatus.maxDailyTotalUnits + " U\n";
+        // }
+        ret += """
+            IOB: ${pumpStatusData.iob}U
+            
+            """.trimIndent()
+        ret += """
+            Reserv: ${to0Decimal(pumpStatusData.reservoirRemainingUnits)}U
+            
+            """.trimIndent()
+        ret += """
+            Batt: ${pumpStatusData.batteryRemaining}
+            
+            """.trimIndent()
+        return ret
+    }
+
+    override fun deliverTreatment(detailedBolusInfo: DetailedBolusInfo): PumpEnactResult {
+        return try {
+            if (detailedBolusInfo.insulin == 0.0 && detailedBolusInfo.carbs == 0.0) {
+                // neither carbs nor bolus requested
+                aapsLogger.error("deliverTreatment: Invalid input")
+                PumpEnactResult(injector).success(false).enacted(false).bolusDelivered(0.0).carbsDelivered(0.0)
+                    .comment(R.string.invalidinput)
+            } else if (detailedBolusInfo.insulin > 0) {
+                // bolus needed, ask pump to deliver it
+                deliverBolus(detailedBolusInfo)
+            } else {
+                detailedBolusInfo.timestamp = System.currentTimeMillis()
+
+                // no bolus required, carb only treatment
+                pumpSyncStorage.addCarbs(info.nightscout.androidaps.plugins.pump.common.sync.PumpDbEntryCarbs(detailedBolusInfo, this))
+
+                val bolusingEvent = EventOverviewBolusProgress
+                bolusingEvent.t = EventOverviewBolusProgress.Treatment(0.0, detailedBolusInfo.carbs.toInt(), detailedBolusInfo.bolusType === DetailedBolusInfo.BolusType.SMB)
+                bolusingEvent.percent = 100
+                rxBus.send(bolusingEvent)
+                aapsLogger.debug(LTag.PUMP, "deliverTreatment: Carb only treatment.")
+                PumpEnactResult(injector).success(true).enacted(true).bolusDelivered(0.0)
+                    .carbsDelivered(detailedBolusInfo.carbs).comment(R.string.common_resultok)
+            }
+        } finally {
+            triggerUIChange()
+        }
+    }
+
+    protected fun refreshCustomActionsList() {
+        rxBus.send(EventCustomActionsChanged())
+    }
+
+    override fun manufacturer(): ManufacturerType {
+        return pumpType.manufacturer!!
+    }
+
+    override fun model(): PumpType {
+        return pumpType
+    }
+
+    override fun canHandleDST(): Boolean {
+        return false
+    }
+
+    protected abstract fun deliverBolus(detailedBolusInfo: DetailedBolusInfo): PumpEnactResult
+
+    protected abstract fun triggerUIChange()
+
+    private fun getOperationNotSupportedWithCustomText(resourceId: Int): PumpEnactResult {
+        return PumpEnactResult(injector).success(false).enacted(false).comment(resourceId)
+    }
+
+    init {
+        pumpDescription.fillFor(pumpType)
+        this.pumpType = pumpType
+    }
+}
\ No newline at end of file
diff --git a/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/data/PumpStatus.kt b/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/data/PumpStatus.kt
new file mode 100644
index 0000000000..9ecd30bca7
--- /dev/null
+++ b/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/data/PumpStatus.kt
@@ -0,0 +1,52 @@
+package info.nightscout.androidaps.plugins.pump.common.data
+
+import info.nightscout.androidaps.plugins.pump.common.defs.PumpStatusType
+import info.nightscout.androidaps.plugins.pump.common.defs.PumpType
+import java.util.*
+
+/**
+ * Created by andy on 4/28/18.
+ */
+abstract class PumpStatus(var pumpType: PumpType) {
+
+    // connection
+    var lastDataTime: Long = 0
+    var lastConnection = 0L
+    var previousConnection = 0L // here should be stored last connection of previous session (so needs to be
+
+    // read before lastConnection is modified for first time).
+    // last bolus
+    var lastBolusTime: Date? = null
+    var lastBolusAmount: Double? = null
+
+    // other pump settings
+    var activeProfileName = "0"
+    var reservoirRemainingUnits = 0.0
+    var reservoirFullUnits = 0
+    var batteryRemaining = 0 // percent, so 0-100
+    var batteryVoltage: Double? = null
+
+    // iob
+    var iob: String? = null
+
+    // TDD
+    var dailyTotalUnits: Double? = null
+    var maxDailyTotalUnits: String? = null
+    var units: String? = null // Constants.MGDL or Constants.MMOL
+    var pumpStatusType = PumpStatusType.Running
+    var basalsByHour: DoubleArray? = null
+    var tempBasalStart: Date? = null
+    var tempBasalAmount: Double? = 0.0
+    var tempBasalLength: Int? = 0
+    var tempBasalEnd: Long? = null
+
+    abstract fun initSettings()
+
+    fun setLastCommunicationToNow() {
+        lastDataTime = System.currentTimeMillis()
+        lastConnection = System.currentTimeMillis()
+    }
+
+    abstract val errorInfo: String?
+
+}
\ No newline at end of file
diff --git a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/PumpDeviceState.kt b/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/PumpDeviceState.kt
similarity index 91%
rename from rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/PumpDeviceState.kt
rename to pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/PumpDeviceState.kt
index b41a6bd4c1..803d1a8902 100644
--- a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/PumpDeviceState.kt
+++ b/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/PumpDeviceState.kt
@@ -1,6 +1,6 @@
 package info.nightscout.androidaps.plugins.pump.common.defs
 
-import info.nightscout.androidaps.core.R
+import info.nightscout.androidaps.plugins.pump.common.R
 
 enum class PumpDeviceState(var resourceId: Int) {
 
diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/PumpDriverState.kt b/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/PumpDriverState.kt
similarity index 100%
rename from medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/PumpDriverState.kt
rename to pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/PumpDriverState.kt
diff --git a/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/PumpHistoryEntryGroup.kt b/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/PumpHistoryEntryGroup.kt
new file mode 100644
index 0000000000..21b95367ea
--- /dev/null
+++ b/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/PumpHistoryEntryGroup.kt
@@ -0,0 +1,52 @@
+package info.nightscout.androidaps.plugins.pump.common.defs
+
+import info.nightscout.androidaps.plugins.pump.common.R
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import java.util.*
+
+/**
+ * This file was taken from GGC - GNU Gluco Control (ggc.sourceforge.net), application for diabetes
+ * management and modified/extended for AAPS.
+ *
+ *
+ * Author: Andy {andy.rozman@gmail.com}
+ */
+enum class PumpHistoryEntryGroup(val resourceId: Int) {
+
+    All(R.string.history_group_all),
+    Bolus(R.string.history_group_bolus),
+    Basal(R.string.history_group_basal),
+    Prime(R.string.history_group_prime),
+    Configuration(R.string.history_group_configuration),
+    Alarm(R.string.history_group_alarm),
+    Glucose(R.string.history_group_glucose),
+    Notification(R.string.history_group_notification),
+    Statistic(R.string.history_group_statistic),
+    Unknown(R.string.history_group_unknown);
+
+    var translated: String? = null
+        private set
+
+    override fun toString(): String {
+        return translated!!
+    }
+
+    companion object {
+
+        private var translatedList: MutableList<PumpHistoryEntryGroup>? = null
+
+        private fun doTranslation(resourceHelper: ResourceHelper) {
+            translatedList = ArrayList()
+            for (pumpHistoryEntryGroup in values()) {
+                pumpHistoryEntryGroup.translated = resourceHelper.gs(pumpHistoryEntryGroup.resourceId)
+                (translatedList as ArrayList<PumpHistoryEntryGroup>).add(pumpHistoryEntryGroup)
+            }
+        }
+
+        fun getTranslatedList(resourceHelper: ResourceHelper): List<PumpHistoryEntryGroup> {
+            if (translatedList == null) doTranslation(resourceHelper)
+            return translatedList!!
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/PumpStatusType.kt b/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/PumpStatusType.kt
similarity index 100%
rename from medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/PumpStatusType.kt
rename to pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/PumpStatusType.kt
diff --git a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/TempBasalPair.kt b/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/TempBasalPair.kt
similarity index 100%
rename from rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/TempBasalPair.kt
rename to pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/TempBasalPair.kt
diff --git a/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/di/PumpCommonModule.kt b/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/di/PumpCommonModule.kt
new file mode 100644
index 0000000000..a5c85412a4
--- /dev/null
+++ b/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/di/PumpCommonModule.kt
@@ -0,0 +1,25 @@
+package info.nightscout.androidaps.plugins.pump.common.di
+
+import dagger.Module
+import dagger.Provides
+import info.nightscout.androidaps.interfaces.PumpSync
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.plugins.pump.common.sync.PumpSyncStorage
+import info.nightscout.androidaps.utils.sharedPreferences.SP
+import javax.inject.Singleton
+
+@Module
+@Suppress("unused")
+class PumpCommonModule {
+
+    @Provides
+    @Singleton
+    fun providesPumpSyncStorage(
+        pumpSync: PumpSync,
+        sp: SP,
+        aapsLogger: AAPSLogger
+    ): PumpSyncStorage {
+        return PumpSyncStorage(pumpSync, sp, aapsLogger)
+    }
+
+}
\ No newline at end of file
diff --git a/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/sync/PumpDbEntry.kt b/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/sync/PumpDbEntry.kt
new file mode 100644
index 0000000000..918fc9d3ee
--- /dev/null
+++ b/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/sync/PumpDbEntry.kt
@@ -0,0 +1,63 @@
+package info.nightscout.androidaps.plugins.pump.common.sync
+
+import info.nightscout.androidaps.data.DetailedBolusInfo
+import info.nightscout.androidaps.interfaces.PumpSync
+import info.nightscout.androidaps.plugins.pump.common.defs.PumpType
+
+data class PumpDbEntry constructor(var temporaryId: Long,
+                                   var date: Long,
+                                   var pumpType: PumpType,
+                                   var serialNumber: String,
+                                   var bolusData: PumpDbEntryBolus? = null,
+                                   var tbrData: PumpDbEntryTBR? = null,
+                                   var pumpId: Long? = null) {
+
+    constructor(temporaryId: Long,
+                date: Long,
+                pumpType: PumpType,
+                serialNumber: String,
+                detailedBolusInfo: DetailedBolusInfo) : this(temporaryId, date, pumpType, serialNumber) {
+        this.bolusData = PumpDbEntryBolus(
+            detailedBolusInfo.insulin,
+            detailedBolusInfo.carbs,
+            detailedBolusInfo.bolusType)
+    }
+
+    constructor(temporaryId: Long,
+                date: Long,
+                pumpType: PumpType,
+                serialNumber: String,
+                rate: Double,
+                isAbsolute: Boolean,
+                durationInMinutes: Int,
+                tbrType: PumpSync.TemporaryBasalType) : this(temporaryId, date, pumpType, serialNumber) {
+        this.tbrData = PumpDbEntryTBR(
+            rate,
+            isAbsolute,
+            durationInMinutes,
+            tbrType)
+    }
+
+}
+
+data class PumpDbEntryBolus(var insulin: Double,
+                            var carbs: Double,
+                            var bolusType: DetailedBolusInfo.BolusType)
+
+data class PumpDbEntryCarbs(var date: Long,
+                            var carbs: Double,
+                            var pumpType: PumpType,
+                            var serialNumber: String,
+                            var pumpId: Long? = null) {
+
+    constructor(detailedBolusInfo: DetailedBolusInfo,
+                creator: PumpSyncEntriesCreator) : this(detailedBolusInfo.timestamp,
+        detailedBolusInfo.carbs,
+        creator.model(),
+        creator.serialNumber())
+}
+
+data class PumpDbEntryTBR(var rate: Double,
+                          var isAbsolute: Boolean,
+                          var durationInSeconds: Int,
+                          var tbrType: PumpSync.TemporaryBasalType)
\ No newline at end of file
diff --git a/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/sync/PumpSyncEntriesCreator.java b/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/sync/PumpSyncEntriesCreator.java
new file mode 100644
index 0000000000..1ba73df0bb
--- /dev/null
+++ b/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/sync/PumpSyncEntriesCreator.java
@@ -0,0 +1,13 @@
+package info.nightscout.androidaps.plugins.pump.common.sync;
+
+import info.nightscout.androidaps.plugins.pump.common.defs.PumpType;
+
+public interface PumpSyncEntriesCreator {
+
+    long generateTempId(Object dataObject);
+
+    PumpType model();
+
+    String serialNumber();
+
+}
diff --git a/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/sync/PumpSyncStorage.kt b/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/sync/PumpSyncStorage.kt
new file mode 100644
index 0000000000..ef8866d040
--- /dev/null
+++ b/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/sync/PumpSyncStorage.kt
@@ -0,0 +1,192 @@
+package info.nightscout.androidaps.plugins.pump.common.sync
+
+import com.thoughtworks.xstream.XStream
+import com.thoughtworks.xstream.security.AnyTypePermission
+import info.nightscout.androidaps.data.DetailedBolusInfo
+import info.nightscout.androidaps.interfaces.PumpSync
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.utils.sharedPreferences.SP
+import java.util.*
+import javax.inject.Inject
+import javax.inject.Singleton
+
+/**
+ * This class is intended for Pump Drivers that use temporaryId and need way to pair records
+ */
+@Singleton
+class PumpSyncStorage @Inject constructor(
+    val pumpSync: PumpSync,
+    val sp: SP,
+    val aapsLogger: AAPSLogger
+) {
+
+    companion object {
+
+        const val pumpSyncStorageKey: String = "pump_sync_storage_xstream_v2"
+        const val TBR: String = "TBR"
+        const val BOLUS: String = "BOLUS"
+    }
+
+    var pumpSyncStorage: MutableMap<String, MutableList<PumpDbEntry>> = mutableMapOf()
+    private var storageInitialized: Boolean = false
+    private var xstream: XStream = XStream()
+
+    init {
+        initStorage()
+        cleanOldStorage()
+    }
+
+    fun initStorage() {
+        if (storageInitialized)
+            return
+
+        var loaded = false
+
+        if (sp.contains(pumpSyncStorageKey)) {
+            val jsonData: String = sp.getString(pumpSyncStorageKey, "")
+
+            if (jsonData.isNotBlank()) {
+                xstream.addPermission(AnyTypePermission.ANY)
+                @Suppress("UNCHECKED_CAST")
+                pumpSyncStorage = xstream.fromXML(jsonData, MutableMap::class.java) as MutableMap<String, MutableList<PumpDbEntry>>
+
+                aapsLogger.debug(LTag.PUMP, String.format("Loading Pump Sync Storage: boluses=%d, tbrs=%d.", pumpSyncStorage[BOLUS]!!.size, pumpSyncStorage[TBR]!!.size))
+                aapsLogger.debug(LTag.PUMP, "DD: PumpSyncStorage=$pumpSyncStorage")
+
+                loaded = true
+            }
+        }
+
+        if (!loaded) {
+            pumpSyncStorage[BOLUS] = mutableListOf()
+            pumpSyncStorage[TBR] = mutableListOf()
+        }
+    }
+
+    fun saveStorage() {
+        if (!isStorageEmpty()) {
+            sp.putString(pumpSyncStorageKey, xstream.toXML(pumpSyncStorage))
+            aapsLogger.debug(String.format("Saving Pump Sync Storage: boluses=%d, tbrs=%d.", pumpSyncStorage[BOLUS]!!.size, pumpSyncStorage[TBR]!!.size))
+        }
+    }
+
+    private fun cleanOldStorage() {
+        val oldSpKeys = setOf("pump_sync_storage", "pump_sync_storage_xstream")
+
+        for (oldSpKey in oldSpKeys) {
+            if (sp.contains(oldSpKey))
+                sp.remove(oldSpKey)
+        }
+    }
+
+    private fun isStorageEmpty(): Boolean {
+        return pumpSyncStorage[BOLUS]!!.isEmpty() && pumpSyncStorage[TBR]!!.isEmpty()
+    }
+
+    fun getBoluses(): MutableList<PumpDbEntry> {
+        return pumpSyncStorage[BOLUS]!!
+    }
+
+    fun getTBRs(): MutableList<PumpDbEntry> {
+        return pumpSyncStorage[TBR]!!
+    }
+
+    fun addBolusWithTempId(detailedBolusInfo: DetailedBolusInfo, writeToInternalHistory: Boolean, creator: PumpSyncEntriesCreator): Boolean {
+        val temporaryId = creator.generateTempId(detailedBolusInfo.timestamp)
+        val result = pumpSync.addBolusWithTempId(
+            detailedBolusInfo.timestamp,
+            detailedBolusInfo.insulin,
+            temporaryId,
+            detailedBolusInfo.bolusType,
+            creator.model(),
+            creator.serialNumber())
+
+        aapsLogger.debug(LTag.PUMP, String.format(Locale.ENGLISH, "addBolusWithTempId [date=%d, temporaryId=%d, insulin=%.2f, type=%s, pumpSerial=%s] - Result: %b",
+            detailedBolusInfo.timestamp, temporaryId, detailedBolusInfo.insulin, detailedBolusInfo.bolusType,
+            creator.serialNumber(), result))
+
+        if (detailedBolusInfo.carbs > 0.0) {
+            addCarbs(PumpDbEntryCarbs(detailedBolusInfo, creator))
+        }
+
+        if (result && writeToInternalHistory) {
+            val innerList: MutableList<PumpDbEntry> = pumpSyncStorage[BOLUS]!!
+
+            val dbEntry = PumpDbEntry(temporaryId, detailedBolusInfo.timestamp, creator.model(), creator.serialNumber(), detailedBolusInfo)
+
+            aapsLogger.debug("PumpDbEntry: $dbEntry")
+
+            innerList.add(dbEntry)
+            pumpSyncStorage[BOLUS] = innerList
+            saveStorage()
+        }
+        return result
+    }
+
+    fun addCarbs(carbsDto: PumpDbEntryCarbs) {
+        val result = pumpSync.syncCarbsWithTimestamp(
+            carbsDto.date,
+            carbsDto.carbs,
+            null,
+            carbsDto.pumpType,
+            carbsDto.serialNumber)
+
+        aapsLogger.debug(LTag.PUMP, String.format(Locale.ENGLISH, "syncCarbsWithTimestamp [date=%d, carbs=%.2f, pumpSerial=%s] - Result: %b",
+            carbsDto.date, carbsDto.carbs, carbsDto.serialNumber, result))
+    }
+
+    fun addTemporaryBasalRateWithTempId(temporaryBasal: PumpDbEntryTBR, writeToInternalHistory: Boolean, creator: PumpSyncEntriesCreator): Boolean {
+        val timeNow: Long = System.currentTimeMillis()
+        val temporaryId = creator.generateTempId(timeNow)
+
+        val response = pumpSync.addTemporaryBasalWithTempId(
+            timeNow,
+            temporaryBasal.rate,
+            (temporaryBasal.durationInSeconds * 1000L),
+            temporaryBasal.isAbsolute,
+            temporaryId,
+            temporaryBasal.tbrType,
+            creator.model(),
+            creator.serialNumber())
+
+        if (response && writeToInternalHistory) {
+            val innerList: MutableList<PumpDbEntry> = pumpSyncStorage[TBR]!!
+
+            innerList.add(PumpDbEntry(temporaryId, timeNow, creator.model(), creator.serialNumber(), null, temporaryBasal))
+            pumpSyncStorage[BOLUS] = innerList
+            saveStorage()
+        }
+
+        return response
+    }
+
+    fun removeBolusWithTemporaryId(temporaryId: Long) {
+        val bolusList = removeTemporaryId(temporaryId, pumpSyncStorage[BOLUS]!!)
+        pumpSyncStorage[BOLUS] = bolusList
+        saveStorage()
+    }
+
+    fun removeTemporaryBasalWithTemporaryId(temporaryId: Long) {
+        val tbrList = removeTemporaryId(temporaryId, pumpSyncStorage[TBR]!!)
+        pumpSyncStorage[TBR] = tbrList
+        saveStorage()
+    }
+
+    private fun removeTemporaryId(temporaryId: Long, list: MutableList<PumpDbEntry>): MutableList<PumpDbEntry> {
+        var dbEntry: PumpDbEntry? = null
+
+        for (pumpDbEntry in list) {
+            if (pumpDbEntry.temporaryId == temporaryId) {
+                dbEntry = pumpDbEntry
+            }
+        }
+
+        if (dbEntry != null) {
+            list.remove(dbEntry)
+        }
+
+        return list
+    }
+
+}
\ No newline at end of file
diff --git a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/utils/ByteUtil.java b/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/utils/ByteUtil.java
similarity index 83%
rename from rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/utils/ByteUtil.java
rename to pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/utils/ByteUtil.java
index 6273ff5203..ac4f6d24af 100644
--- a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/utils/ByteUtil.java
+++ b/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/utils/ByteUtil.java
@@ -29,9 +29,13 @@ public class ByteUtil {
         return (b < 0) ? b + 256 : b;
     }
 
+    public static int asUINT8(Integer b) {
+        return (b < 0) ? b + 256 : b;
+    }
+
     public static byte[] getBytesFromInt16(int value) {
         byte[] array = getBytesFromInt(value);
-        return new byte[] {array[2], array[3]};
+        return new byte[]{array[2], array[3]};
     }
 
     public static byte[] getBytesFromInt(int value) {
@@ -182,22 +186,6 @@ public class ByteUtil {
     }
 
 
-    // public static byte[] fromByteList(List<Byte> byteArray) {
-    // byte[] rval = new byte[byteArray.size()];
-    // for (int i = 0; i < byteArray.size(); i++) {
-    // rval[i] = byteArray.get(i);
-    // }
-    // return rval;
-    // }
-
-    // public static List<Byte> toByteList(byte[] data) {
-    // ArrayList<Byte> rval = new ArrayList<>(data.length);
-    // for (int i = 0; i < data.length; i++) {
-    // rval.add(i, new Byte(data[i]));
-    // }
-    // return rval;
-    // }
-
     public static List<Byte> getListFromByteArray(byte[] array) {
         List<Byte> listOut = new ArrayList<Byte>();
 
@@ -283,15 +271,62 @@ public class ByteUtil {
     }
 
 
+    /**
+     * Converts 4 (or less) ints into int. (Shorts are objects, so you can send null if you have less parameters)
+     *
+     * @param b1   short 1
+     * @param b2   short 2
+     * @param b3   short 3
+     * @param b4   short 4
+     * @param flag Conversion Flag (Big Endian, Little endian)
+     * @return int value
+     */
+    public static int toInt(Byte b1, Byte b2, Byte b3, Byte b4, BitConversion flag) {
+        switch (flag) {
+            case LITTLE_ENDIAN: {
+                if (b4 != null) {
+                    return (b4 & 0xff) << 24 | (b3 & 0xff) << 16 | (b2 & 0xff) << 8 | b1 & 0xff;
+                } else if (b3 != null) {
+                    return (b3 & 0xff) << 16 | (b2 & 0xff) << 8 | b1 & 0xff;
+                } else if (b2 != null) {
+                    return (b2 & 0xff) << 8 | b1 & 0xff;
+                } else {
+                    return b1 & 0xff;
+                }
+            }
+
+            default:
+            case BIG_ENDIAN: {
+                if (b4 != null) {
+                    return (b1 & 0xff) << 24 | (b2 & 0xff) << 16 | (b3 & 0xff) << 8 | b4 & 0xff;
+                } else if (b3 != null) {
+                    return (b1 & 0xff) << 16 | (b2 & 0xff) << 8 | b3 & 0xff;
+                } else if (b2 != null) {
+                    return (b1 & 0xff) << 8 | b2 & 0xff;
+                } else {
+                    return b1 & 0xff;
+                }
+            }
+        }
+    }
+
+
     public static int toInt(int b1, int b2) {
         return toInt(b1, b2, null, null, BitConversion.BIG_ENDIAN);
     }
 
+    public static int toInt(Byte b1, Byte b2) {
+        return toInt(b1, b2, null, null, BitConversion.BIG_ENDIAN);
+    }
+
 
     public static int toInt(int b1, int b2, int b3) {
         return toInt(b1, b2, b3, null, BitConversion.BIG_ENDIAN);
     }
 
+    public static int toInt(Byte b1, Byte b2, Byte b3) {
+        return toInt(b1, b2, b3, null, BitConversion.BIG_ENDIAN);
+    }
 
     public static int toInt(int b1, int b2, BitConversion flag) {
         return toInt(b1, b2, null, null, flag);
@@ -329,6 +364,25 @@ public class ByteUtil {
     }
 
 
+    public static String getCorrectHexValue(byte inp) {
+        String hx = Integer.toHexString((char) inp);
+
+        if (hx.length() == 0)
+            return "00";
+        else if (hx.length() == 1)
+            return "0" + hx;
+        else if (hx.length() == 2)
+            return hx;
+        else if (hx.length() == 4)
+            return hx.substring(2);
+        else {
+            System.out.println("Hex Error: " + inp);
+        }
+
+        return null;
+    }
+
+
     public static String getHex(byte[] abyte0) {
         return abyte0 != null ? getHex(abyte0, abyte0.length) : null;
     }
diff --git a/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/utils/ProfileUtil.kt b/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/utils/ProfileUtil.kt
new file mode 100644
index 0000000000..8997e02482
--- /dev/null
+++ b/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/utils/ProfileUtil.kt
@@ -0,0 +1,79 @@
+package info.nightscout.androidaps.plugins.pump.common.utils
+
+import info.nightscout.androidaps.interfaces.Profile
+import info.nightscout.androidaps.interfaces.Profile.ProfileValue
+import info.nightscout.androidaps.plugins.pump.common.defs.PumpType
+import java.util.*
+
+object ProfileUtil {
+
+    fun getProfileDisplayable(profile: Profile, pumpType: PumpType): String {
+        val stringBuilder = StringBuilder()
+        for (basalValue in profile.getBasalValues()) {
+            val basalValueValue = pumpType.determineCorrectBasalSize(basalValue.value)
+            val hour = basalValue.timeAsSeconds / (60 * 60)
+            stringBuilder.append((if (hour < 10) "0" else "") + hour + ":00")
+            stringBuilder.append(String.format(Locale.ENGLISH, "%.3f", basalValueValue))
+            stringBuilder.append(", ")
+        }
+        return if (stringBuilder.length > 3) stringBuilder.substring(0, stringBuilder.length - 2) else stringBuilder.toString()
+    }
+
+    fun getBasalProfilesDisplayable(profiles: Array<ProfileValue>, pumpType: PumpType): String {
+        val stringBuilder = StringBuilder()
+        for (basalValue in profiles) {
+            val basalValueValue = pumpType.determineCorrectBasalSize(basalValue.value)
+            val hour = basalValue.timeAsSeconds / (60 * 60)
+            stringBuilder.append((if (hour < 10) "0" else "") + hour + ":00")
+            stringBuilder.append(String.format(Locale.ENGLISH, "%.3f", basalValueValue))
+            stringBuilder.append(", ")
+        }
+        return if (stringBuilder.length > 3) stringBuilder.substring(0, stringBuilder.length - 2) else stringBuilder.toString()
+    }
+
+    fun getBasalProfilesDisplayableAsStringOfArray(profile: Profile, pumpType: PumpType): String? {
+        val stringBuilder = java.lang.StringBuilder()
+        // for (basalValue in profiles) {
+        //     val basalValueValue = pumpType.determineCorrectBasalSize(basalValue.value)
+        //     val hour = basalValue.timeAsSeconds / (60 * 60)
+        //     stringBuilder.append((if (hour < 10) "0" else "") + hour + ":00")
+        //     stringBuilder.append(String.format(Locale.ENGLISH, "%.3f", basalValueValue))
+        //     stringBuilder.append(", ")
+        // }
+        // return if (stringBuilder.length > 3) stringBuilder.substring(0, stringBuilder.length - 2) else stringBuilder.toString()
+
+        var entriesCopy = profile.getBasalValues()
+
+        for (i in entriesCopy.indices) {
+            val current = entriesCopy[i]
+            // var currentTime = if (current.startTime_raw % 2 == 0) current.startTime_raw.toInt() else current.startTime_raw - 1
+            // currentTime = currentTime * 30 / 60
+            val currentTime = current.timeAsSeconds / (60 * 60)
+
+            var lastHour: Int
+            lastHour = if (i + 1 == entriesCopy.size) {
+                24
+            } else {
+                val basalProfileEntry = entriesCopy[i + 1]
+                //val rawTime = if (basalProfileEntry.startTime_raw % 2 == 0) basalProfileEntry.startTime_raw.toInt() else basalProfileEntry.startTime_raw - 1
+                //rawTime * 30 / 60
+                basalProfileEntry.timeAsSeconds / (60 * 60)
+            }
+
+            // System.out.println("Current time: " + currentTime + " Next Time: " + lastHour);
+            for (j in currentTime until lastHour) {
+                // if (pumpType == null)
+                //     basalByHour[j] = current.rate
+                // else
+                //basalByHour[j] = pumpType.determineCorrectBasalSize(current.value)
+
+                stringBuilder.append(String.format(Locale.ENGLISH, "%.3f", pumpType.determineCorrectBasalSize(current.value)))
+                stringBuilder.append(" ")
+            }
+        }
+
+        return stringBuilder.toString().trim()
+
+    }
+
+}
\ No newline at end of file
diff --git a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/utils/StringUtil.java b/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/utils/StringUtil.java
similarity index 100%
rename from rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/utils/StringUtil.java
rename to pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/utils/StringUtil.java
diff --git a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/utils/ThreadUtil.java b/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/utils/ThreadUtil.java
similarity index 100%
rename from rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/utils/ThreadUtil.java
rename to pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/utils/ThreadUtil.java
diff --git a/pump-common/src/main/res/values/strings.xml b/pump-common/src/main/res/values/strings.xml
new file mode 100644
index 0000000000..cdbe2ba8bf
--- /dev/null
+++ b/pump-common/src/main/res/values/strings.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <!-- PumoCommon - Pump Abstract -->
+    <string name="pump_operation_not_supported_by_pump_driver">Operation not supported by pump and/or driver.</string>
+    <string name="pump_operation_not_yet_supported_by_pump">Operation not YET supported by pump.</string>
+    <string name="common_resultok">OK</string>
+
+    <!-- PumoCommon - Pump Status -->
+    <string name="pump_status_never_contacted">Never contacted</string>
+    <string name="pump_status_waking_up">Waking up</string>
+    <string name="pump_status_error_comm">Error with communication</string>
+    <string name="pump_status_timeout_comm">Timeout on communication</string>
+    <string name="pump_status_pump_unreachable">Pump unreachable</string>
+    <string name="pump_status_invalid_config">Invalid configuration</string>
+    <string name="pump_status_active">Active</string>
+    <string name="pump_status_sleeping">Sleeping</string>
+
+    <!-- PumpCommon - History Group -->
+    <string name="history_group_basal">Basals</string>
+    <string name="history_group_configuration">Configurations</string>
+    <string name="history_group_notification">Notifications</string>
+    <string name="history_group_statistic">Statistics</string>
+    <string name="history_group_unknown">Unknowns</string>
+    <string name="history_group_all">All</string>
+    <string name="history_group_bolus">Boluses</string>
+    <string name="history_group_prime">Prime</string>
+    <string name="history_group_alarm">Alarms</string>
+    <string name="history_group_glucose">Glucose</string>
+
+
+</resources>
\ No newline at end of file
diff --git a/rileylink/build.gradle b/rileylink/build.gradle
index 1cae2aa0f9..3ea01781f9 100644
--- a/rileylink/build.gradle
+++ b/rileylink/build.gradle
@@ -1,19 +1,15 @@
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-kapt'
+apply plugin: 'kotlin-allopen'
 apply plugin: 'com.hiya.jacoco-android'
 
 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"
-
-android {
-    defaultConfig {
-        versionCode 1
-        versionName "1.0"
-    }
-}
+apply from: "${project.rootDir}/gradle/jacoco_global.gradle"
 
 dependencies {
     implementation project(':core')
+    implementation project(':pump-common')
 }
diff --git a/rileylink/src/main/AndroidManifest.xml b/rileylink/src/main/AndroidManifest.xml
index 3236de84bd..79aa441d6a 100644
--- a/rileylink/src/main/AndroidManifest.xml
+++ b/rileylink/src/main/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="info.nightscout.androidaps.plugins.pump.common">
+    package="info.nightscout.androidaps.plugins.pump.common.hw.rileylink">
 
     <uses-permission android:name="android.permission.BLUETOOTH" />
     <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
@@ -8,7 +8,7 @@
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
 
     <application>
-        <activity android:name=".dialog.RileyLinkBLEConfigActivity">
+        <activity android:name="info.nightscout.androidaps.plugins.pump.common.dialog.RileyLinkBLEConfigActivity">
             <intent-filter>
                 <action android:name="info.nightscout.androidaps.plugins.PumpCommon.dialog.RileyLinkBLEConfigActivity" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -16,7 +16,7 @@
         </activity>
 
         <activity
-            android:name=".hw.rileylink.dialog.RileyLinkStatusActivity"
+            android:name="info.nightscout.androidaps.plugins.pump.common.hw.rileylink.dialog.RileyLinkStatusActivity"
             android:label="@string/title_activity_rileylink_settings"
             android:theme="@style/Theme.AppCompat.NoTitle" />
     </application>
diff --git a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/PumpHistoryEntryGroup.java b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/PumpHistoryEntryGroup.java
deleted file mode 100644
index 70a484d5d6..0000000000
--- a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/PumpHistoryEntryGroup.java
+++ /dev/null
@@ -1,66 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.common.defs;
-
-import java.util.ArrayList;
-import java.util.List;
-
-
-import info.nightscout.androidaps.core.R;
-import info.nightscout.androidaps.utils.resources.ResourceHelper;
-
-
-/**
- * This file was taken from GGC - GNU Gluco Control (ggc.sourceforge.net), application for diabetes
- * management and modified/extended for AAPS.
- * <p>
- * Author: Andy {andy.rozman@gmail.com}
- */
-
-public enum PumpHistoryEntryGroup {
-
-    All(R.string.history_group_all),
-    Bolus(R.string.history_group_bolus),
-    Basal(R.string.history_group_basal),
-    Prime(R.string.history_group_prime),
-    Configuration(R.string.history_group_configuration),
-    Alarm(R.string.history_group_alarm),
-    Glucose(R.string.history_group_glucose),
-    Notification(R.string.history_group_notification),
-    Statistic(R.string.history_group_statistic),
-    Unknown(R.string.history_group_unknown),
-    ;
-
-    private final int resourceId;
-    private String translated;
-
-    private static List<PumpHistoryEntryGroup> translatedList;
-
-    PumpHistoryEntryGroup(int resourceId) {
-        this.resourceId = resourceId;
-    }
-
-    private static void doTranslation(ResourceHelper resourceHelper) {
-        translatedList = new ArrayList<>();
-
-        for (PumpHistoryEntryGroup pumpHistoryEntryGroup : values()) {
-            pumpHistoryEntryGroup.translated = resourceHelper.gs(pumpHistoryEntryGroup.resourceId);
-            translatedList.add(pumpHistoryEntryGroup);
-        }
-    }
-
-    public static List<PumpHistoryEntryGroup> getTranslatedList(ResourceHelper resourceHelper) {
-        if (translatedList == null) doTranslation(resourceHelper);
-        return translatedList;
-    }
-
-    public int getResourceId() {
-        return resourceId;
-    }
-
-    public String getTranslated() {
-        return translated;
-    }
-
-    public String toString() {
-        return this.translated;
-    }
-}
diff --git a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/dialog/RileyLinkBLEConfigActivity.java b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/dialog/RileyLinkBLEConfigActivity.java
index 3f2482c2cc..227b642d8c 100644
--- a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/dialog/RileyLinkBLEConfigActivity.java
+++ b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/dialog/RileyLinkBLEConfigActivity.java
@@ -35,8 +35,8 @@ import info.nightscout.androidaps.activities.NoSplashAppCompatActivity;
 import info.nightscout.androidaps.interfaces.ActivePlugin;
 import info.nightscout.androidaps.logging.AAPSLogger;
 import info.nightscout.androidaps.logging.LTag;
-import info.nightscout.androidaps.plugins.pump.common.R;
 import info.nightscout.androidaps.plugins.pump.common.ble.BlePreCheck;
+import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.R;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkConst;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkUtil;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.data.GattAttributes;
diff --git a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/RileyLinkConst.java b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/RileyLinkConst.java
index 28ae37f8f5..e738e49b7c 100644
--- a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/RileyLinkConst.java
+++ b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/RileyLinkConst.java
@@ -1,8 +1,6 @@
 package info.nightscout.androidaps.plugins.pump.common.hw.rileylink;
 
 
-import info.nightscout.androidaps.plugins.pump.common.R;
-
 /**
  * Created by andy on 16/05/2018.
  */
diff --git a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/RFSpy.java b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/RFSpy.java
index 9d8c976363..a360c13d23 100644
--- a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/RFSpy.java
+++ b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/RFSpy.java
@@ -16,7 +16,7 @@ import info.nightscout.androidaps.events.EventRefreshOverview;
 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.common.R;
+import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.R;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkConst;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkUtil;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.command.RileyLinkCommand;
diff --git a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/defs/RileyLinkEncodingType.java b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/defs/RileyLinkEncodingType.java
index 663ed099e5..64d6950020 100644
--- a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/defs/RileyLinkEncodingType.java
+++ b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/defs/RileyLinkEncodingType.java
@@ -3,7 +3,7 @@ package info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.defs;
 import java.util.HashMap;
 import java.util.Map;
 
-import info.nightscout.androidaps.plugins.pump.common.R;
+import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.R;
 import info.nightscout.androidaps.utils.resources.ResourceHelper;
 
 public enum RileyLinkEncodingType {
@@ -21,11 +21,11 @@ public enum RileyLinkEncodingType {
     private static Map<String, RileyLinkEncodingType> encodingTypeMap;
 
     RileyLinkEncodingType(int value) {
-        this.value = (byte)value;
+        this.value = (byte) value;
     }
 
     RileyLinkEncodingType(int value, Integer resourceId) {
-        this.value = (byte)value;
+        this.value = (byte) value;
         this.resourceId = resourceId;
     }
 
@@ -33,7 +33,7 @@ public enum RileyLinkEncodingType {
         encodingTypeMap = new HashMap<>();
 
         for (RileyLinkEncodingType encType : values()) {
-            if (encType.resourceId!=null) {
+            if (encType.resourceId != null) {
                 encodingTypeMap.put(resourceHelper.gs(encType.resourceId), encType);
             }
         }
diff --git a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/defs/RileyLinkError.java b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/defs/RileyLinkError.java
index 0334c8d54e..0a72d9a512 100644
--- a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/defs/RileyLinkError.java
+++ b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/defs/RileyLinkError.java
@@ -1,7 +1,7 @@
 package info.nightscout.androidaps.plugins.pump.common.hw.rileylink.defs;
 
 
-import info.nightscout.androidaps.plugins.pump.common.R;
+import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.R;
 
 /**
  * Created by andy on 14/05/2018.
@@ -43,8 +43,8 @@ public enum RileyLinkError {
         if (this.resourceIdPod != null) {
 
             return targetDevice == RileyLinkTargetDevice.MedtronicPump ? //
-            this.resourceId
-                : this.resourceIdPod;
+                    this.resourceId
+                    : this.resourceIdPod;
         } else {
             return this.resourceId;
         }
diff --git a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/defs/RileyLinkServiceState.java b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/defs/RileyLinkServiceState.java
index 97ce0c6ce1..3a6bee96b6 100644
--- a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/defs/RileyLinkServiceState.java
+++ b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/defs/RileyLinkServiceState.java
@@ -1,7 +1,7 @@
 package info.nightscout.androidaps.plugins.pump.common.hw.rileylink.defs;
 
 
-import info.nightscout.androidaps.plugins.pump.common.R;
+import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.R;
 
 /**
  * Created by andy on 14/05/2018.
@@ -13,21 +13,21 @@ public enum RileyLinkServiceState {
 
     // Bluetooth
     BluetoothInitializing(R.string.rileylink_state_bt_init), // (S) init BT (if error no BT interface -> Disabled, BT
-                                                             // not enabled -> BluetoothError)
+    // not enabled -> BluetoothError)
     // BluetoothNotAvailable, // (E) BT not available, would happen only if device has no BT
     BluetoothError(R.string.rileylink_state_bt_error), // (E) if BT gets disabled ( -> EnableBluetooth)
     BluetoothReady(R.string.rileylink_state_bt_ready), // (OK)
 
     // RileyLink
     RileyLinkInitializing(R.string.rileylink_state_rl_init), // (S) start Gatt discovery (OK -> RileyLinkReady, Error ->
-                                                             // BluetoothEnabled) ??
+    // BluetoothEnabled) ??
     RileyLinkError(R.string.rileylink_state_rl_error), // (E)
     RileyLinkReady(R.string.rileylink_state_rl_ready), // (OK) if tunning was already done we go to PumpConnectorReady
 
     // Tunning
     TuneUpDevice(R.string.rileylink_state_pc_tune_up), // (S)
     PumpConnectorError(R.string.rileylink_state_pc_error), // either TuneUp Error or pump couldn't not be contacted
-                                                           // error
+    // error
     PumpConnectorReady(R.string.rileylink_state_connected), // (OK) RileyLink Ready for Pump Communication
 
     // Initializing, // get all parameters required for connection (if not possible -> Disabled, if sucessful ->
@@ -58,17 +58,17 @@ public enum RileyLinkServiceState {
 
     public boolean isConnecting() {
         return (this == RileyLinkServiceState.BluetoothInitializing || //
-            // this == RileyLinkServiceState.BluetoothError || //
-            this == RileyLinkServiceState.BluetoothReady || //
-            this == RileyLinkServiceState.RileyLinkInitializing || //
-        this == RileyLinkReady
-        // this == RileyLinkServiceState.RileyLinkBLEError
+                // this == RileyLinkServiceState.BluetoothError || //
+                this == RileyLinkServiceState.BluetoothReady || //
+                this == RileyLinkServiceState.RileyLinkInitializing || //
+                this == RileyLinkReady
+                // this == RileyLinkServiceState.RileyLinkBLEError
         );
     }
 
     public boolean isError() {
         return (this == RileyLinkServiceState.BluetoothError || //
-        // this == RileyLinkServiceState.PumpConnectorError || //
-        this == RileyLinkServiceState.RileyLinkError);
+                // this == RileyLinkServiceState.PumpConnectorError || //
+                this == RileyLinkServiceState.RileyLinkError);
     }
 }
diff --git a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/defs/RileyLinkTargetDevice.java b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/defs/RileyLinkTargetDevice.java
index 1e560d0801..aff01e36a0 100644
--- a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/defs/RileyLinkTargetDevice.java
+++ b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/defs/RileyLinkTargetDevice.java
@@ -1,7 +1,7 @@
 package info.nightscout.androidaps.plugins.pump.common.hw.rileylink.defs;
 
 
-import info.nightscout.androidaps.plugins.pump.common.R;
+import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.R;
 
 /**
  * Created by andy on 5/19/18.
diff --git a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/dialog/RileyLinkStatusActivity.java b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/dialog/RileyLinkStatusActivity.java
index 882f7a84ca..beff5bb026 100644
--- a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/dialog/RileyLinkStatusActivity.java
+++ b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/dialog/RileyLinkStatusActivity.java
@@ -2,6 +2,7 @@ package info.nightscout.androidaps.plugins.pump.common.hw.rileylink.dialog;
 
 import android.os.Bundle;
 
+import androidx.annotation.NonNull;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 import androidx.fragment.app.FragmentPagerAdapter;
@@ -10,16 +11,14 @@ import androidx.viewpager.widget.ViewPager;
 import com.google.android.material.floatingactionbutton.FloatingActionButton;
 import com.google.android.material.tabs.TabLayout;
 
-import androidx.annotation.NonNull;
-
 import java.util.ArrayList;
 import java.util.List;
 
 import javax.inject.Inject;
 
 import info.nightscout.androidaps.activities.NoSplashAppCompatActivity;
-import info.nightscout.androidaps.plugins.pump.common.R;
 import info.nightscout.androidaps.plugins.pump.common.dialog.RefreshableInterface;
+import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.R;
 import info.nightscout.androidaps.utils.resources.ResourceHelper;
 
 public class RileyLinkStatusActivity extends NoSplashAppCompatActivity {
diff --git a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/dialog/RileyLinkStatusDevice.java b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/dialog/RileyLinkStatusDevice.java
index 3faff82981..8bc967bd9f 100644
--- a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/dialog/RileyLinkStatusDevice.java
+++ b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/dialog/RileyLinkStatusDevice.java
@@ -15,14 +15,11 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-import info.nightscout.androidaps.plugins.pump.common.R;
 import info.nightscout.androidaps.plugins.pump.common.dialog.RefreshableInterface;
+import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.R;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.data.CommandValueDefinition;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.defs.CommandValueDefinitionType;
-//import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.data.CommandValueDefinition;
-//import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.data.RLHistoryItem;
-//import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.defs.CommandValueDefinitionType;
-//import info.nightscout.androidaps.plugins.pump.common.utils.StringUtil;
+
 
 /**
  * Created by andy on 5/19/18.
@@ -140,7 +137,7 @@ public class RileyLinkStatusDevice extends Fragment implements RefreshableInterf
                 viewHolder.itemValue = view.findViewById(R.id.rileylink_device_action);
                 view.setTag(viewHolder);
             } else {
-                viewHolder = (RileyLinkStatusDevice.ViewHolder)view.getTag();
+                viewHolder = (RileyLinkStatusDevice.ViewHolder) view.getTag();
             }
             // Z
             // RLHistoryItem item = historyItemList.get(i);
diff --git a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/dialog/RileyLinkStatusGeneralFragment.java b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/dialog/RileyLinkStatusGeneralFragment.java
index 2ae48e3f5a..7ab6625951 100644
--- a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/dialog/RileyLinkStatusGeneralFragment.java
+++ b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/dialog/RileyLinkStatusGeneralFragment.java
@@ -15,8 +15,8 @@ import javax.inject.Inject;
 import dagger.android.support.DaggerFragment;
 import info.nightscout.androidaps.interfaces.ActivePlugin;
 import info.nightscout.androidaps.logging.AAPSLogger;
-import info.nightscout.androidaps.plugins.pump.common.R;
 import info.nightscout.androidaps.plugins.pump.common.dialog.RefreshableInterface;
+import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.R;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.defs.RileyLinkError;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.defs.RileyLinkPumpDevice;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.defs.RileyLinkPumpInfo;
diff --git a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/dialog/RileyLinkStatusHistoryFragment.java b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/dialog/RileyLinkStatusHistoryFragment.java
index 452c99f905..7ae38c4d58 100644
--- a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/dialog/RileyLinkStatusHistoryFragment.java
+++ b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/dialog/RileyLinkStatusHistoryFragment.java
@@ -6,11 +6,10 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
 
+import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
-import androidx.annotation.NonNull;
-
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -18,9 +17,9 @@ import java.util.List;
 import javax.inject.Inject;
 
 import dagger.android.support.DaggerFragment;
-import info.nightscout.androidaps.plugins.pump.common.R;
 import info.nightscout.androidaps.plugins.pump.common.defs.PumpDeviceState;
 import info.nightscout.androidaps.plugins.pump.common.dialog.RefreshableInterface;
+import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.R;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkUtil;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.data.RLHistoryItem;
 import info.nightscout.androidaps.utils.DateUtil;
diff --git a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/utils/ProfileUtil.java b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/utils/ProfileUtil.java
deleted file mode 100644
index badd401083..0000000000
--- a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/utils/ProfileUtil.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.common.utils;
-
-import java.util.Locale;
-
-import info.nightscout.androidaps.interfaces.Profile;
-import info.nightscout.androidaps.plugins.pump.common.defs.PumpType;
-
-public class ProfileUtil {
-
-
-    public static String getProfileDisplayable(Profile profile, PumpType pumpType) {
-
-        StringBuilder stringBuilder = new StringBuilder();
-
-        for (Profile.ProfileValue basalValue : profile.getBasalValues()) {
-
-            double basalValueValue = pumpType.determineCorrectBasalSize(basalValue.getValue());
-
-            int hour = basalValue.getTimeAsSeconds() / (60 * 60);
-
-            stringBuilder.append((hour < 10 ? "0" : "") + hour + ":00");
-
-            stringBuilder.append(String.format(Locale.ENGLISH, "%.3f", basalValueValue));
-            stringBuilder.append(", ");
-        }
-        if (stringBuilder.length() > 3)
-            return stringBuilder.substring(0, stringBuilder.length() - 2);
-        else
-            return stringBuilder.toString();
-    }
-
-    public static String getBasalProfilesDisplayable(Profile.ProfileValue[] profiles, PumpType pumpType) {
-
-        StringBuilder stringBuilder = new StringBuilder();
-
-        for (Profile.ProfileValue basalValue : profiles) {
-
-            double basalValueValue = pumpType.determineCorrectBasalSize(basalValue.getValue());
-
-            int hour = basalValue.getTimeAsSeconds() / (60 * 60);
-
-            stringBuilder.append((hour < 10 ? "0" : "") + hour + ":00");
-
-            stringBuilder.append(String.format(Locale.ENGLISH, "%.3f", basalValueValue));
-            stringBuilder.append(", ");
-        }
-        if (stringBuilder.length() > 3)
-            return stringBuilder.substring(0, stringBuilder.length() - 2);
-        else
-            return stringBuilder.toString();
-    }
-
-
-}
diff --git a/rileylink/src/main/res/layout/rileylink_status_device.xml b/rileylink/src/main/res/layout/rileylink_status_device.xml
index edf3cbdd7e..f56c4b0d6d 100644
--- a/rileylink/src/main/res/layout/rileylink_status_device.xml
+++ b/rileylink/src/main/res/layout/rileylink_status_device.xml
@@ -2,7 +2,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".plugins.pump.common.hw.rileylink.dialog.RileyLinkStatusDevice">
+    tools:context=".plugins.pump.medtronic.dialog.RileyLinkStatusDevice">
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/rileylink/src/main/res/values-cs-rCZ/strings.xml b/rileylink/src/main/res/values-cs-rCZ/strings.xml
index 4b123f2e4a..ca7b132918 100644
--- a/rileylink/src/main/res/values-cs-rCZ/strings.xml
+++ b/rileylink/src/main/res/values-cs-rCZ/strings.xml
@@ -64,6 +64,7 @@
     <string name="riley_link_common_yes">Ano</string>
     <string name="riley_link_common_no">Ne</string>
     <!-- RileyLink - Preferences -->
+    <string name="riley_link_show_battery_level">Zobrazit úroveň baterie reportovanou OrangeLinkem/EmaLinkem/DiaLinkem</string>
     <string name="riley_link_show_battery_level_summary">NEPRACUJE s původním RileyLinkem. Nemusí pracovat s jinými alternativami RileyLinky.</string>
     <plurals name="duration_days">
         <item quantity="one">%1$d den</item>
diff --git a/rileylink/src/main/res/values-de-rDE/strings.xml b/rileylink/src/main/res/values-de-rDE/strings.xml
index afba01e438..346ab98f0f 100644
--- a/rileylink/src/main/res/values-de-rDE/strings.xml
+++ b/rileylink/src/main/res/values-de-rDE/strings.xml
@@ -64,6 +64,7 @@
     <string name="riley_link_common_yes">Ja</string>
     <string name="riley_link_common_no">Nein</string>
     <!-- RileyLink - Preferences -->
+    <string name="riley_link_show_battery_level">Akkustand von OrangeLink/EmaLink/DiaLink anzeigen</string>
     <string name="riley_link_show_battery_level_summary">FUNKTIONIERT NICHT mit dem original RileyLink. Funktioniert vielleicht nicht mit anderen RileyLink Alternativen.</string>
     <plurals name="duration_days">
         <item quantity="one">%1$d Tag</item>
diff --git a/rileylink/src/main/res/values-fr-rFR/strings.xml b/rileylink/src/main/res/values-fr-rFR/strings.xml
index a3e540fcd4..a84d83db47 100644
--- a/rileylink/src/main/res/values-fr-rFR/strings.xml
+++ b/rileylink/src/main/res/values-fr-rFR/strings.xml
@@ -64,6 +64,7 @@
     <string name="riley_link_common_yes">Oui</string>
     <string name="riley_link_common_no">Non</string>
     <!-- RileyLink - Preferences -->
+    <string name="riley_link_show_battery_level">Afficher le niveau de batterie transmis par OrangeLink/EmaLink/DiaLink</string>
     <string name="riley_link_show_battery_level_summary">NE FONCTIONNE PAS avec le RileyLink original. Peut ne pas fonctionner avec d\'autres versions de RileyLink.</string>
     <plurals name="duration_days">
         <item quantity="one">%1$d jour</item>
diff --git a/rileylink/src/main/res/values-it-rIT/strings.xml b/rileylink/src/main/res/values-it-rIT/strings.xml
index 6834a842e1..cdce27e5aa 100644
--- a/rileylink/src/main/res/values-it-rIT/strings.xml
+++ b/rileylink/src/main/res/values-it-rIT/strings.xml
@@ -64,6 +64,7 @@
     <string name="riley_link_common_yes">Sì</string>
     <string name="riley_link_common_no">No</string>
     <!-- RileyLink - Preferences -->
+    <string name="riley_link_show_battery_level">Mostra livello batteria riportato da OrangeLink/EmaLink/DiaLink</string>
     <string name="riley_link_show_battery_level_summary">NON funziona con il RileyLink originale. Potrebbe non funzionare con altre alternative al RileyLink.</string>
     <plurals name="duration_days">
         <item quantity="one">%1$d giorno</item>
diff --git a/rileylink/src/main/res/values-iw-rIL/strings.xml b/rileylink/src/main/res/values-iw-rIL/strings.xml
index 20dafbc9ad..43052404e4 100644
--- a/rileylink/src/main/res/values-iw-rIL/strings.xml
+++ b/rileylink/src/main/res/values-iw-rIL/strings.xml
@@ -64,6 +64,7 @@
     <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</string>
     <string name="riley_link_show_battery_level_summary">לא עובד עם ריילילינק המקורי. עלול שלא לעבוד עם חלופות ריילילינק אחרות.</string>
     <plurals name="duration_days">
         <item quantity="one">%1$d יום</item>
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/rileylink/src/main/res/values-lt-rLT/strings.xml b/rileylink/src/main/res/values-lt-rLT/strings.xml
index 634fc8393c..c269516114 100644
--- a/rileylink/src/main/res/values-lt-rLT/strings.xml
+++ b/rileylink/src/main/res/values-lt-rLT/strings.xml
@@ -22,15 +22,23 @@
     <string name="medtronic_pump_status">Pompos statusas</string>
     <string name="title_activity_rileylink_settings">RileyLink parametrai</string>
     <string name="rileylink_title">RileyLink</string>
+    <string name="rileylink_address">Adresas:</string>
+    <string name="rileylink_name">Vardas:</string>
+    <string name="rileylink_battery_level">Baterijos lygis:</string>
+    <string name="rileylink_battery_level_value">%1$d%%</string>
     <string name="rileylink_connection_status">Ryšio būsena:</string>
     <string name="rileylink_connection_error">Prisijungimo klaida:</string>
     <string name="rileylink_device">Įrenginys</string>
     <string name="rileylink_device_type">Įrenginio tipas:</string>
+    <string name="rileylink_configured_device_model">Nustatytas įrenginio modelis:</string>
+    <string name="rileylink_connected_device_model">Prijungtas įrenginio modelis:</string>
     <string name="rileylink_last_used_frequency">Paskutinis naudotas dažnis:</string>
     <string name="rileylink_last_device_contact">Paskutinis įrenginio kontaktas:</string>
     <string name="rileylink_firmware_version">Programinės įrangos versija:</string>
+    <string name="rileylink_firmware_version_value">BLE113: %1$s\nCC110: %2$s</string>
     <string name="rileylink_pump_serial_number">Pompos serijos Nr:</string>
     <string name="rileylink_pump_frequency">Pompos dažnis:</string>
+    <string name="rileylink_pump_frequency_value">%1$.2f MHz</string>
     <!-- RL State -->
     <string name="rileylink_state_bt_init">Inicijuojamas Bluetooth…</string>
     <string name="rileylink_state_bt_error">Bluetooth klaida</string>
@@ -52,9 +60,12 @@
     <string name="rileylink_error_pod_unreachable">Pod nepasiekiamas</string>
     <!-- RileyLink - Common -->
     <string name="rileylink_target_device_medtronic">Pompa Medtronic</string>
+    <string name="rileylink_target_device_omnipod">Omnipod (Eros)</string>
     <string name="riley_link_common_yes">Taip</string>
     <string name="riley_link_common_no">Ne</string>
     <!-- RileyLink - Preferences -->
+    <string name="riley_link_show_battery_level">Rodyti baterijos įkrovimo lygį, gautą iš OrangeLink/EmaLink/DiaLink</string>
+    <string name="riley_link_show_battery_level_summary">NEVEIKIA su originaliu RileyLink. Gali neveikti su kitomis RileyLink alternatyvomis.</string>
     <plurals name="duration_days">
         <item quantity="one">%1$d d.</item>
         <item quantity="few">%1$d d.</item>
diff --git a/rileylink/src/main/res/values-nl-rNL/strings.xml b/rileylink/src/main/res/values-nl-rNL/strings.xml
index 6a71ab3e3b..1424eb68ec 100644
--- a/rileylink/src/main/res/values-nl-rNL/strings.xml
+++ b/rileylink/src/main/res/values-nl-rNL/strings.xml
@@ -64,6 +64,7 @@
     <string name="riley_link_common_yes">Ja</string>
     <string name="riley_link_common_no">Nee</string>
     <!-- RileyLink - Preferences -->
+    <string name="riley_link_show_battery_level">Toon batterijniveau van OrangeLink/EmaLink</string>
     <string name="riley_link_show_battery_level_summary">Werkt NIET met de originele RileyLink. Werkt mogelijk niet met andere RileyLink-alternatieven.</string>
     <plurals name="duration_days">
         <item quantity="one">%1$d dag</item>
diff --git a/rileylink/src/main/res/values-no-rNO/strings.xml b/rileylink/src/main/res/values-no-rNO/strings.xml
index ab5d3058ae..a9e91e1de2 100644
--- a/rileylink/src/main/res/values-no-rNO/strings.xml
+++ b/rileylink/src/main/res/values-no-rNO/strings.xml
@@ -64,6 +64,7 @@
     <string name="riley_link_common_yes">Ja</string>
     <string name="riley_link_common_no">Nei</string>
     <!-- RileyLink - Preferences -->
+    <string name="riley_link_show_battery_level">Vis batterinivå rapportert av OrangeLink/EmaLink/DiaLink</string>
     <string name="riley_link_show_battery_level_summary">Virker IKKE med RileyLink. Kan hende den ikke fungerer med andre RileyLink alternativer.</string>
     <plurals name="duration_days">
         <item quantity="one">%1$d dag</item>
diff --git a/rileylink/src/main/res/values-sv-rSE/strings.xml b/rileylink/src/main/res/values-sv-rSE/strings.xml
index bb7fd5eddb..4b23d69a3d 100644
--- a/rileylink/src/main/res/values-sv-rSE/strings.xml
+++ b/rileylink/src/main/res/values-sv-rSE/strings.xml
@@ -64,6 +64,7 @@
     <string name="riley_link_common_yes">Ja</string>
     <string name="riley_link_common_no">Nej</string>
     <!-- RileyLink - Preferences -->
+    <string name="riley_link_show_battery_level">Visa batterinivå som rapporteras av OrangeLink/EmaLink</string>
     <string name="riley_link_show_battery_level_summary">Fungerar inte med original Riley Link. Fungerar eventuellt inte med alla motsvarigheter heller.</string>
     <plurals name="duration_days">
         <item quantity="one">%1$d dag</item>
diff --git a/rileylink/src/test/java/info/nightscout/androidaps/TestBase.kt b/rileylink/src/test/java/info/nightscout/androidaps/TestBase.kt
new file mode 100644
index 0000000000..ff88739ba2
--- /dev/null
+++ b/rileylink/src/test/java/info/nightscout/androidaps/TestBase.kt
@@ -0,0 +1,39 @@
+package info.nightscout.androidaps
+
+import info.nightscout.androidaps.logging.AAPSLoggerTest
+import info.nightscout.androidaps.utils.rx.AapsSchedulers
+import info.nightscout.androidaps.utils.rx.TestAapsSchedulers
+import org.junit.Before
+import org.junit.Rule
+import org.mockito.Mockito
+import org.mockito.junit.MockitoJUnit
+import org.mockito.junit.MockitoRule
+import java.util.*
+
+open class TestBase {
+
+    val aapsLogger = AAPSLoggerTest()
+    val aapsSchedulers: AapsSchedulers = TestAapsSchedulers()
+
+    // Add a JUnit rule that will setup the @Mock annotated vars and log.
+    // Another possibility would be to add `MockitoAnnotations.initMocks(this) to the setup method.
+    @get:Rule
+    val mockitoRule: MockitoRule = MockitoJUnit.rule()
+
+    @Before
+    fun setupLocale() {
+        Locale.setDefault(Locale.ENGLISH)
+        System.setProperty("disableFirebase", "true")
+    }
+
+    // Workaround for Kotlin nullability.
+    // https://medium.com/@elye.project/befriending-kotlin-and-mockito-1c2e7b0ef791
+    // https://stackoverflow.com/questions/30305217/is-it-possible-to-use-mockito-in-kotlin
+    fun <T> anyObject(): T {
+        Mockito.any<T>()
+        return uninitialized()
+    }
+
+    @Suppress("Unchecked_Cast")
+    fun <T> uninitialized(): T = null as T
+}
\ No newline at end of file
diff --git a/rileylink/src/test/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/RFSpyTest.java b/rileylink/src/test/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/RFSpyTest.java
deleted file mode 100644
index 8afff65fa4..0000000000
--- a/rileylink/src/test/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/RFSpyTest.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.nightscout.androidaps.logging.AAPSLogger;
-import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.defs.RileyLinkFirmwareVersion;
-
-import static org.junit.Assert.assertEquals;
-
-@RunWith(PowerMockRunner.class)
-public class RFSpyTest {
-    @Mock
-    private AAPSLogger aapsLogger;
-
-    @Test
-    public void testGetFirmwareVersion() {
-        assertEquals(RileyLinkFirmwareVersion.Version_1_0, RFSpy.getFirmwareVersion(aapsLogger, "", "subg_rfspy 1.0"));
-        assertEquals(RileyLinkFirmwareVersion.Version_1_x, RFSpy.getFirmwareVersion(aapsLogger, "", "subg_rfspy 1.1"));
-        assertEquals(RileyLinkFirmwareVersion.Version_1_x, RFSpy.getFirmwareVersion(aapsLogger, "", "subg_rfspy 1.1.13"));
-
-        assertEquals(RileyLinkFirmwareVersion.Version_2_0, RFSpy.getFirmwareVersion(aapsLogger, "", "subg_rfspy 2.0"));
-        assertEquals(RileyLinkFirmwareVersion.Version_2_0, RFSpy.getFirmwareVersion(aapsLogger, "", "subg_rfspy 2.0.1"));
-        assertEquals(RileyLinkFirmwareVersion.Version_2_2, RFSpy.getFirmwareVersion(aapsLogger, "", "subg_rfspy 2.2"));
-        assertEquals(RileyLinkFirmwareVersion.Version_2_2, RFSpy.getFirmwareVersion(aapsLogger, "", "subg_rfspy 2.2.16"));
-        assertEquals(RileyLinkFirmwareVersion.Version_2_2, RFSpy.getFirmwareVersion(aapsLogger, "", "subg_rfspy 2.2.17"));
-        assertEquals(RileyLinkFirmwareVersion.Version_2_x, RFSpy.getFirmwareVersion(aapsLogger, "", "subg_rfspy 2.3"));
-        assertEquals(RileyLinkFirmwareVersion.Version_2_x, RFSpy.getFirmwareVersion(aapsLogger, "", "subg_rfspy 2.3.0"));
-        assertEquals(RileyLinkFirmwareVersion.Version_2_x, RFSpy.getFirmwareVersion(aapsLogger, "", "subg_rfspy 2.3.17"));
-
-        assertEquals(RileyLinkFirmwareVersion.Version_3_x, RFSpy.getFirmwareVersion(aapsLogger, "", "subg_rfspy 3.0"));
-        assertEquals(RileyLinkFirmwareVersion.Version_3_x, RFSpy.getFirmwareVersion(aapsLogger, "", "subg_rfspy 3.0.1"));
-        assertEquals(RileyLinkFirmwareVersion.Version_3_x, RFSpy.getFirmwareVersion(aapsLogger, "", "subg_rfspy 3.1"));
-        assertEquals(RileyLinkFirmwareVersion.Version_3_x, RFSpy.getFirmwareVersion(aapsLogger, "", "subg_rfspy 3.1.13"));
-
-        assertEquals(RileyLinkFirmwareVersion.Version_4_x, RFSpy.getFirmwareVersion(aapsLogger, "", "subg_rfspy 4.0"));
-        assertEquals(RileyLinkFirmwareVersion.Version_4_x, RFSpy.getFirmwareVersion(aapsLogger, "", "subg_rfspy 4.0.4"));
-        assertEquals(RileyLinkFirmwareVersion.Version_4_x, RFSpy.getFirmwareVersion(aapsLogger, "", "subg_rfspy 4.3"));
-        assertEquals(RileyLinkFirmwareVersion.Version_4_x, RFSpy.getFirmwareVersion(aapsLogger, "", "subg_rfspy 4.5.7"));
-
-        assertEquals(RileyLinkFirmwareVersion.UnknownVersion, RFSpy.getFirmwareVersion(aapsLogger, "", "subg_rfspy 5.0"));
-        assertEquals(RileyLinkFirmwareVersion.UnknownVersion, RFSpy.getFirmwareVersion(aapsLogger, "", "subg_rfspy 5.0.0"));
-        assertEquals(RileyLinkFirmwareVersion.UnknownVersion, RFSpy.getFirmwareVersion(aapsLogger, "", "subg_rfspy 5.5.5"));
-    }
-}
\ No newline at end of file
diff --git a/rileylink/src/test/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/RFSpyTest.kt b/rileylink/src/test/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/RFSpyTest.kt
new file mode 100644
index 0000000000..bb2c050863
--- /dev/null
+++ b/rileylink/src/test/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/RFSpyTest.kt
@@ -0,0 +1,100 @@
+package info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble
+
+import info.nightscout.androidaps.TestBase
+import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.defs.RileyLinkFirmwareVersion
+import org.junit.Assert
+import org.junit.Test
+
+class RFSpyTest : TestBase() {
+
+    @Test fun testGetFirmwareVersion() {
+        Assert.assertEquals(
+            RileyLinkFirmwareVersion.Version_1_0,
+            RFSpy.getFirmwareVersion(aapsLogger, "", "subg_rfspy 1.0")
+        )
+        Assert.assertEquals(
+            RileyLinkFirmwareVersion.Version_1_x,
+            RFSpy.getFirmwareVersion(aapsLogger, "", "subg_rfspy 1.1")
+        )
+        Assert.assertEquals(
+            RileyLinkFirmwareVersion.Version_1_x,
+            RFSpy.getFirmwareVersion(aapsLogger, "", "subg_rfspy 1.1.13")
+        )
+        Assert.assertEquals(
+            RileyLinkFirmwareVersion.Version_2_0,
+            RFSpy.getFirmwareVersion(aapsLogger, "", "subg_rfspy 2.0")
+        )
+        Assert.assertEquals(
+            RileyLinkFirmwareVersion.Version_2_0,
+            RFSpy.getFirmwareVersion(aapsLogger, "", "subg_rfspy 2.0.1")
+        )
+        Assert.assertEquals(
+            RileyLinkFirmwareVersion.Version_2_2,
+            RFSpy.getFirmwareVersion(aapsLogger, "", "subg_rfspy 2.2")
+        )
+        Assert.assertEquals(
+            RileyLinkFirmwareVersion.Version_2_2,
+            RFSpy.getFirmwareVersion(aapsLogger, "", "subg_rfspy 2.2.16")
+        )
+        Assert.assertEquals(
+            RileyLinkFirmwareVersion.Version_2_2,
+            RFSpy.getFirmwareVersion(aapsLogger, "", "subg_rfspy 2.2.17")
+        )
+        Assert.assertEquals(
+            RileyLinkFirmwareVersion.Version_2_x,
+            RFSpy.getFirmwareVersion(aapsLogger, "", "subg_rfspy 2.3")
+        )
+        Assert.assertEquals(
+            RileyLinkFirmwareVersion.Version_2_x,
+            RFSpy.getFirmwareVersion(aapsLogger, "", "subg_rfspy 2.3.0")
+        )
+        Assert.assertEquals(
+            RileyLinkFirmwareVersion.Version_2_x,
+            RFSpy.getFirmwareVersion(aapsLogger, "", "subg_rfspy 2.3.17")
+        )
+        Assert.assertEquals(
+            RileyLinkFirmwareVersion.Version_3_x,
+            RFSpy.getFirmwareVersion(aapsLogger, "", "subg_rfspy 3.0")
+        )
+        Assert.assertEquals(
+            RileyLinkFirmwareVersion.Version_3_x,
+            RFSpy.getFirmwareVersion(aapsLogger, "", "subg_rfspy 3.0.1")
+        )
+        Assert.assertEquals(
+            RileyLinkFirmwareVersion.Version_3_x,
+            RFSpy.getFirmwareVersion(aapsLogger, "", "subg_rfspy 3.1")
+        )
+        Assert.assertEquals(
+            RileyLinkFirmwareVersion.Version_3_x,
+            RFSpy.getFirmwareVersion(aapsLogger, "", "subg_rfspy 3.1.13")
+        )
+        Assert.assertEquals(
+            RileyLinkFirmwareVersion.Version_4_x,
+            RFSpy.getFirmwareVersion(aapsLogger, "", "subg_rfspy 4.0")
+        )
+        Assert.assertEquals(
+            RileyLinkFirmwareVersion.Version_4_x,
+            RFSpy.getFirmwareVersion(aapsLogger, "", "subg_rfspy 4.0.4")
+        )
+        Assert.assertEquals(
+            RileyLinkFirmwareVersion.Version_4_x,
+            RFSpy.getFirmwareVersion(aapsLogger, "", "subg_rfspy 4.3")
+        )
+        Assert.assertEquals(
+            RileyLinkFirmwareVersion.Version_4_x,
+            RFSpy.getFirmwareVersion(aapsLogger, "", "subg_rfspy 4.5.7")
+        )
+        Assert.assertEquals(
+            RileyLinkFirmwareVersion.UnknownVersion,
+            RFSpy.getFirmwareVersion(aapsLogger, "", "subg_rfspy 5.0")
+        )
+        Assert.assertEquals(
+            RileyLinkFirmwareVersion.UnknownVersion,
+            RFSpy.getFirmwareVersion(aapsLogger, "", "subg_rfspy 5.0.0")
+        )
+        Assert.assertEquals(
+            RileyLinkFirmwareVersion.UnknownVersion,
+            RFSpy.getFirmwareVersion(aapsLogger, "", "subg_rfspy 5.5.5")
+        )
+    }
+}
\ No newline at end of file
diff --git a/runtests.sh b/runtests.sh
new file mode 100755
index 0000000000..288ac90dda
--- /dev/null
+++ b/runtests.sh
@@ -0,0 +1,2 @@
+#!/bin/zsh
+./gradlew -Pcoverage -PfirebaseDisable testFullDebugUnitTest
diff --git a/settings.gradle b/settings.gradle
index a35251b846..69eee62615 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -8,8 +8,12 @@ include ':combo'
 include ':dana'
 include ':danar'
 include ':danars'
+include ':pump-common'
 include ':rileylink'
 include ':medtronic'
 include ':omnipod-common'
 include ':omnipod-eros'
-include ':omnipod-dash'
\ No newline at end of file
+include ':omnipod-dash'
+include ':diaconn'
+
+include ':openhumans'
diff --git a/wear/build.gradle b/wear/build.gradle
index 884db2f084..c92e76a22b 100644
--- a/wear/build.gradle
+++ b/wear/build.gradle
@@ -12,16 +12,23 @@ buildscript {
 }
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-allopen'
 apply plugin: 'com.hiya.jacoco-android'
 
 jacoco {
-    toolVersion = "0.8.6"
+    toolVersion = "0.8.7"
+}
+
+tasks.withType(Test) {
+    jacoco.includeNoLocationClasses = true
+    jacoco.excludes = ['jdk.internal.*']
 }
 
 ext {
     wearableVersion = "2.8.1"
     // playServicesWearable 17.1.0 breaks test
     playServicesWearable = "17.0.0"
+    powermockVersion = '2.0.9'
 }
 
 def generateGitBuild = { ->
@@ -46,7 +53,7 @@ def generateGitBuild = { ->
 }
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 30
 
     defaultConfig {
         applicationId "info.nightscout.androidaps"
@@ -145,12 +152,12 @@ dependencies {
     testImplementation "org.powermock:powermock-module-junit4-rule:${powermockVersion}"
     testImplementation "org.powermock:powermock-module-junit4:${powermockVersion}"
     testImplementation "joda-time:joda-time:$jodatime_version"
-    testImplementation('com.google.truth:truth:1.1.2') {
+    testImplementation('com.google.truth:truth:1.1.3') {
         exclude group: "com.google.guava", module: "guava"
     }
     testImplementation "org.skyscreamer:jsonassert:1.5.0"
     testImplementation "org.hamcrest:hamcrest-all:1.3"
-    implementation "androidx.core:core-ktx:+"
+    implementation "androidx.core:core-ktx:$coreVersion"
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 }
 repositories {
diff --git a/wear/src/main/java/info/nightscout/androidaps/complications/ComplicationTapBroadcastReceiver.java b/wear/src/main/java/info/nightscout/androidaps/complications/ComplicationTapBroadcastReceiver.java
index 33d302dd6f..8e791b0fbb 100644
--- a/wear/src/main/java/info/nightscout/androidaps/complications/ComplicationTapBroadcastReceiver.java
+++ b/wear/src/main/java/info/nightscout/androidaps/complications/ComplicationTapBroadcastReceiver.java
@@ -142,7 +142,7 @@ public class ComplicationTapBroadcastReceiver extends BroadcastReceiver {
         // Pass complicationId as the requestCode to ensure that different complications get
         // different intents.
         return PendingIntent.getBroadcast(
-                context, complicationId, intent, PendingIntent.FLAG_UPDATE_CURRENT);
+                context, complicationId, intent, PendingIntent.FLAG_IMMUTABLE | PendingIntent.FLAG_UPDATE_CURRENT);
     }
 
     /**
@@ -161,7 +161,7 @@ public class ComplicationTapBroadcastReceiver extends BroadcastReceiver {
         // Pass complicationId as the requestCode to ensure that different complications get
         // different intents.
         return PendingIntent.getBroadcast(
-                context, complicationId, intent, PendingIntent.FLAG_UPDATE_CURRENT);
+                context, complicationId, intent, PendingIntent.FLAG_IMMUTABLE | PendingIntent.FLAG_UPDATE_CURRENT);
     }
 
 }
diff --git a/wear/src/main/java/info/nightscout/androidaps/data/ListenerService.java b/wear/src/main/java/info/nightscout/androidaps/data/ListenerService.java
index e58d886f0e..78803079b8 100644
--- a/wear/src/main/java/info/nightscout/androidaps/data/ListenerService.java
+++ b/wear/src/main/java/info/nightscout/androidaps/data/ListenerService.java
@@ -589,7 +589,7 @@ public class ListenerService extends WearableListenerService implements GoogleAp
         intent.putExtras(params);
 
         PendingIntent resultPendingIntent =
-                PendingIntent.getActivity(this, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT);
+                PendingIntent.getActivity(this, 0, intent, PendingIntent.FLAG_IMMUTABLE | PendingIntent.FLAG_UPDATE_CURRENT);
 
         builder = builder.setContentIntent(resultPendingIntent);
 
diff --git a/wear/src/main/res/values-fr-rFR/strings.xml b/wear/src/main/res/values-fr-rFR/strings.xml
index 84f5d2b24f..fc6cfc622f 100644
--- a/wear/src/main/res/values-fr-rFR/strings.xml
+++ b/wear/src/main/res/values-fr-rFR/strings.xml
@@ -63,7 +63,7 @@
     <string name="pref_version">Version:</string>
     <string name="pref_moreWatchfaceSettings">Plus de paramètres</string>
     <string name="pref_lookInYourWatchfaceConfiguration">Veuillez regardez dans la configuration du cadran.</string>
-    <string name="menu_tempt">Cible Temp.</string>
+    <string name="menu_tempt">Cible Temp</string>
     <string name="menu_wizard">Assistant</string>
     <string name="menu_bolus">Bolus</string>
     <string name="menu_ecarb">eGlucides</string>
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/main/res/values-lt-rLT/strings.xml b/wear/src/main/res/values-lt-rLT/strings.xml
index 10de13c2dd..e8c4ea8e0b 100644
--- a/wear/src/main/res/values-lt-rLT/strings.xml
+++ b/wear/src/main/res/values-lt-rLT/strings.xml
@@ -89,6 +89,9 @@
     <string name="action_confirm">PATVIRTINTI</string>
     <string name="action_timeshift">laiko postūmis</string>
     <string name="action_bolus">bolusas</string>
+    <string name="bolus_progress">Leidžiamas bolusas</string>
+    <string name="press_to_cancel">paspauskite atšaukimui</string>
+    <string name="cancel_bolus">ATŠAUKTI BOLUSĄ</string>
     <string name="status_pump">Pompa</string>
     <string name="status_loop">Ciklas</string>
     <string name="status_cpp">CPP (Procentinis dienos profilis)</string>
diff --git a/wear/src/test/java/info/nightscout/androidaps/interaction/utils/PairTest.java b/wear/src/test/java/info/nightscout/androidaps/interaction/utils/PairTest.java
index 98b7f99297..123468bdf3 100644
--- a/wear/src/test/java/info/nightscout/androidaps/interaction/utils/PairTest.java
+++ b/wear/src/test/java/info/nightscout/androidaps/interaction/utils/PairTest.java
@@ -1,12 +1,5 @@
 package info.nightscout.androidaps.interaction.utils;
 
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import java.util.HashSet;
-import java.util.Set;
-
 import static org.hamcrest.CoreMatchers.containsString;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -14,7 +7,11 @@ import static org.junit.Assert.assertNotEquals;
 import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
 
-@RunWith(PowerMockRunner.class)
+import org.junit.Test;
+
+import java.util.HashSet;
+import java.util.Set;
+
 public class PairTest {
 
     @Test
diff --git a/wear/src/test/java/info/nightscout/androidaps/interaction/utils/SafeParseTest.java b/wear/src/test/java/info/nightscout/androidaps/interaction/utils/SafeParseTest.java
deleted file mode 100644
index 62a71e6420..0000000000
--- a/wear/src/test/java/info/nightscout/androidaps/interaction/utils/SafeParseTest.java
+++ /dev/null
@@ -1,128 +0,0 @@
-package info.nightscout.androidaps.interaction.utils;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-
-/**
- * Created by dlvoy on 21.11.2019.
- */
-@RunWith(PowerMockRunner.class)
-public class SafeParseTest {
-
-    @Test
-    public void stringToDoubleTest() {
-        // correct values
-        assertThat(0.1234, is(SafeParse.stringToDouble("0.1234")));
-        assertThat(0.1234, is(SafeParse.stringToDouble("0,1234")));
-        assertThat(0.5436564812, is(SafeParse.stringToDouble(".5436564812")));
-        assertThat(0.5436564812, is(SafeParse.stringToDouble(",5436564812")));
-        assertThat(1000500100900.0, is(SafeParse.stringToDouble("1000500100900")));
-        assertThat(42.0, is(SafeParse.stringToDouble("42")));
-
-        // units or other extra values are not permitted
-        assertThat(0.0, is(SafeParse.stringToDouble("12 U/h")));
-
-        // strings are not parsable
-        assertThat(0.0, is(SafeParse.stringToDouble("ala ma kota")));
-
-        // separator errors
-        assertThat(0.0, is(SafeParse.stringToDouble("0.1234.5678")));
-        assertThat(0.0, is(SafeParse.stringToDouble("0,1234,5678")));
-
-        // various emptiness
-        assertThat(0.0, is(SafeParse.stringToDouble("")));
-        assertThat(0.0, is(SafeParse.stringToDouble("     ")));
-        assertThat(0.0, is(SafeParse.stringToDouble("\n\r")));
-    }
-
-    @Test
-    public void stringToIntTest() {
-        // correct values
-        assertThat(1052934, is(SafeParse.stringToInt("1052934")));
-        assertThat(-42, is(SafeParse.stringToInt("-42")));
-        assertThat(2147483647, is(SafeParse.stringToInt("2147483647")));
-        assertThat(-2147483648, is(SafeParse.stringToInt("-2147483648")));
-
-        // outside Integer range
-        assertThat(0, is(SafeParse.stringToInt("2147483648")));
-        assertThat(0, is(SafeParse.stringToInt("-2147483649")));
-
-        // units or other extra values are not permitted
-        assertThat(0, is(SafeParse.stringToInt("12 U/h")));
-        assertThat(0, is(SafeParse.stringToInt("0.1234")));
-        assertThat(0, is(SafeParse.stringToInt("0,1234")));
-        assertThat(0, is(SafeParse.stringToInt(".5436564812")));
-        assertThat(0, is(SafeParse.stringToInt(",5436564812")));
-        assertThat(0, is(SafeParse.stringToInt("42.1234")));
-        assertThat(0, is(SafeParse.stringToInt("42,1234")));
-        assertThat(0, is(SafeParse.stringToInt("3212.5436564812")));
-        assertThat(0, is(SafeParse.stringToInt("3212,5436564812")));
-        assertThat(0, is(SafeParse.stringToInt("1000500100900")));
-
-        // strings are not parsable
-        assertThat(0, is(SafeParse.stringToInt("ala ma kota")));
-
-        // various emptiness
-        assertThat(0, is(SafeParse.stringToInt("")));
-        assertThat(0, is(SafeParse.stringToInt("     ")));
-        assertThat(0, is(SafeParse.stringToInt("\n\r")));
-    }
-
-    @Test
-    public void stringToLongTest() {
-        // correct values
-        assertThat(1052934L, is(SafeParse.stringToLong("1052934")));
-        assertThat(-42L, is(SafeParse.stringToLong("-42")));
-        assertThat(2147483647L, is(SafeParse.stringToLong("2147483647")));
-        assertThat(-2147483648L, is(SafeParse.stringToLong("-2147483648")));
-        assertThat(1000500100900L, is(SafeParse.stringToLong("1000500100900")));
-
-        // outside Integer range
-        assertThat(2147483648L, is(SafeParse.stringToLong("2147483648")));
-        assertThat(-2147483649L, is(SafeParse.stringToLong("-2147483649")));
-
-        // units or other extra values are not permitted
-        assertThat(0L, is(SafeParse.stringToLong("12 U/h")));
-        assertThat(0L, is(SafeParse.stringToLong("0.1234")));
-        assertThat(0L, is(SafeParse.stringToLong("0,1234")));
-        assertThat(0L, is(SafeParse.stringToLong(".5436564812")));
-        assertThat(0L, is(SafeParse.stringToLong(",5436564812")));
-        assertThat(0L, is(SafeParse.stringToLong("42.1234")));
-        assertThat(0L, is(SafeParse.stringToLong("42,1234")));
-        assertThat(0L, is(SafeParse.stringToLong("3212.5436564812")));
-        assertThat(0L, is(SafeParse.stringToLong("3212,5436564812")));
-
-        // strings are not parsable
-        assertThat(0L, is(SafeParse.stringToLong("ala ma kota")));
-
-        // various emptiness
-        assertThat(0L, is(SafeParse.stringToLong("")));
-        assertThat(0L, is(SafeParse.stringToLong("     ")));
-        assertThat(0L, is(SafeParse.stringToLong("\n\r")));
-    }
-
-    @Test(expected=NullPointerException.class)
-    public void stringToDoubleNullTest() {
-        SafeParse.stringToDouble(null);
-    }
-
-    @Test(expected=NullPointerException.class)
-    public void stringToIntNullTest() {
-        SafeParse.stringToInt(null);
-    }
-
-    @Test(expected=NullPointerException.class)
-    public void stringToLongNullTest() {
-        SafeParse.stringToLong(null);
-    }
-
-    @Before
-    public void prepareMock() {
-
-    }
-}
diff --git a/wear/src/test/java/info/nightscout/androidaps/interaction/utils/SafeParseTest.kt b/wear/src/test/java/info/nightscout/androidaps/interaction/utils/SafeParseTest.kt
new file mode 100644
index 0000000000..be9a420b54
--- /dev/null
+++ b/wear/src/test/java/info/nightscout/androidaps/interaction/utils/SafeParseTest.kt
@@ -0,0 +1,114 @@
+package info.nightscout.androidaps.interaction.utils
+
+import org.junit.Assert.assertEquals
+import org.junit.Before
+import org.junit.Test
+import java.lang.NullPointerException
+
+
+@Suppress("SpellCheckingInspection")
+class SafeParseTest {
+
+    @Test fun stringToDoubleTest() {
+        // correct values
+        assertEquals(0.1234, SafeParse.stringToDouble("0.1234"), 0.001)
+        assertEquals(0.1234, SafeParse.stringToDouble("0,1234"), 0.001)
+        assertEquals(0.5436564812, SafeParse.stringToDouble(".5436564812"), 0.001)
+        assertEquals(0.5436564812, SafeParse.stringToDouble(",5436564812"), 0.001)
+        assertEquals(1000500100900.0, SafeParse.stringToDouble("1000500100900"), 0.001)
+        assertEquals(42.0, SafeParse.stringToDouble("42"), 0.001)
+
+        // units or other extra values are not permitted
+        assertEquals(0.0, SafeParse.stringToDouble("12 U/h"), 0.001)
+
+        // strings are not parsable
+        assertEquals(0.0, SafeParse.stringToDouble("ala ma kota"), 0.001)
+
+        // separator errors
+        assertEquals(0.0, SafeParse.stringToDouble("0.1234.5678"), 0.001)
+        assertEquals(0.0, SafeParse.stringToDouble("0,1234,5678"), 0.001)
+
+        // various emptiness
+        assertEquals(0.0, SafeParse.stringToDouble(""), 0.001)
+        assertEquals(0.0, SafeParse.stringToDouble("     "), 0.001)
+        assertEquals(0.0, SafeParse.stringToDouble("\n\r"), 0.001)
+    }
+
+    @Test fun stringToIntTest() {
+        // correct values
+        assertEquals(1052934, SafeParse.stringToInt("1052934"))
+        assertEquals(-42, SafeParse.stringToInt("-42"))
+        assertEquals(2147483647, SafeParse.stringToInt("2147483647"))
+        assertEquals(-2147483648, SafeParse.stringToInt("-2147483648"))
+
+        // outside Integer range
+        assertEquals(0, SafeParse.stringToInt("2147483648"))
+        assertEquals(0, SafeParse.stringToInt("-2147483649"))
+
+        // units or other extra values are not permitted
+        assertEquals(0, SafeParse.stringToInt("12 U/h"))
+        assertEquals(0, SafeParse.stringToInt("0.1234"))
+        assertEquals(0, SafeParse.stringToInt("0,1234"))
+        assertEquals(0, SafeParse.stringToInt(".5436564812"))
+        assertEquals(0, SafeParse.stringToInt(",5436564812"))
+        assertEquals(0, SafeParse.stringToInt("42.1234"))
+        assertEquals(0, SafeParse.stringToInt("42,1234"))
+        assertEquals(0, SafeParse.stringToInt("3212.5436564812"))
+        assertEquals(0, SafeParse.stringToInt("3212,5436564812"))
+        assertEquals(0, SafeParse.stringToInt("1000500100900"))
+
+        // strings are not parsable
+        assertEquals(0, SafeParse.stringToInt("ala ma kota"))
+
+        // various emptiness
+        assertEquals(0, SafeParse.stringToInt(""))
+        assertEquals(0, SafeParse.stringToInt("     "))
+        assertEquals(0, SafeParse.stringToInt("\n\r"))
+    }
+
+    @Test fun stringToLongTest() {
+        // correct values
+        assertEquals(1052934L, SafeParse.stringToLong("1052934"))
+        assertEquals(-42L, SafeParse.stringToLong("-42"))
+        assertEquals(2147483647L, SafeParse.stringToLong("2147483647"))
+        assertEquals(-2147483648L, SafeParse.stringToLong("-2147483648"))
+        assertEquals(1000500100900L, SafeParse.stringToLong("1000500100900"))
+
+        // outside Integer range
+        assertEquals(2147483648L, SafeParse.stringToLong("2147483648"))
+        assertEquals(-2147483649L, SafeParse.stringToLong("-2147483649"))
+
+        // units or other extra values are not permitted
+        assertEquals(0L, SafeParse.stringToLong("12 U/h"))
+        assertEquals(0L, SafeParse.stringToLong("0.1234"))
+        assertEquals(0L, SafeParse.stringToLong("0,1234"))
+        assertEquals(0L, SafeParse.stringToLong(".5436564812"))
+        assertEquals(0L, SafeParse.stringToLong(",5436564812"))
+        assertEquals(0L, SafeParse.stringToLong("42.1234"))
+        assertEquals(0L, SafeParse.stringToLong("42,1234"))
+        assertEquals(0L, SafeParse.stringToLong("3212.5436564812"))
+        assertEquals(0L, SafeParse.stringToLong("3212,5436564812"))
+
+        // strings are not parsable
+        assertEquals(0L, SafeParse.stringToLong("ala ma kota"))
+
+        // various emptiness
+        assertEquals(0L, SafeParse.stringToLong(""))
+        assertEquals(0L, SafeParse.stringToLong("     "))
+        assertEquals(0L, SafeParse.stringToLong("\n\r"))
+    }
+
+    @Test(expected = NullPointerException::class) fun stringToDoubleNullTest() {
+        SafeParse.stringToDouble(null)
+    }
+
+    @Test(expected = NullPointerException::class) fun stringToIntNullTest() {
+        SafeParse.stringToInt(null)
+    }
+
+    @Test(expected = NullPointerException::class) fun stringToLongNullTest() {
+        SafeParse.stringToLong(null)
+    }
+
+    @Before fun prepareMock() {}
+}
\ No newline at end of file
diff --git a/wear/src/test/java/info/nightscout/androidaps/testing/mockers/AndroidMocker.java b/wear/src/test/java/info/nightscout/androidaps/testing/mockers/AndroidMocker.java
index a1addfdc1d..8010826d43 100644
--- a/wear/src/test/java/info/nightscout/androidaps/testing/mockers/AndroidMocker.java
+++ b/wear/src/test/java/info/nightscout/androidaps/testing/mockers/AndroidMocker.java
@@ -1,15 +1,14 @@
 package info.nightscout.androidaps.testing.mockers;
 
-import org.junit.Assert;
-import org.powermock.api.mockito.PowerMockito;
-
-import java.util.Base64;
-
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyInt;
 import static org.mockito.ArgumentMatchers.anyString;
 import static org.powermock.api.mockito.PowerMockito.mockStatic;
 
+import org.powermock.api.mockito.PowerMockito;
+
+import java.util.Base64;
+
 public class AndroidMocker {
 
     public static void mockBase64() throws Exception {
diff --git a/wear/src/test/java/info/nightscout/androidaps/testing/mockers/LogMocker.java b/wear/src/test/java/info/nightscout/androidaps/testing/mockers/LogMocker.java
index 5c374665bc..0dccaafced 100644
--- a/wear/src/test/java/info/nightscout/androidaps/testing/mockers/LogMocker.java
+++ b/wear/src/test/java/info/nightscout/androidaps/testing/mockers/LogMocker.java
@@ -1,9 +1,9 @@
 package info.nightscout.androidaps.testing.mockers;
 
-import android.util.Log;
-
 import static org.powermock.api.mockito.PowerMockito.mockStatic;
 
+import android.util.Log;
+
 public class LogMocker {
     public static void prepareMock() {
         mockStatic(Log.class);
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 11a89f0699..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
@@ -1,11 +1,15 @@
 package info.nightscout.androidaps.testing.mockers;
 
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.powermock.api.mockito.PowerMockito.mockStatic;
+
 import android.os.Bundle;
 
 import com.google.android.gms.wearable.Asset;
 import com.google.android.gms.wearable.DataMap;
 
-import org.junit.Assert;
 import org.mockito.invocation.InvocationOnMock;
 import org.mockito.stubbing.Answer;
 import org.powermock.api.mockito.PowerMockito;
@@ -15,11 +19,6 @@ import java.util.ArrayList;
 import info.nightscout.androidaps.interaction.utils.Constants;
 import info.nightscout.androidaps.interaction.utils.WearUtil;
 
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyInt;
-import static org.mockito.ArgumentMatchers.anyString;
-import static org.powermock.api.mockito.PowerMockito.mockStatic;
-
 public class WearUtilMocker {
 
     public static final long REF_NOW = 1572610530000L;
@@ -59,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()) {